Second Life viewer sources 1.20.9

128 files changed, 5903 insertions, 6743 deletions

diff --git a/linden/indra/SConstruct b/linden/indra/SConstruct
index 629656f..9353317 100644
--- a/linden/indra/SConstruct
+++ b/linden/indra/SConstruct
@@ -349,7 +349,7 @@ for build_target in targets:
         strip_cmd = '/opt/crosstool/gcc-4.0.2-glibc-2.3.6/x86_64-unknown-linux-gnu/x86_64-unknown-linux-gnu/bin/strip -S -o $TARGET $SOURCE'
 
     else:
-        gcc_bin = 'g++-3.4'
+        gcc_bin = 'g++-4.1'
 
     # Are we using the Intel compiler?
     if gcc_bin.find('icpc') >= 0:
@@ -370,8 +370,8 @@ for build_target in targets:
     releasenoopt_cflags = cflags + '-O0 '
     releasenoopt_cxxflags = cxxflags + '-O0 '
     releasenoopt_cppflags = cppflags + '-DNDEBUG -DLL_RELEASE=1 '
-    releasefordownload_cflags = cflags + '-O2 '
-    releasefordownload_cxxflags = cxxflags + '-O2 '
+    releasefordownload_cflags = cflags + '-O2 -fno-stack-protector '
+    releasefordownload_cxxflags = cxxflags + '-O2 -fno-stack-protector '
     releasefordownload_cppflags = cppflags + '-DNDEBUG -DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 '
 
     ################
@@ -476,6 +476,7 @@ for build_target in targets:
         env['ENV']['DISTCC_HOSTS'] = hosts
         env['ENV']['USER'] = os.environ['USER']
         env['ENV']['HOME'] = os.environ['HOME']
+        #env['ENV']['SSH_AUTH_SOCK'] = os.environ['SSH_AUTH_SOCK']
 
     if enable_colorgcc:
         env['ENV']['PATH'] = os.environ['PATH']
diff --git a/linden/indra/llaudio/audioengine.cpp b/linden/indra/llaudio/audioengine.cpp
index 021c940..05636c1 100644
--- a/linden/indra/llaudio/audioengine.cpp
+++ b/linden/indra/llaudio/audioengine.cpp
@@ -1621,6 +1621,8 @@ LLAudioData::LLAudioData(const LLUUID &uuid) :
                 // This is a null sound.
                 return;
         }
+        llassert_always(gAudiop) ;
+        llassert_always(gAssetStorage) ;
 
         if (gAudiop->hasDecodedFile(uuid))
         {
diff --git a/linden/indra/llaudio/audioengine_fmod.cpp b/linden/indra/llaudio/audioengine_fmod.cpp
index 271074e..cc2042d 100644
--- a/linden/indra/llaudio/audioengine_fmod.cpp
+++ b/linden/indra/llaudio/audioengine_fmod.cpp
@@ -538,7 +538,7 @@ void LLAudioChannelFMOD::update3DPosition()
                 float_pos.setVec(mCurrentSourcep->getPositionGlobal());
                 if (!FSOUND_3D_SetAttributes(mChannelID, float_pos.mV, mCurrentSourcep->getVelocity().mV))
                 {
-                        llwarns << "LLAudioChannelFMOD::update3DPosition error: " << FMOD_ErrorString(FSOUND_GetError()) << llendl;
+                        LL_DEBUGS("FMOD") << "LLAudioChannelFMOD::update3DPosition error: " << FMOD_ErrorString(FSOUND_GetError()) << LL_ENDL;
                 }
         }
 }
@@ -576,7 +576,7 @@ void LLAudioChannelFMOD::cleanup()
         //llinfos << "Cleaning up channel: " << mChannelID << llendl;
         if (!FSOUND_StopSound(mChannelID))
         {
-                llwarns << "LLAudioChannelFMOD::cleanup error: " << FMOD_ErrorString(FSOUND_GetError()) << llendl;
+                LL_DEBUGS("FMOD") << "LLAudioChannelFMOD::cleanup error: " << FMOD_ErrorString(FSOUND_GetError()) << llendl;
         }
 
         mCurrentBufferp = NULL;
diff --git a/linden/indra/llcommon/files.lst b/linden/indra/llcommon/files.lst
index fd6a07c..d698773 100644
--- a/linden/indra/llcommon/files.lst
+++ b/linden/indra/llcommon/files.lst
@@ -21,7 +21,6 @@ llcommon/llindraconfigfile.cpp
 llcommon/lllog.cpp
 llcommon/llliveappconfig.cpp
 llcommon/lllivefile.cpp
-llcommon/lllog.cpp
 llcommon/llmemory.cpp
 llcommon/llmemorystream.cpp
 llcommon/llmetrics.cpp
diff --git a/linden/indra/llcommon/llmemory.cpp b/linden/indra/llcommon/llmemory.cpp
index 5edeb4b..8fa324f 100644
--- a/linden/indra/llcommon/llmemory.cpp
+++ b/linden/indra/llcommon/llmemory.cpp
@@ -314,72 +314,77 @@ U64 getCurrentRSS()
 
 #elif defined(LL_DARWIN)
 
-static U32 getPageSize()
-{
-        int ctl[2] = { CTL_HW, HW_PAGESIZE };
-        int page_size;
-        size_t size = sizeof(page_size);
-
-        if (sysctl(ctl, 2, &page_size, &size, NULL, 0) == -1)
-        {
-                llwarns << "Couldn't get page size" << llendl;
-                return 0;
-        } else {
-                return page_size;
-        }
-}
+// This can cause bad stalls! Replace with fast version
+
+// static U32 getPageSize()
+// {
+//      int ctl[2] = { CTL_HW, HW_PAGESIZE };
+//      int page_size;
+//      size_t size = sizeof(page_size);
+
+//      if (sysctl(ctl, 2, &page_size, &size, NULL, 0) == -1)
+//      {
+//              llwarns << "Couldn't get page size" << llendl;
+//              return 0;
+//      } else {
+//              return page_size;
+//      }
+// }
 
 U64 getCurrentRSS()
 {
-        task_t task = mach_task_self();
-        vm_address_t addr = VM_MIN_ADDRESS;
-        vm_size_t size = 0;
-        U64 residentPages = 0;
-
-        while (true)
-        {
-                mach_msg_type_number_t bcount = VM_REGION_BASIC_INFO_COUNT;
-                vm_region_basic_info binfo;
-                mach_port_t bobj;
-                kern_return_t ret;
+        // Stalls!!!
+        
+//      task_t task = mach_task_self();
+//      vm_address_t addr = VM_MIN_ADDRESS;
+//      vm_size_t size = 0;
+//      U64 residentPages = 0;
+
+//      while (true)
+//      {
+//              mach_msg_type_number_t bcount = VM_REGION_BASIC_INFO_COUNT;
+//              vm_region_basic_info binfo;
+//              mach_port_t bobj;
+//              kern_return_t ret;
                 
-                addr += size;
+//              addr += size;
                 
-                ret = vm_region(task, &addr, &size, VM_REGION_BASIC_INFO,
-                                                (vm_region_info_t) &binfo, &bcount, &bobj);
+//              ret = vm_region(task, &addr, &size, VM_REGION_BASIC_INFO,
+//                                              (vm_region_info_t) &binfo, &bcount, &bobj);
                 
-                if (ret != KERN_SUCCESS)
-                {
-                        break;
-                }
+//              if (ret != KERN_SUCCESS)
+//              {
+//                      break;
+//              }
                 
-                if (bobj != MACH_PORT_NULL)
-                {
-                        mach_port_deallocate(task, bobj);
-                }
+//              if (bobj != MACH_PORT_NULL)
+//              {
+//                      mach_port_deallocate(task, bobj);
+//              }
                 
-                mach_msg_type_number_t ecount = VM_REGION_EXTENDED_INFO_COUNT;
-                vm_region_extended_info einfo;
-                mach_port_t eobj;
-
-                ret = vm_region(task, &addr, &size, VM_REGION_EXTENDED_INFO,
-                                                (vm_region_info_t) &einfo, &ecount, &eobj);
-
-                if (ret != KERN_SUCCESS)
-                {
-                        llwarns << "vm_region failed" << llendl;
-                        return 0;
-                }
+//              mach_msg_type_number_t ecount = VM_REGION_EXTENDED_INFO_COUNT;
+//              vm_region_extended_info einfo;
+//              mach_port_t eobj;
+
+//              ret = vm_region(task, &addr, &size, VM_REGION_EXTENDED_INFO,
+//                                              (vm_region_info_t) &einfo, &ecount, &eobj);
+
+//              if (ret != KERN_SUCCESS)
+//              {
+//                      llwarns << "vm_region failed" << llendl;
+//                      return 0;
+//              }
                 
-                if (eobj != MACH_PORT_NULL)
-                {
-                        mach_port_deallocate(task, eobj);
-                }
+//              if (eobj != MACH_PORT_NULL)
+//              {
+//                      mach_port_deallocate(task, eobj);
+//              }
 
-                residentPages += einfo.pages_resident;
-        }
+//              residentPages += einfo.pages_resident;
+//      }
 
-        return residentPages * getPageSize();
+//      return residentPages * getPageSize();
+        return 0;
 }
 
 #elif defined(LL_LINUX)
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 95548db..036d34b 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -34,7 +34,7 @@
 
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 20;
-const S32 LL_VERSION_PATCH = 8;
+const S32 LL_VERSION_PATCH = 9;
 const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Second Life Release";
diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp
index fd934b9..454a5bb 100644
--- a/linden/indra/llrender/llimagegl.cpp
+++ b/linden/indra/llrender/llimagegl.cpp
@@ -61,6 +61,8 @@ S32 LLImageGL::sCount					= 0;
 BOOL LLImageGL::sGlobalUseAnisotropic   = FALSE;
 F32 LLImageGL::sLastFrameTime                   = 0.f;
 
+BOOL LLImageGL::sRefCheck = TRUE ;
+
 std::set<LLImageGL*> LLImageGL::sImageList;
 
 //----------------------------------------------------------------------------
@@ -276,7 +278,10 @@ LLImageGL::LLImageGL(const LLImageRaw* imageraw, BOOL usemipmaps)
         setSize(0, 0, 0);
         sImageList.insert(this);
         sCount++;
+
+        sRefCheck = FALSE ;
         createGLTexture(0, imageraw); 
+        sRefCheck = TRUE ;
 }
 
 LLImageGL::~LLImageGL()
@@ -333,17 +338,19 @@ void LLImageGL::cleanup()
 
 //----------------------------------------------------------------------------
 
+//this function is used to check the size of a texture image.
+//so dim should be a positive number
 static bool check_power_of_two(S32 dim)
 {
-        while(dim > 1)
+        if(dim < 0)
         {
-                if (dim & 1)
-                {
-                        return false;
-                }
-                dim >>= 1;
+                return false ;
         }
-        return true;
+        if(!dim)//0 is a power-of-two number
+        {
+                return true ;
+        }
+        return !(dim & (dim - 1)) ;
 }
 
 //static
@@ -420,6 +427,8 @@ void LLImageGL::dump()
 
 BOOL LLImageGL::bindTextureInternal(const S32 stage) const
 {
+        llassert_always(!sRefCheck || (getNumRefs() > 0 && getNumRefs() < 100000)) ;    
+        
         if (gGLManager.mIsDisabled)
         {
                 llwarns << "Trying to bind a texture while GL is disabled!" << llendl;
diff --git a/linden/indra/llrender/llimagegl.h b/linden/indra/llrender/llimagegl.h
index 3f231ee..99a6e49 100644
--- a/linden/indra/llrender/llimagegl.h
+++ b/linden/indra/llrender/llimagegl.h
@@ -207,6 +207,9 @@ public:
 #else
         BOOL getMissed() const { return FALSE; };
 #endif
+
+private://paranoia error check
+        static BOOL sRefCheck ;
 };
 
 #endif // LL_LLIMAGEGL_H
diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index 9693df4..41b50c2 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -1112,6 +1112,8 @@ BOOL LLScrollListCtrl::selectItemRange( S32 first_index, S32 last_index )
         for (item_list::iterator iter = mItemList.begin(); iter != mItemList.end(); iter++)
         {
                 LLScrollListItem *itemp = *iter;
+        
+                llassert_always(itemp) ;
                 if( index >= first_index && index <= last_index )
                 {
                         if( itemp->getEnabled() )
diff --git a/linden/indra/llui/llstyle.cpp b/linden/indra/llui/llstyle.cpp
index 7c46114..58cf200 100644
--- a/linden/indra/llui/llstyle.cpp
+++ b/linden/indra/llui/llstyle.cpp
@@ -102,7 +102,7 @@ LLStyle &LLStyle::operator=(const LLStyle &rhs)
                 mItalic = rhs.mItalic;
                 mBold = rhs.mBold;
                 mUnderline = rhs.mUnderline;
-                mDropShadow = rhs.mUnderline;
+                mDropShadow = rhs.mDropShadow;
                 mIsEmbeddedItem = rhs.mIsEmbeddedItem;
         }
         
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index f2a2727..af96a80 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -607,8 +607,6 @@ LLWindowWin32::LLWindowWin32(char *title, char *name, S32 x, S32 y, S32 width,
         // Initialize (boot strap) the Language text input management,
         // based on the system's (or user's) default settings.
         allowLanguageTextInput(NULL, FALSE);
-
-        SetTimer( mWindowHandle, 0, 1000 / 30, NULL ); // 30 fps timer
 }
 
 
@@ -1351,6 +1349,8 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
         //make sure multi sampling is disabled by default
         glDisable(GL_MULTISAMPLE_ARB);
 
+        //register joystick timer callback
+        SetTimer( mWindowHandle, 0, 1000 / 30, NULL ); // 30 fps timer
 
         // ok to post quit messages now
         mPostQuit = TRUE;
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index f5e57a5..b93f826 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -1910,17 +1910,6 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>CrashLogBehavior</key>
-    <map>
-      <key>Comment</key>
-      <string>Controls behavior when viewer (0 = ask before sending crash report, 1 = always send crash report, 2 = never send crash report)</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>S32</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
     <key>CreateToolCopyCenters</key>
     <map>
       <key>Comment</key>
@@ -2419,7 +2408,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>10.0</real>
+      <real>60.0</real>
     </map>
     <key>FilterItemsPerFrame</key>
     <map>
@@ -4445,7 +4434,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>10.0</real>
+      <real>20.0</real>
     </map>
     <key>MapOverlayIndex</key>
     <map>
@@ -4623,6 +4612,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>MemoryLogFrequency</key>
+        <map>
+        <key>Comment</key>
+            <string>Seconds between display of Memory in log (0 for never)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>600.0</real>
+        </map>
     <key>MenuAccessKeyTime</key>
     <map>
       <key>Comment</key>
@@ -6941,7 +6941,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>ShowMovementControls</key>
     <map>
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index a461dcb..f39610f 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -269,6 +269,7 @@ BOOL				gUseWireframe = FALSE;
 LLVFS* gStaticVFS = NULL;
 
 LLMemoryInfo gSysMemory;
+U64 gMemoryAllocated = 0; // updated in display_stats() in llviewerdisplay.cpp
 
 LLString gLastVersionChannel;
 
@@ -285,6 +286,7 @@ BOOL gPeriodicSlowFrame = FALSE;
 BOOL gCrashOnStartup = FALSE;
 BOOL gLLErrorActivated = FALSE;
 BOOL gLogoutInProgress = FALSE;
+
 ////////////////////////////////////////////////////////////
 // Internal globals... that should be removed.
 static LLString gArgs;
@@ -320,6 +322,48 @@ void idle_afk_check()
         }
 }
 
+//this function checks if the system can allocate (num_chunk)MB memory successfully.
+//if this check fails, the allocated memory is NOT freed.
+void idle_mem_check(S32 num_chunk)
+{
+        //this flag signals if memory allocation check is necessary
+        static BOOL check = TRUE ;
+
+        if(!check) //if memory check fails before, do not repeat it.
+        {
+                return ;
+        }
+        check = FALSE ; //before memory check for this frame, turn off check signal for the next frame. 
+
+        S32 i = 0 ;
+        char**p = new char*[num_chunk] ;
+        if(!p)
+        {
+                return ;
+        }
+        for(i = 0 ; i < num_chunk ; i++)
+        {
+                //1MB per chunk
+                //if the allocation fails, the system should catch it.
+                p[i] = new char[1024 * 1024] ;
+
+                if(!p[i]) //in case that system try-catch is turned off
+                {
+                        return ;
+                }
+        }
+
+        //release memory if the allocation check does not fail.
+        for(i = 0 ; i < num_chunk ; i++)
+        {
+                delete[] p[i] ; 
+        }
+        delete[] p ;
+
+        //memory check for this frame succeeds, turn on next frame check.
+        check = TRUE ;
+}
+
 // A callback set in LLAppViewer::init()
 static void ui_audio_callback(const LLUUID& uuid)
 {
@@ -351,6 +395,24 @@ void request_initial_instant_messages()
         }
 }
 
+// A settings system callback for CrashSubmitBehavior
+bool handleCrashSubmitBehaviorChanged(const LLSD& newvalue)
+{
+        S32 cb = newvalue.asInteger();
+        const S32 NEVER_SUBMIT_REPORT = 2;
+        if(cb == NEVER_SUBMIT_REPORT)
+        {
+                //              LLWatchdog::getInstance()->cleanup(); // SJB: cleaning up a running watchdog is unsafe
+                LLAppViewer::instance()->destroyMainloopTimeout();
+        }
+        else if(gSavedSettings.getBOOL("WatchdogEnabled") == TRUE)
+        {
+//              LLWatchdog::getInstance()->init();
+//              LLAppViewer::instance()->initMainloopTimeout("Mainloop Resume");
+        }
+        return true;
+}
+
 // Use these strictly for things that are constructed at startup,
 // or for things that are performance critical.  JC
 static void settings_to_globals()
@@ -457,9 +519,8 @@ void LLAppViewer::initGridChoice()
         std::string     grid_choice     = gSavedSettings.getString("CmdLineGridChoice");
         LLViewerLogin::getInstance()->setGridChoice(grid_choice);
 
-#if !LL_RELEASE_FOR_DOWNLOAD
-        // Development version: load last server choice by default 
-        // ignored is the command line grid     choice has been set
+        // Load last server choice by default 
+        // ignored if the command line grid     choice has been set
         if(grid_choice.empty())
         {
                 S32     server = gSavedSettings.getS32("ServerChoice");
@@ -474,7 +535,6 @@ void LLAppViewer::initGridChoice()
                         LLViewerLogin::getInstance()->setGridChoice((EGridInfo)server);
                 }
         }
-#endif
 }
 
 bool send_url_to_other_instance(const std::string& url)
@@ -521,7 +581,6 @@ LLTextureFetch* LLAppViewer::sTextureFetch = NULL;
 
 LLAppViewer::LLAppViewer() : 
         mMarkerFile(NULL),
-        mCrashBehavior(CRASH_BEHAVIOR_ASK),
         mReportedCrash(false),
         mNumSessions(0),
         mPurgeCache(false),
@@ -543,12 +602,7 @@ LLAppViewer::LLAppViewer() :
 
 LLAppViewer::~LLAppViewer()
 {
-        if(mMainloopTimeout)
-        {
-                // delete the mainloop timeout. 
-                delete mMainloopTimeout;
-                mMainloopTimeout = NULL;
-        }
+        destroyMainloopTimeout();
 
         // If we got to this destructor somehow, the app didn't hang.
         removeMarkerFile();
@@ -860,6 +914,8 @@ bool LLAppViewer::mainLoop()
                 {
                         LLFastTimer t(LLFastTimer::FTM_FRAME);
                         
+                        pingMainloopTimeout("Main:GatherInput");
+                        
                         {
                                 LLFastTimer t2(LLFastTimer::FTM_MESSAGES);
                         #if LL_WINDOWS
@@ -880,8 +936,13 @@ bool LLAppViewer::mainLoop()
                         }
 #endif
 
+                        //at the beginning of every frame, check if the system can successfully allocate 10 * 1 MB memory.
+                        idle_mem_check(10) ;
+
                         if (!LLApp::isExiting())
                         {
+                                pingMainloopTimeout("Main:JoystickKeyboard");
+                                
                                 // Scan keyboard for movement keys.  Command keys and typing
                                 // are handled by windows callbacks.  Don't do this until we're
                                 // done initializing.  JC
@@ -896,6 +957,8 @@ bool LLAppViewer::mainLoop()
                                         gKeyboard->scanKeyboard();
                                 }
 
+                                pingMainloopTimeout("Main:Messages");
+                                
                                 // Update state based on messages, user input, object idle.
                                 {
                                         LLFastTimer t3(LLFastTimer::FTM_IDLE);
@@ -912,25 +975,32 @@ bool LLAppViewer::mainLoop()
 
                                 if (gDoDisconnect && (LLStartUp::getStartupState() == STATE_STARTED))
                                 {
+                                        pauseMainloopTimeout();
                                         saveFinalSnapshot();
                                         disconnectViewer();
+                                        resumeMainloopTimeout();
                                 }
 
                                 // Render scene.
                                 if (!LLApp::isExiting())
                                 {
+                                        pingMainloopTimeout("Main:Display");
                                         display();
 
+                                        pingMainloopTimeout("Main:Snapshot");
                                         LLFloaterSnapshot::update(); // take snapshots
                                         
 #if LL_WINDOWS && LL_LCD_COMPILE
                                         // update LCD Screen
+                                        pingMainloopTimeout("Main:LCD");
                                         gLcdScreen->UpdateDisplay();
 #endif
                                 }
 
                         }
 
+                        pingMainloopTimeout("Main:Sleep");
+                        
                         pauseMainloopTimeout();
 
                         // Sleep and run background threads
@@ -1017,7 +1087,7 @@ bool LLAppViewer::mainLoop()
 
                                 resumeMainloopTimeout();
         
-                                pingMainloopTimeout("Mainloop");
+                                pingMainloopTimeout("Main:End");
                         }
                                                 
                 }
@@ -1042,11 +1112,7 @@ bool LLAppViewer::mainLoop()
         
         delete gServicePump;
 
-        if(mMainloopTimeout)
-        {
-                delete mMainloopTimeout;
-                mMainloopTimeout = NULL;
-        }
+        destroyMainloopTimeout();
 
         llinfos << "Exiting main_loop" << llendflush;
 
@@ -1350,7 +1416,7 @@ bool LLAppViewer::initThreads()
 
         const S32 NEVER_SUBMIT_REPORT = 2;
         if(TRUE == gSavedSettings.getBOOL("WatchdogEnabled") 
-                && (gCrashSettings.getS32("CrashSubmitBehavior") != NEVER_SUBMIT_REPORT))
+                && (gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING) != NEVER_SUBMIT_REPORT))
         {
                 LLWatchdog::getInstance()->init();
         }
@@ -1512,10 +1578,16 @@ bool LLAppViewer::initConfiguration()
         //*FIX:Mani - Set default to disabling watchdog mainloop 
         // timeout for mac and linux. There is no call stack info 
         // on these platform to help debug.
+#ifndef LL_RELEASE_FOR_DOWNLOAD
+        gSavedSettings.setBOOL("WatchdogEnabled", FALSE);
+#endif
+
 #ifndef LL_WINDOWS
         gSavedSettings.setBOOL("WatchdogEnabled", FALSE);
 #endif
 
+        gCrashSettings.getControl(CRASH_BEHAVIOR_SETTING)->getSignal()->connect(boost::bind(&handleCrashSubmitBehaviorChanged, _1));    
+
         // These are warnings that appear on the first experience of that condition.
         // They are already set in the settings_default.xml file, but still need to be added to LLFirstUse
         // for disable/reset ability
@@ -2153,9 +2225,10 @@ void LLAppViewer::writeSystemInfo()
         gDebugInfo["CPUInfo"]["CPUSSE"] = gSysCPU.hasSSE();
         gDebugInfo["CPUInfo"]["CPUSSE2"] = gSysCPU.hasSSE2();
         
-        gDebugInfo["RAMInfo"] = llformat("%u", gSysMemory.getPhysicalMemoryKB());
+        gDebugInfo["RAMInfo"]["Physical"] = (LLSD::Integer)(gSysMemory.getPhysicalMemoryKB());
+        gDebugInfo["RAMInfo"]["Allocated"] = (LLSD::Integer)(gMemoryAllocated>>10); // MB -> KB
         gDebugInfo["OSInfo"] = getOSInfo().getOSStringSimple();
-
+                
         // *FIX:Mani - move this ddown in llappviewerwin32
 #ifdef LL_WINDOWS
         DWORD thread_id = GetCurrentThreadId();
@@ -2191,7 +2264,10 @@ void LLAppViewer::handleSyncViewerCrash()
 void LLAppViewer::handleViewerCrash()
 {
         llinfos << "Handle viewer crash entry." << llendl;
-        
+
+        // Make sure the watchdog gets turned off...
+//      LLWatchdog::getInstance()->cleanup(); // SJB: This causes the Watchdog to hang for an extra 20-40s?!
+
         LLAppViewer* pApp = LLAppViewer::instance();
         if (pApp->beingDebugged())
         {
@@ -2315,12 +2391,6 @@ void LLAppViewer::handleViewerCrash()
         return;
 }
 
-void LLAppViewer::setCrashBehavior(S32 cb) 
-{ 
-        mCrashBehavior = cb; 
-        gCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, mCrashBehavior);
-} 
-
 bool LLAppViewer::anotherInstanceRunning()
 {
         // We create a marker file when the program starts and remove the file when it finishes.
@@ -3618,6 +3688,15 @@ void LLAppViewer::initMainloopTimeout(const std::string& state, F32 secs)
         }
 }
 
+void LLAppViewer::destroyMainloopTimeout()
+{
+        if(mMainloopTimeout)
+        {
+                delete mMainloopTimeout;
+                mMainloopTimeout = NULL;
+        }
+}
+
 void LLAppViewer::resumeMainloopTimeout(const std::string& state, F32 secs)
 {
         if(mMainloopTimeout)
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h
index 9f9deb6..02406be 100644
--- a/linden/indra/newview/llappviewer.h
+++ b/linden/indra/newview/llappviewer.h
@@ -77,8 +77,6 @@ public:
         // Report true if under the control of a debugger. A null-op default.
         virtual bool beingDebugged() { return false; } 
 
-        S32 getCrashBehavior() const { return mCrashBehavior; } 
-        void setCrashBehavior(S32 cb);
         virtual void handleCrashReporting() = 0; // What to do with crash report?
         virtual void handleSyncCrashTrace() = 0; // any low-level crash-prep that has to happen in the context of the crashing thread before the crash report is delivered.
         static void handleViewerCrash(); // Hey! The viewer crashed. Do this, soon.
@@ -132,6 +130,7 @@ public:
         // llstartup needs to control init.
         // llworld, send_agent_pause() also controls pause/resume.
         void initMainloopTimeout(const std::string& state, F32 secs = -1.0f);
+        void destroyMainloopTimeout();
         void pauseMainloopTimeout();
         void resumeMainloopTimeout(const std::string& state = "", F32 secs = -1.0f);
         void pingMainloopTimeout(const std::string& state, F32 secs = -1.0f);
@@ -186,7 +185,6 @@ private:
 
         
         LLOSInfo mSysOSInfo; 
-        S32 mCrashBehavior;
         bool mReportedCrash;
 
         // Thread objects.
@@ -287,6 +285,7 @@ extern BOOL		gUseWireframe;
 extern LLVFS    *gStaticVFS;
 
 extern LLMemoryInfo gSysMemory;
+extern U64 gMemoryAllocated;
 
 extern LLString gLastVersionChannel;
 
diff --git a/linden/indra/newview/llappviewerlinux.cpp b/linden/indra/newview/llappviewerlinux.cpp
index e41c505..5537687 100644
--- a/linden/indra/newview/llappviewerlinux.cpp
+++ b/linden/indra/newview/llappviewerlinux.cpp
@@ -333,13 +333,15 @@ void LLAppViewerLinux::handleSyncCrashTrace()
 
 void LLAppViewerLinux::handleCrashReporting()
 {
+        const S32 cb = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING);
+
         // Always generate the report, have the logger do the asking, and
         // don't wait for the logger before exiting (-> total cleanup).
-        if (CRASH_BEHAVIOR_NEVER_SEND != LLAppViewer::instance()->getCrashBehavior())
+        if (CRASH_BEHAVIOR_NEVER_SEND != cb)
         {       
                 // launch the actual crash logger
                 char* ask_dialog = "-dialog";
-                if (CRASH_BEHAVIOR_ASK != LLAppViewer::instance()->getCrashBehavior())
+                if (CRASH_BEHAVIOR_ASK != cb)
                         ask_dialog = ""; // omit '-dialog' option
                 std::string cmd =gDirUtilp->getAppRODataDir();
                 cmd += gDirUtilp->getDirDelimiter();
diff --git a/linden/indra/newview/llappviewerwin32.cpp b/linden/indra/newview/llappviewerwin32.cpp
index 59883e5..e90887e 100644
--- a/linden/indra/newview/llappviewerwin32.cpp
+++ b/linden/indra/newview/llappviewerwin32.cpp
@@ -421,8 +421,9 @@ void LLAppViewerWin32::handleCrashReporting()
 
         std::string arg_string = "-user ";
         arg_string += LLViewerLogin::getInstance()->getGridLabel();
-
-        switch(getCrashBehavior())
+        
+        S32 cb = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING);
+        switch(cb)
         {
         case CRASH_BEHAVIOR_ASK:
         default:
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index bbbdb93..f5aba70 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -382,6 +382,7 @@ void LLChatBar::sendChat( EChatType type )
         LLWString text;
         if (mInputEditor) text = mInputEditor->getWText();
         LLWString::trim(text);
+        LLWString::replaceChar(text,182,'\n'); // Convert paragraph symbols back into newlines.
 
         if (!text.empty())
         {
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index ba7d6b9..db57509 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -122,6 +122,7 @@ void LLDrawable::destroy()
                 sNumZombieDrawables--;
         }
 
+        LLFace::sDeleteLock = mFaces.size() ;
         std::for_each(mFaces.begin(), mFaces.end(), DeletePointer());
         mFaces.clear();
                 
@@ -184,6 +185,7 @@ void LLDrawable::cleanupReferences()
 {
         LLFastTimer t(LLFastTimer::FTM_PIPELINE);
         
+        LLFace::sDeleteLock = mFaces.size() ;
         std::for_each(mFaces.begin(), mFaces.end(), DeletePointer());
         mFaces.clear();
 
@@ -277,6 +279,7 @@ void LLDrawable::setNumFaces(const S32 newFaces, LLFacePool *poolp, LLViewerImag
         }
         else if (newFaces < (S32)mFaces.size())
         {
+                LLFace::sDeleteLock = (S32)mFaces.size() - newFaces ;
                 std::for_each(mFaces.begin() + newFaces, mFaces.end(), DeletePointer());
                 mFaces.erase(mFaces.begin() + newFaces, mFaces.end());
         }
@@ -288,6 +291,8 @@ void LLDrawable::setNumFaces(const S32 newFaces, LLFacePool *poolp, LLViewerImag
                         addFace(poolp, texturep);
                 }
         }
+
+        llassert_always(mFaces.size() == newFaces);
 }
 
 void LLDrawable::setNumFacesFast(const S32 newFaces, LLFacePool *poolp, LLViewerImage *texturep)
@@ -298,6 +303,7 @@ void LLDrawable::setNumFacesFast(const S32 newFaces, LLFacePool *poolp, LLViewer
         }
         else if (newFaces < (S32)mFaces.size())
         {
+                LLFace::sDeleteLock = (S32)mFaces.size() - newFaces ;
                 std::for_each(mFaces.begin() + newFaces, mFaces.end(), DeletePointer());
                 mFaces.erase(mFaces.begin() + newFaces, mFaces.end());
         }
@@ -309,6 +315,8 @@ void LLDrawable::setNumFacesFast(const S32 newFaces, LLFacePool *poolp, LLViewer
                         addFace(poolp, texturep);
                 }
         }
+
+        llassert_always(mFaces.size() == newFaces) ;
 }
 
 void LLDrawable::mergeFaces(LLDrawable* src)
@@ -329,8 +337,13 @@ void LLDrawable::deleteFaces(S32 offset, S32 count)
 {
         face_list_t::iterator face_begin = mFaces.begin() + offset;
         face_list_t::iterator face_end = face_begin + count;
+
+        S32 end = (S32)mFaces.size() ;
+        LLFace::sDeleteLock = count ;
         std::for_each(face_begin, face_end, DeletePointer());
         mFaces.erase(face_begin, face_end);
+
+        llassert_always(mFaces.size() == end - count) ;
 }
 
 void LLDrawable::update()
diff --git a/linden/indra/newview/lldrawpoolalpha.cpp b/linden/indra/newview/lldrawpoolalpha.cpp
index ca8f3b4..efe774f 100644
--- a/linden/indra/newview/lldrawpoolalpha.cpp
+++ b/linden/indra/newview/lldrawpoolalpha.cpp
@@ -230,6 +230,7 @@ void LLDrawPoolAlpha::renderGroupAlpha(LLSpatialGroup* group, U32 type, U32 mask
 
                 if (texture && params.mTexture.notNull())
                 {
+                        llassert_always(gGL.getTexUnit(0)) ;
                         gGL.getTexUnit(0)->activate();
                         params.mTexture->bind();
                         params.mTexture->addTextureStats(params.mVSize);
diff --git a/linden/indra/newview/lldrawpoolbump.cpp b/linden/indra/newview/lldrawpoolbump.cpp
index 303b8d5..c7c19d9 100644
--- a/linden/indra/newview/lldrawpoolbump.cpp
+++ b/linden/indra/newview/lldrawpoolbump.cpp
@@ -607,6 +607,10 @@ BOOL LLDrawPoolBump::bindBumpMap(LLDrawInfo& params)
                 if( tex )
                 {
                         bump = gBumpImageList.getBrightnessDarknessImage( tex, bump_code );
+                        //------------------------------------------
+                        //error check to make sure bump is valid
+                        llassert_always(!bump || bump->getNumRefs() == 1) ;                     
+                        //------------------------------------------
                 }
                 break;
 
@@ -621,6 +625,11 @@ BOOL LLDrawPoolBump::bindBumpMap(LLDrawInfo& params)
 
         if (bump)
         {
+                //------------------------------------------
+                //error check to make sure bump is valid
+                llassert_always(bump->getNumRefs() > 0 && bump->getNumRefs() < 100000) ;
+                //------------------------------------------
+
                 bump->bind(1);
                 bump->bind(0);
                 return TRUE;
@@ -863,9 +872,15 @@ LLImageGL* LLBumpImageList::getBrightnessDarknessImage(LLViewerImage* src_image,
                 {
                         LLPointer<LLImageRaw> raw = new LLImageRaw(1,1,1);
                         raw->clear(0x77, 0x77, 0x77, 0xFF);
+
+                        //------------------------------
                         bump = new LLImageGL( raw, TRUE);
-                        bump->setExplicitFormat(GL_ALPHA8, GL_ALPHA);
+                        //immediately assign bump to a global smart pointer in case some local smart pointer
+                        //accidently releases it.
                         (*entries_list)[src_image->getID()] = bump;
+                        //------------------------------
+
+                        bump->setExplicitFormat(GL_ALPHA8, GL_ALPHA);                   
 
                         // Note: this may create an LLImageGL immediately
                         src_image->setLoadedCallback( callback_func, 0, TRUE, new LLUUID(src_image->getID()) );
@@ -1020,10 +1035,15 @@ void LLBumpImageList::onSourceLoaded( BOOL success, LLViewerImage *src_vi, LLIma
                                 }
                         }
 
+                        //---------------------------------------------------
                         LLImageGL* bump = new LLImageGL( TRUE);
-                        bump->setExplicitFormat(GL_ALPHA8, GL_ALPHA);
-                        bump->createGLTexture(0, dst_image);
+                        //immediately assign bump to a global smart pointer in case some local smart pointer
+                        //accidently releases it.
                         iter->second = bump; // derefs (and deletes) old image
+                        //---------------------------------------------------
+
+                        bump->setExplicitFormat(GL_ALPHA8, GL_ALPHA);
+                        bump->createGLTexture(0, dst_image);                    
                 }
                 else
                 {
diff --git a/linden/indra/newview/lldynamictexture.cpp b/linden/indra/newview/lldynamictexture.cpp
index f77187d..a724d88 100644
--- a/linden/indra/newview/lldynamictexture.cpp
+++ b/linden/indra/newview/lldynamictexture.cpp
@@ -42,8 +42,6 @@
 #include "llviewerdisplay.h"
 #include "llrender.h"
 
-void render_ui_and_swap_if_needed();
-
 // static
 LLDynamicTexture::instance_list_t LLDynamicTexture::sInstances[ LLDynamicTexture::ORDER_COUNT ];
 S32 LLDynamicTexture::sNumRenders = 0;
@@ -219,9 +217,8 @@ BOOL LLDynamicTexture::updateAllInstances()
                         LLDynamicTexture *dynamicTexture = *iter;
                         if (dynamicTexture->needsRender())
                         {
-                                render_ui_and_swap_if_needed();
                                 glClear(GL_DEPTH_BUFFER_BIT);
-                                gDisplaySwapBuffers = FALSE;
+                                gDepthDirty = TRUE;
                                 
                                 
                                 gGL.color4f(1,1,1,1);
diff --git a/linden/indra/newview/llface.cpp b/linden/indra/newview/llface.cpp
index 3e0c5b2..77251ce 100644
--- a/linden/indra/newview/llface.cpp
+++ b/linden/indra/newview/llface.cpp
@@ -57,6 +57,7 @@
 extern BOOL gPickFaces;
 
 BOOL LLFace::sSafeRenderSelect = TRUE; // FALSE
+S32  LLFace::sDeleteLock = 0 ;
 
 #define DOTVEC(a,b) (a.mV[0]*b.mV[0] + a.mV[1]*b.mV[1] + a.mV[2]*b.mV[2])
 
@@ -177,6 +178,9 @@ void LLFace::init(LLDrawable* drawablep, LLViewerObject* objp)
 
 void LLFace::destroy()
 {
+        llassert_always(sDeleteLock >= 1);
+        --sDeleteLock;
+        
         mDrawablep = NULL;
         mVObjp = NULL;
 
diff --git a/linden/indra/newview/llface.h b/linden/indra/newview/llface.h
index 533851c..35063a0 100644
--- a/linden/indra/newview/llface.h
+++ b/linden/indra/newview/llface.h
@@ -296,6 +296,9 @@ public:
                                 lhs->getTexture() < rhs->getTexture();
                 }
         };
+
+public://paranoia check only
+        static S32 sDeleteLock ;
 };
 
 #endif // LL_LLFACE_H
diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp
index e6dee2c..b3d383d 100644
--- a/linden/indra/newview/llfirstuse.cpp
+++ b/linden/indra/newview/llfirstuse.cpp
@@ -37,6 +37,7 @@
 #include "indra_constants.h"
 
 // viewer includes
+#include "llagent.h"    // for gAgent.inPrelude()
 #include "llnotify.h"
 #include "llviewercontrol.h"
 #include "llui.h"
@@ -107,12 +108,14 @@ void LLFirstUse::useBalanceDecrease(S32 delta)
 // static
 void LLFirstUse::useSit()
 {
-        if (gSavedSettings.getWarning("FirstSit"))
-        {
-                gSavedSettings.setWarning("FirstSit", FALSE);
-
-                LLNotifyBox::showXml("FirstSit");
-        }
+        // Our orientation island uses sitting to teach vehicle driving
+        // so just never show this message. JC
+        //if (gSavedSettings.getWarning("FirstSit"))
+        //{
+        //      gSavedSettings.setWarning("FirstSit", FALSE);
+
+        //      LLNotifyBox::showXml("FirstSit");
+        //}
 }
 
 // static
@@ -168,11 +171,16 @@ void LLFirstUse::useTeleport()
 // static
 void LLFirstUse::useOverrideKeys()
 {
-        if (gSavedSettings.getWarning("FirstOverrideKeys"))
+        // Our orientation island uses key overrides to teach vehicle driving
+        // so don't show this message until you get off OI. JC
+        if (!gAgent.inPrelude())
         {
-                gSavedSettings.setWarning("FirstOverrideKeys", FALSE);
+                if (gSavedSettings.getWarning("FirstOverrideKeys"))
+                {
+                        gSavedSettings.setWarning("FirstOverrideKeys", FALSE);
 
-                LLNotifyBox::showXml("FirstOverrideKeys");
+                        LLNotifyBox::showXml("FirstOverrideKeys");
+                }
         }
 }
 
diff --git a/linden/indra/newview/llflexibleobject.cpp b/linden/indra/newview/llflexibleobject.cpp
index ec49c1a..95e6d17 100644
--- a/linden/indra/newview/llflexibleobject.cpp
+++ b/linden/indra/newview/llflexibleobject.cpp
@@ -305,7 +305,7 @@ BOOL LLVolumeImplFlexible::doIdleUpdate(LLAgent &agent, LLWorld &world, const F6
                 new_res = mRenderRes;
         }
 
-        if (!mInitialized)
+        if (!mInitialized || (mSimulateRes != new_res))
         {
                 mSimulateRes = new_res;
                 setAttributesOfAllSections();
diff --git a/linden/indra/newview/llfloateranimpreview.cpp b/linden/indra/newview/llfloateranimpreview.cpp
index 82729e9..ca6982b 100644
--- a/linden/indra/newview/llfloateranimpreview.cpp
+++ b/linden/indra/newview/llfloateranimpreview.cpp
@@ -1037,7 +1037,7 @@ LLPreviewAnimation::LLPreviewAnimation(S32 width, S32 height) : LLDynamicTexture
         mDummyAvatar = (LLVOAvatar*)gObjectList.createObjectViewer(LL_PCODE_LEGACY_AVATAR, gAgent.getRegion());
         mDummyAvatar->createDrawable(&gPipeline);
         mDummyAvatar->mIsDummy = TRUE;
-        mDummyAvatar->mSpecialRenderMode = 1;
+        mDummyAvatar->mSpecialRenderMode = 2;
         mDummyAvatar->setPositionAgent(LLVector3::zero);
         mDummyAvatar->slamPosition();
         mDummyAvatar->updateJointLODs();
diff --git a/linden/indra/newview/llfloateravatarinfo.cpp b/linden/indra/newview/llfloateravatarinfo.cpp
index 942a394..d4b0b1c 100644
--- a/linden/indra/newview/llfloateravatarinfo.cpp
+++ b/linden/indra/newview/llfloateravatarinfo.cpp
@@ -120,6 +120,7 @@ LLFloaterAvatarInfo::LLFloaterAvatarInfo(const std::string& name, const LLRect &
                 mPanelAvatarp->selectTab(0);
         }
 
+        llassert_always(!gAvatarInfoInstances.checkData(mAvatarID));//if not inserted.
         gAvatarInfoInstances.addData(avatar_id, this);
 
         
@@ -128,8 +129,12 @@ LLFloaterAvatarInfo::LLFloaterAvatarInfo(const std::string& name, const LLRect &
 // virtual
 LLFloaterAvatarInfo::~LLFloaterAvatarInfo()
 {
+        llassert_always(gAvatarInfoInstances.checkData(mAvatarID));//if there
+        llinfos << "to remove profile floater for avatar " << mAvatarID << llendl ;
         // child views automatically deleted
         gAvatarInfoInstances.removeData(mAvatarID);
+        
+        llinfos << "successfully removed profile floater for avatar " << mAvatarID << llendl ;
 
 }
 
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index d05b231..383a33e 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -207,7 +207,8 @@ void add_timestamped_line(LLViewerTextEditor* edit, const LLChat &chat, const LL
         {
                 line = line.substr(chat.mFromName.length());
                 const LLStyleSP &sourceStyle = LLStyleMap::instance().lookup(chat.mFromID);
-                edit->appendStyledText(chat.mFromName, false, false, &sourceStyle);
+                edit->appendStyledText(chat.mFromName, false, prepend_newline, &sourceStyle);
+                prepend_newline = false;
         }
         edit->appendColoredText(line, false, prepend_newline, color);
 }
diff --git a/linden/indra/newview/llfloaterreporter.cpp b/linden/indra/newview/llfloaterreporter.cpp
index 9c43f35..49c6e83 100644
--- a/linden/indra/newview/llfloaterreporter.cpp
+++ b/linden/indra/newview/llfloaterreporter.cpp
@@ -898,7 +898,7 @@ void LLFloaterReporter::takeScreenshot()
                                                 mResourceDatap->mAssetInfo.mType);
 
         // store in the image list so it doesn't try to fetch from the server
-        LLViewerImage* image_in_list = new LLViewerImage(mResourceDatap->mAssetInfo.mUuid, TRUE);
+        LLPointer<LLViewerImage> image_in_list = new LLViewerImage(mResourceDatap->mAssetInfo.mUuid, TRUE);
         image_in_list->createGLTexture(0, raw);
         gImageList.addImage(image_in_list); 
 
diff --git a/linden/indra/newview/llfloatertos.cpp b/linden/indra/newview/llfloatertos.cpp
index 920ef4c..e4073f1 100644
--- a/linden/indra/newview/llfloatertos.cpp
+++ b/linden/indra/newview/llfloatertos.cpp
@@ -215,7 +215,7 @@ LLFloaterTOS::~LLFloaterTOS()
         LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("tos_html");
         if ( web_browser )
         {
-                web_browser->addObserver( this );               
+                web_browser->remObserver( this );               
         };
 
         // tell the responder we're not here anymore
diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp
index 75fbff2..e8b6caa 100644
--- a/linden/indra/newview/llfloaterworldmap.cpp
+++ b/linden/indra/newview/llfloaterworldmap.cpp
@@ -871,6 +871,8 @@ void LLFloaterWorldMap::buildLandmarkIDLists()
         {
                 list->selectItemRange(1, -1);
                 list->operateOnSelection(LLCtrlListInterface::OP_DELETE);
+
+                llassert_always(list->getItemCount() == 1) ;
         }
 
         mLandmarkItemIDList.reset();
diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index b543e31..4833c12 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -349,10 +349,10 @@ void LLFolderViewItem::arrangeFromRoot()
 // UI. If open is TRUE, then folders are opened up along the way to
 // the selection.
 void LLFolderViewItem::setSelectionFromRoot(LLFolderViewItem* selection,
-                                                                                        BOOL open,                                      /* Flawfinder: ignore */
+                                                                                        BOOL openitem,
                                                                                         BOOL take_keyboard_focus)
 {
-        getRoot()->setSelection(selection, open, take_keyboard_focus);          /* Flawfinder: ignore */
+        getRoot()->setSelection(selection, openitem, take_keyboard_focus);
 }
 
 // helper function to change the selection from the root.
@@ -368,7 +368,7 @@ void LLFolderViewItem::extendSelectionFromRoot(LLFolderViewItem* selection)
         getRoot()->extendSelection(selection, NULL, selected_items);
 }
 
-EInventorySortGroup LLFolderViewItem::getSortGroup() 
+EInventorySortGroup LLFolderViewItem::getSortGroup()  const
 { 
         return SG_ITEM; 
 }
@@ -442,7 +442,7 @@ void LLFolderViewItem::dirtyFilter()
 // means 'deselect' for a leaf item. Do this optimization after
 // multiple selection is implemented to make sure it all plays nice
 // together.
-BOOL LLFolderViewItem::setSelection(LLFolderViewItem* selection, BOOL open, BOOL take_keyboard_focus)
+BOOL LLFolderViewItem::setSelection(LLFolderViewItem* selection, BOOL openitem, BOOL take_keyboard_focus)
 {
         if( selection == this )
         {
@@ -548,7 +548,7 @@ void LLFolderViewItem::buildContextMenu(LLMenuGL& menu, U32 flags)
         }
 }
 
-void LLFolderViewItem::open( void )             /* Flawfinder: ignore */
+void LLFolderViewItem::openItem( void )
 {
         if( mListener )
         {
@@ -989,9 +989,6 @@ LLFolderViewFolder::LLFolderViewFolder( const LLString& name, LLUIImagePtr icon,
         mMostFilteredDescendantGeneration(-1)
 {
         mType = "(folder)";
-
-        //mItems.setInsertBefore( &sort_item_name );
-        //mFolders.setInsertBefore( &folder_insert_before );
 }
 
 // Destroys the object
@@ -1000,10 +997,6 @@ LLFolderViewFolder::~LLFolderViewFolder( void )
         // The LLView base class takes care of object destruction. make sure that we
         // don't have mouse or keyboard focus
         gFocusMgr.releaseFocusIfNeeded( this ); // calls onCommit()
-
-        //mItems.reset();
-        //mItems.removeAllNodes();
-        //mFolders.removeAllNodes();
 }
 
 // addToFolder() returns TRUE if it succeeds. FALSE otherwise
@@ -1048,9 +1041,7 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height, S32 filter_generation)
                         // Add sizes of children
                         S32 parent_item_height = getRect().getHeight();
 
-                        folders_t::iterator fit = mFolders.begin();
-                        folders_t::iterator fend = mFolders.end();
-                        for(; fit < fend; ++fit)
+                        for(folders_t::iterator fit = mFolders.begin(); fit != mFolders.end(); ++fit)
                         {
                                 LLFolderViewFolder* folderp = (*fit);
                                 if (getRoot()->getDebugFilters())
@@ -1076,9 +1067,8 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height, S32 filter_generation)
                                         folderp->setOrigin( 0, child_top - folderp->getRect().getHeight() );
                                 }
                         }
-                        items_t::iterator iit = mItems.begin();
-                        items_t::iterator iend = mItems.end();
-                        for(;iit < iend; ++iit)
+                        for(items_t::iterator iit = mItems.begin();
+                                iit != mItems.end(); ++iit)
                         {
                                 LLFolderViewItem* itemp = (*iit);
                                 if (getRoot()->getDebugFilters())
@@ -1354,7 +1344,7 @@ BOOL LLFolderViewFolder::hasFilteredDescendants()
 
 // Passes selection information on to children and record selection
 // information if necessary.
-BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL open,           /* Flawfinder: ignore */
+BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL openitem,
                                                                           BOOL take_keyboard_focus)
 {
         BOOL rv = FALSE;
@@ -1378,7 +1368,7 @@ BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL open,		/
                  iter != mFolders.end();)
         {
                 folders_t::iterator fit = iter++;
-                if((*fit)->setSelection(selection, open, take_keyboard_focus))          /* Flawfinder: ignore */
+                if((*fit)->setSelection(selection, openitem, take_keyboard_focus))
                 {
                         rv = TRUE;
                         child_selected = TRUE;
@@ -1389,14 +1379,14 @@ BOOL LLFolderViewFolder::setSelection(LLFolderViewItem* selection, BOOL open,		/
                  iter != mItems.end();)
         {
                 items_t::iterator iit = iter++;
-                if((*iit)->setSelection(selection, open, take_keyboard_focus))          /* Flawfinder: ignore */
+                if((*iit)->setSelection(selection, openitem, take_keyboard_focus))
                 {
                         rv = TRUE;
                         child_selected = TRUE;
                         mNumDescendantsSelected++;
                 }
         }
-        if(open && child_selected)              /* Flawfinder: ignore */
+        if(openitem && child_selected)
         {
                 setOpenArrangeRecursively(TRUE);
         }
@@ -1636,11 +1626,9 @@ void LLFolderViewFolder::destroyView()
         while (!mFolders.empty())
         {
                 LLFolderViewFolder *folderp = mFolders.back();
-                folderp->destroyView();
+                folderp->destroyView(); // removes entry from mFolders
         }
 
-        mFolders.clear();
-
         deleteAllChildren();
         
         if (mParentFolder)
@@ -1711,11 +1699,11 @@ void LLFolderViewFolder::extractItem( LLFolderViewItem* item )
 // This is only called for renaming an object because it won't work for date
 void LLFolderViewFolder::resort(LLFolderViewItem* item)
 {
-        std::sort(mItems.begin(), mItems.end(), mSortFunction);
-        std::sort(mFolders.begin(), mFolders.end(), mSortFunction);
+        mItems.sort(mSortFunction);
+        mFolders.sort(mSortFunction);
 }
 
-bool LLFolderViewFolder::isTrash()
+bool LLFolderViewFolder::isTrash() const
 {
         if (mAmTrash == LLFolderViewFolder::UNKNOWN)
         {
@@ -1740,8 +1728,8 @@ void LLFolderViewFolder::sortBy(U32 order)
                 (*fit)->sortBy(order);
         }
 
-        std::sort(mFolders.begin(), mFolders.end(), mSortFunction);
-        std::sort(mItems.begin(), mItems.end(), mSortFunction);
+        mFolders.sort(mSortFunction);
+        mItems.sort(mSortFunction);
 
         if (order & LLInventoryFilter::SO_DATE)
         {
@@ -1776,12 +1764,12 @@ void LLFolderViewFolder::setItemSortOrder(U32 ordering)
                         (*fit)->setItemSortOrder(ordering);
                 }
 
-                std::sort(mFolders.begin(), mFolders.end(), mSortFunction);
-                std::sort(mItems.begin(), mItems.end(), mSortFunction);
+                mFolders.sort(mSortFunction);
+                mItems.sort(mSortFunction);
         }
 }
 
-EInventorySortGroup LLFolderViewFolder::getSortGroup()
+EInventorySortGroup LLFolderViewFolder::getSortGroup() const
 {
         if (isTrash())
         {
@@ -1928,16 +1916,16 @@ void LLFolderViewFolder::toggleOpen()
 }
 
 // Force a folder open or closed
-void LLFolderViewFolder::setOpen(BOOL open)             /* Flawfinder: ignore */
+void LLFolderViewFolder::setOpen(BOOL openitem)
 {
-        setOpenArrangeRecursively(open);                /* Flawfinder: ignore */
+        setOpenArrangeRecursively(openitem);
 }
 
-void LLFolderViewFolder::setOpenArrangeRecursively(BOOL open, ERecurseType recurse)             /* Flawfinder: ignore */
+void LLFolderViewFolder::setOpenArrangeRecursively(BOOL openitem, ERecurseType recurse)
 {
         BOOL was_open = mIsOpen;
-        mIsOpen = open;         /* Flawfinder: ignore */
-        if(!was_open && open)           /* Flawfinder: ignore */
+        mIsOpen = openitem;
+        if(!was_open && openitem)
         {
                 if(mListener)
                 {
@@ -1951,12 +1939,12 @@ void LLFolderViewFolder::setOpenArrangeRecursively(BOOL open, ERecurseType recur
                          iter != mFolders.end();)
                 {
                         folders_t::iterator fit = iter++;
-                        (*fit)->setOpenArrangeRecursively(open, RECURSE_DOWN);          /* Flawfinder: ignore */
+                        (*fit)->setOpenArrangeRecursively(openitem, RECURSE_DOWN);              /* Flawfinder: ignore */
                 }
         }
         if (mParentFolder && (recurse == RECURSE_UP || recurse == RECURSE_UP_DOWN))
         {
-                mParentFolder->setOpenArrangeRecursively(open, RECURSE_UP);             /* Flawfinder: ignore */
+                mParentFolder->setOpenArrangeRecursively(openitem, RECURSE_UP);
         }
         
         if (was_open != mIsOpen)
@@ -1989,7 +1977,7 @@ BOOL LLFolderViewFolder::handleDragAndDropFromChild(MASK mask,
         return TRUE;
 }
 
-void LLFolderViewFolder::open( void )           /* Flawfinder: ignore */
+void LLFolderViewFolder::openItem( void )
 {
         toggleOpen();
 }
@@ -2687,10 +2675,10 @@ void LLFolderView::openFolder(const LLString& foldername)
         }
 }
 
-void LLFolderView::setOpenArrangeRecursively(BOOL open, ERecurseType recurse)           /* Flawfinder: ignore */
+void LLFolderView::setOpenArrangeRecursively(BOOL openitem, ERecurseType recurse)
 {
         // call base class to do proper recursion
-        LLFolderViewFolder::setOpenArrangeRecursively(open, recurse);           /* Flawfinder: ignore */
+        LLFolderViewFolder::setOpenArrangeRecursively(openitem, recurse);
         // make sure root folder is always open
         mIsOpen = TRUE;
 }
@@ -2866,7 +2854,7 @@ LLFolderViewItem* LLFolderView::getCurSelectedItem( void )
 
 
 // Record the selected item and pass it down the hierachy.
-BOOL LLFolderView::setSelection(LLFolderViewItem* selection, BOOL open,         /* Flawfinder: ignore */
+BOOL LLFolderView::setSelection(LLFolderViewItem* selection, BOOL openitem,
                                                                 BOOL take_keyboard_focus)
 {
         if( selection == this )
@@ -2888,8 +2876,8 @@ BOOL LLFolderView::setSelection(LLFolderViewItem* selection, BOOL open,		/* Flaw
                 addToSelectionList(selection);
         }
 
-        BOOL rv = LLFolderViewFolder::setSelection(selection, open, take_keyboard_focus);
-        if(open && selection)
+        BOOL rv = LLFolderViewFolder::setSelection(selection, openitem, take_keyboard_focus);
+        if(openitem && selection)
         {
                 selection->getParentFolder()->requestArrange();
         }
@@ -3349,7 +3337,7 @@ void LLFolderView::openSelectedItems( void )
         {
                 if (mSelectedItems.size() == 1)
                 {
-                        mSelectedItems.front()->open();         /* Flawfinder: ignore */
+                        mSelectedItems.front()->openItem();
                 }
                 else
                 {
@@ -3371,7 +3359,7 @@ void LLFolderView::openSelectedItems( void )
                                         LLFloater::setFloaterHost(multi_propertiesp);
                                 else
                                         LLFloater::setFloaterHost(multi_previewp);
-                                (*item_it)->open();
+                                (*item_it)->openItem();
                         }
 
                         LLFloater::setFloaterHost(NULL);
@@ -4358,7 +4346,7 @@ bool LLInventorySort::updateSort(U32 order)
         return false;
 }
 
-bool LLInventorySort::operator()(LLFolderViewItem* a, LLFolderViewItem* b)
+bool LLInventorySort::operator()(const LLFolderViewItem* const& a, const LLFolderViewItem* const& b)
 {
         // We sort by name if we aren't sorting by date
         // OR if these are folders and we are sorting folders by name.
diff --git a/linden/indra/newview/llfolderview.h b/linden/indra/newview/llfolderview.h
index bbf4b1d..3858388 100644
--- a/linden/indra/newview/llfolderview.h
+++ b/linden/indra/newview/llfolderview.h
@@ -295,7 +295,7 @@ public:
         bool updateSort(U32 order);
         U32 getSort() { return mSortOrder; }
 
-        bool operator()(LLFolderViewItem* a, LLFolderViewItem* b);
+        bool operator()(const LLFolderViewItem* const& a, const LLFolderViewItem* const& b);
 private:
         U32  mSortOrder;
         bool mByDate;
@@ -361,7 +361,7 @@ protected:
         // the specified selected item appropriately for display and use
         // in the UI. If open is TRUE, then folders are opened up along
         // the way to the selection.
-        void setSelectionFromRoot(LLFolderViewItem* selection, BOOL open,               /* Flawfinder: ignore */
+        void setSelectionFromRoot(LLFolderViewItem* selection, BOOL openitem,
                 BOOL take_keyboard_focus = TRUE);
 
         // helper function to change the selection from the root.
@@ -390,7 +390,7 @@ public:
         enum { ARRANGE = TRUE, DO_NOT_ARRANGE = FALSE };
         virtual BOOL addToFolder(LLFolderViewFolder* folder, LLFolderView* root);
 
-        virtual EInventorySortGroup getSortGroup();
+        virtual EInventorySortGroup getSortGroup() const;
 
         // Finds width and height of this object and it's children.  Also
         // makes sure that this view and it's children are the right size.
@@ -409,7 +409,7 @@ public:
         // ignore. Returns TRUE if this object was affected. If open is
         // TRUE, then folders are opened up along the way to the
         // selection.
-        virtual BOOL setSelection(LLFolderViewItem* selection, BOOL open,               /* Flawfinder: ignore */
+        virtual BOOL setSelection(LLFolderViewItem* selection, BOOL openitem,
                 BOOL take_keyboard_focus);
 
         // This method is used to toggle the selection of an item. If
@@ -479,7 +479,7 @@ public:
         void rename(const LLString& new_name);
 
         // open
-        virtual void open( void );              /* Flawfinder: ignore */
+        virtual void openItem( void );
         virtual void preview(void);
 
         // Show children (unfortunate that this is called "open")
@@ -544,8 +544,8 @@ public:
         } ETrash;
 
 protected:
-        typedef std::vector<LLFolderViewItem*> items_t;
-        typedef std::vector<LLFolderViewFolder*> folders_t;
+        typedef std::list<LLFolderViewItem*> items_t;
+        typedef std::list<LLFolderViewFolder*> folders_t;
         items_t mItems;
         folders_t mFolders;
         LLInventorySort mSortFunction;
@@ -556,7 +556,7 @@ protected:
         F32                     mTargetHeight;
         F32                     mAutoOpenCountdown;
         U32                     mSubtreeCreationDate;
-        ETrash          mAmTrash;
+        mutable ETrash mAmTrash;
         S32                     mLastArrangeGeneration;
         S32                     mLastCalculatedWidth;
         S32                     mCompletedFilterGeneration;
@@ -590,7 +590,7 @@ public:
         BOOL needsArrange();
 
         // Returns the sort group (system, trash, folder) for this folder.
-        virtual EInventorySortGroup getSortGroup();
+        virtual EInventorySortGroup getSortGroup() const;
 
         virtual void    setCompletedFilterGeneration(S32 generation, BOOL recurse_up);
         virtual S32             getCompletedFilterGeneration() { return mCompletedFilterGeneration; }
@@ -606,8 +606,8 @@ public:
         // Passes selection information on to children and record
         // selection information if necessary. Returns TRUE if this object
         // (or a child) was affected.
-        virtual BOOL setSelection(LLFolderViewItem* selection, BOOL open,               /* Flawfinder: ignore */
-                BOOL take_keyboard_focus);
+        virtual BOOL setSelection(LLFolderViewItem* selection, BOOL openitem,
+                                                          BOOL take_keyboard_focus);
 
         // This method is used to change the selection of an item. If
         // selection is 'this', then note selection as true. Returns TRUE
@@ -660,7 +660,7 @@ public:
         virtual void toggleOpen();
 
         // Force a folder open or closed
-        virtual void setOpen(BOOL open = TRUE);         /* Flawfinder: ignore */
+        virtual void setOpen(BOOL openitem = TRUE);
 
         // Called when a child is refreshed.
         // don't rearrange child folder contents unless explicitly requested
@@ -670,7 +670,7 @@ public:
         // method was written because the list iterators destroy the state
         // of other iterations, thus, we can't arrange while iterating
         // through the children (such as when setting which is selected.
-        virtual void setOpenArrangeRecursively(BOOL open, ERecurseType recurse = RECURSE_NO);           /* Flawfinder: ignore */
+        virtual void setOpenArrangeRecursively(BOOL openitem, ERecurseType recurse = RECURSE_NO);
 
         // Get the current state of the folder.
         virtual BOOL isOpen() { return mIsOpen; }
@@ -686,7 +686,7 @@ public:
         void applyFunctorRecursively(LLFolderViewFunctor& functor);
         virtual void applyListenerFunctorRecursively(LLFolderViewListenerFunctor& functor);
 
-        virtual void open( void );              /* Flawfinder: ignore */
+        virtual void openItem( void );
         virtual BOOL addItem(LLFolderViewItem* item); 
         virtual BOOL addFolder( LLFolderViewFolder* folder);
 
@@ -703,7 +703,7 @@ public:
         virtual void draw();
 
         U32 getCreationDate() const;
-        bool isTrash();
+        bool isTrash() const;
 };
 
 
@@ -752,7 +752,7 @@ public:
         void openFolder(const LLString& foldername);
 
         virtual void toggleOpen() {};
-        virtual void setOpenArrangeRecursively(BOOL open, ERecurseType recurse);                /* Flawfinder: ignore */
+        virtual void setOpenArrangeRecursively(BOOL openitem, ERecurseType recurse);
         virtual BOOL addFolder( LLFolderViewFolder* folder);
 
         // Finds width and height of this object and it's children.  Also
@@ -769,7 +769,7 @@ public:
         virtual LLFolderViewItem* getCurSelectedItem( void );
 
         // Record the selected item and pass it down the hierachy.
-        virtual BOOL setSelection(LLFolderViewItem* selection, BOOL open,               /* Flawfinder: ignore */
+        virtual BOOL setSelection(LLFolderViewItem* selection, BOOL openitem,
                 BOOL take_keyboard_focus);
 
         // This method is used to toggle the selection of an item. Walks
diff --git a/linden/indra/newview/llgroupnotify.cpp b/linden/indra/newview/llgroupnotify.cpp
index d760e8b..bef8eb5 100644
--- a/linden/indra/newview/llgroupnotify.cpp
+++ b/linden/indra/newview/llgroupnotify.cpp
@@ -414,7 +414,14 @@ void LLGroupNotifyBox::moveToBack()
         if (sGroupNotifyBoxCount > 1)
         {
                 LLView* view = gNotifyBoxView->getFirstChild();
+                
+                llassert_always(view) ;
+                llassert_always(view->getName() == "groupnotify");
+                
                 LLGroupNotifyBox* front = (LLGroupNotifyBox*)view;
+                
+                llassert_always(front->mNextBtn) ;
+
                 front->mNextBtn->setVisible(TRUE);
         }
 }
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index 2e3682d..d354dbb 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -1488,14 +1488,15 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4
                 // Don't hotlink any messages from the system (e.g. "Second Life:"), so just add those in plain text.
                 if (!strcmp(name,SYSTEM_FROM))
                 {
-                        mHistoryEditor->appendColoredText(name,false,false,color);
+                        mHistoryEditor->appendColoredText(name,false,prepend_newline,color);
                 }
                 else
                 {
                         // Convert the name to a hotlink and add to message.
                         const LLStyleSP &source_style = LLStyleMap::instance().lookup(source);
-                        mHistoryEditor->appendStyledText(name, false, false, &source_style);
+                        mHistoryEditor->appendStyledText(name,false,prepend_newline,&source_style);
                 }
+                prepend_newline = false;
         }
         mHistoryEditor->appendColoredText(utf8msg, false, prepend_newline, color);
         
diff --git a/linden/indra/newview/llpaneldirfind.cpp b/linden/indra/newview/llpaneldirfind.cpp
index 9bf71d9..92964ba 100644
--- a/linden/indra/newview/llpaneldirfind.cpp
+++ b/linden/indra/newview/llpaneldirfind.cpp
@@ -236,12 +236,20 @@ std::string LLPanelDirFind::buildSearchURL(const std::string& search_text, const
 
                 url = gSavedSettings.getString("SearchURLQuery");
                 std::string substring = "[QUERY]";
-                url.replace(url.find(substring), substring.length(), query);
+                std::string::size_type where = url.find(substring);
+                if (where != std::string::npos)
+                {
+                        url.replace(where, substring.length(), query);
+                }
 
                 // replace the collection name with the one selected from the combo box
                 // std::string selected_collection = childGetValue( "Category" ).asString();
                 substring = "[COLLECTION]";
-                url.replace(url.find(substring), substring.length(), collection);
+                where = url.find(substring);
+                if (where != std::string::npos)
+                {
+                        url.replace(where, substring.length(), collection);
+                }
 
                 llinfos << "url " << url << llendl;
         }
diff --git a/linden/indra/newview/llpaneldirplaces.cpp b/linden/indra/newview/llpaneldirplaces.cpp
index 3980fb4..b75218b 100644
--- a/linden/indra/newview/llpaneldirplaces.cpp
+++ b/linden/indra/newview/llpaneldirplaces.cpp
@@ -33,37 +33,173 @@
 
 #include "llpaneldirplaces.h"
 
-#include "llwebbrowserctrl.h"
+// linden library includes
+//#include "llfontgl.h"
+#include "message.h"
+//#include "lldir.h"
+#include "llparcel.h"                   // parcel categories
+//#include "llregionflags.h"
+#include "llqueryflags.h"
+
+// viewer project includes
+#include "llagent.h"                    // getID(), isTeen()
+//#include "llbutton.h"
+//#include "llcheckboxctrl.h"
+//#include "llcombobox.h"
+//#include "llfloaterdirectory.h"
+//#include "lllineeditor.h"
+#include "llviewerwindow.h"             // alertXml()
+#include "llpaneldirbrowser.h"
+//#include "lltextbox.h"
+//#include "lluiconstants.h"
+#include "llviewercontrol.h"    // gSavedSettings
+#include "llviewermessage.h"
+//#include "llworldmap.h"
 
 LLPanelDirPlaces::LLPanelDirPlaces(const std::string& name, LLFloaterDirectory* floater)
-:       LLPanelDirFind(name, floater, "places_browser")
+        :       LLPanelDirBrowser(name, floater)
+{
+        // MBW -- HACK!!!
+        // This looks like some sort of compiler bug.  We have a mysterious crash during initialization on powerpc boxes.
+        // The crash seems unrelated to this code, but the commit that introduced it was narrowed down to this file.
+        // Adding llinfos calls to both the constructor and destructor here makes the crash go away, even though they don't get called before the point of the crash.
+        // This is wrong on many levels and scares the hell out of me.
+        llinfos << "called" << llendl;
+        mMinSearchChars = 3;
+}
+
+BOOL LLPanelDirPlaces::postBuild()
+{
+        LLPanelDirBrowser::postBuild();
+
+        childSetKeystrokeCallback("name", &LLPanelDirBrowser::onKeystrokeName, this);
+
+        childSetAction("Search", &LLPanelDirBrowser::onClickSearchCore, this);
+        childDisable("Search");
+
+        mCurrentSortColumn = "dwell";
+        mCurrentSortAscending = FALSE;
+
+        // Don't prepopulate the places list, as it hurts the database as of 2006-12-04. JC
+        // initialQuery();
+
+        return TRUE;
+}
+
+LLPanelDirPlaces::~LLPanelDirPlaces()
 {
+        // MBW -- HACK!!!
+        // This looks like some sort of compiler bug.  We have a mysterious crash during initialization on powerpc boxes.
+        // The crash seems unrelated to this code, but the commit that introduced it was narrowed down to this file.
+        // Adding llinfos calls to both the constructor and destructor here makes the crash go away, even though they don't get called before the point of the crash.
+        // This is wrong on many levels and scares the hell out of me.
+        llinfos << "called" << llendl;
+        // Children all cleaned up by default view destructor.
 }
 
 
-void LLPanelDirPlaces::search(const std::string& search_text)
+// virtual
+void LLPanelDirPlaces::draw()
+{
+        // You only have a choice if you are mature
+        childSetVisible("incmature", !gAgent.isTeen());
+        childSetValue("incmature", gSavedSettings.getBOOL("ShowMatureSims"));
+        
+        LLPanelDirBrowser::draw();
+}
+
+// virtual
+void LLPanelDirPlaces::performQuery()
 {
-        if (!search_text.empty())
+        LLString place_name = childGetValue("name").asString();
+        if (place_name.length() < mMinSearchChars)
         {
-                bool mature = childGetValue( "mature_check" ).asBoolean();
-                std::string selected_collection = "Places";
-                std::string url = buildSearchURL(search_text, selected_collection, mature);
-                if (mWebBrowser)
-                {
-                        mWebBrowser->navigateTo(url);
-                }
+                return;
+        }
+
+    // "hi " is three chars but not a long-enough search
+        std::string query_string = place_name;
+        LLString::trim( query_string );
+        bool query_was_filtered = (query_string != place_name);
+
+        // possible we threw away all the short words in the query so check length
+        if ( query_string.length() < mMinSearchChars )
+        {
+                gViewerWindow->alertXml("SeachFilteredOnShortWordsEmpty");
+                return;
+        };
+
+        // if we filtered something out, display a popup
+        if ( query_was_filtered )
+        {
+                LLString::format_map_t args;
+                args["[FINALQUERY]"] = query_string;
+                gViewerWindow->alertXml("SeachFilteredOnShortWords", args);
+        };
+
+        LLString catstring = childGetValue("Category").asString();
+        
+        // Because LLParcel::C_ANY is -1, must do special check
+        S32 category = 0;
+        if (catstring == "any")
+        {
+                category = LLParcel::C_ANY;
         }
         else
         {
-                // empty search text
-                navigateToDefaultPage();
+                category = LLParcel::getCategoryFromString(catstring.c_str());
         }
 
-        childSetText("search_editor", search_text);
+        BOOL pg_only = !gSavedSettings.getBOOL("ShowMatureSims") 
+                                   || gAgent.isTeen();
+
+        queryCore(query_string, category, pg_only);
 }
 
-LLPanelDirPlaces::~LLPanelDirPlaces()
+void LLPanelDirPlaces::initialQuery()
 {
-        // Children all cleaned up by default view destructor.
+        // All Linden locations in PG/Mature sims, any name.
+        const BOOL pg_only = FALSE;
+        queryCore("", LLParcel::C_LINDEN, pg_only);
+}
+
+void LLPanelDirPlaces::queryCore(const LLString& name, 
+                                                                 S32 category, 
+                                                                 BOOL pg_only)
+{
+        setupNewSearch();
+
+        // send the message
+        U32 flags = 0x0;
+
+        if (pg_only)
+        {
+                flags |= DFQ_PG_PARCELS_ONLY;
+        }
+
+// JC: Sorting by dwell severely impacts the performance of the query.
+// Instead of sorting on the dataserver, we sort locally once the results
+// are received.
+// IW: Re-enabled dwell sort based on new 3-character minimum description
+// Hopefully we'll move to next-gen Find before this becomes a big problem
+
+        flags |= DFQ_DWELL_SORT;
+
+        LLMessageSystem* msg = gMessageSystem;
+
+        msg->newMessage("DirPlacesQuery");
+        msg->nextBlock("AgentData");
+        msg->addUUID("AgentID", gAgent.getID());
+        msg->addUUID("SessionID", gAgent.getSessionID());
+        msg->nextBlock("QueryData");
+        msg->addUUID("QueryID", getSearchID());
+        msg->addString("QueryText", name);
+        msg->addU32("QueryFlags", flags);
+        msg->addS8("Category", (S8)category);
+        // No longer support queries by region name, too many regions
+        // for combobox, no easy way to do autocomplete. JC
+        msg->addString("SimName", "");
+        msg->addS32Fast(_PREHASH_QueryStart,mSearchStart);
+        gAgent.sendReliableMessage();
 }
 
diff --git a/linden/indra/newview/llpaneldirplaces.h b/linden/indra/newview/llpaneldirplaces.h
index 4785f94..7bc2b08 100644
--- a/linden/indra/newview/llpaneldirplaces.h
+++ b/linden/indra/newview/llpaneldirplaces.h
@@ -32,17 +32,31 @@
 #ifndef LL_LLPANELDIRPLACES_H
 #define LL_LLPANELDIRPLACES_H
 
-#include "llpaneldirfind.h"
+#include "llpaneldirbrowser.h"
 
 // UI class forward declarations
+class LLLineEditor;
 
-class LLPanelDirPlaces : public LLPanelDirFind
+class LLPanelDirPlaces : public LLPanelDirBrowser
 {
 public:
         LLPanelDirPlaces(const std::string& name, LLFloaterDirectory* floater);
         virtual ~LLPanelDirPlaces();
 
-        /*virtual*/ void search(const std::string& search_text);
+        /*virtual*/ void draw();
 
+        virtual BOOL postBuild();
+
+        static void onClickSearch(void *userdata);
+        static void onKeystrokeName(LLLineEditor* line, void* data);
+
+        void performQuery();
+
+        // Initially fill in some data for the panel.
+        void initialQuery();
+
+private:
+        void queryCore(const LLString& name, S32 category, BOOL pg_only);
 };
+
 #endif
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index 17fca4e..ee676b0 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -55,9 +55,7 @@
 #include "llui.h"
 #include "llurlsimstring.h"
 #include "llviewercontrol.h"
-#include "llappviewer.h"
 #include "llurlsimstring.h"
-#include "llappviewer.h"
 
 #include "llcheckboxctrl.h"
 #include "llradiogroup.h"
@@ -85,7 +83,7 @@ static void set_render_name_fade_out(LLUICtrl* ctrl, void* data)
 
 void set_crash_behavior(LLUICtrl* ctrl, void* data)
 {
-        LLAppViewer::instance()->setCrashBehavior(((LLComboBox*) ctrl)->getCurrentIndex());
+        gCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, ((LLComboBox*) ctrl)->getCurrentIndex());
 }
 
 void set_language(LLUICtrl* ctrl, void* data)
@@ -145,7 +143,7 @@ BOOL LLPanelGeneral::postBuild()
         combo = getChild<LLComboBox>( "crash_behavior_combobox");
         if (combo)
         {
-                combo->setCurrentByIndex( LLAppViewer::instance()->getCrashBehavior() );
+                combo->setCurrentByIndex( gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING) );
                 combo->setCommitCallback( &set_crash_behavior );
         }
         
@@ -181,11 +179,11 @@ void LLPanelGeneral::refresh()
                 mLoginLocation = combo->getValue().asString();
         }
         
-        mCrashBehavior = LLAppViewer::instance()->getCrashBehavior();
+        mOldCrashBehavior = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING);
         combo = getChild<LLComboBox>( "crash_behavior_combobox");
         if (combo)
         {
-                combo->setCurrentByIndex( LLAppViewer::instance()->getCrashBehavior() );
+                combo->setCurrentByIndex( mOldCrashBehavior );
         }
         
         mRenderName = gSavedSettings.getS32("RenderName");
@@ -235,7 +233,7 @@ void LLPanelGeneral::cancel()
         
         LLURLSimString::setString(mLoginLocation);
 
-        LLAppViewer::instance()->setCrashBehavior(mCrashBehavior);
+        gCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, mOldCrashBehavior);
 }
 
 void LLPanelGeneral::clickShowStartLocation(LLUICtrl*, void* user_data)
diff --git a/linden/indra/newview/llpanelgeneral.h b/linden/indra/newview/llpanelgeneral.h
index d84aa20..df9e10e 100644
--- a/linden/indra/newview/llpanelgeneral.h
+++ b/linden/indra/newview/llpanelgeneral.h
@@ -71,7 +71,7 @@ protected:
         F32 mUIScaleFactor;
         BOOL mUIAutoScale;
         BOOL mMiniMapRotate;
-        S32 mCrashBehavior;
+        S32 mOldCrashBehavior;
         LLString mLoginLocation;
         LLString mLanguage;
 };
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 334e9f4..d8da3c0 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -290,7 +290,15 @@ class LLIamHereLogin : public LLHTTPClient::Responder
                 {
                         mParent = parentIn;
                 };
-                
+
+                // We don't actually expect LLSD back, so need to override completedRaw
+                virtual void completedRaw(U32 status, const std::string& reason,
+                                                                  const LLChannelDescriptors& channels,
+                                                                  const LLIOPipe::buffer_ptr_t& buffer)
+                {
+                        completed(status, reason, LLSD()); // will call result() or error()
+                }
+        
                 virtual void result( const LLSD& content )
                 {
                         if ( mParent )
@@ -939,10 +947,13 @@ void LLPanelLogin::loadLoginPage()
 
         gViewerWindow->setMenuBackgroundColor(false, !LLViewerLogin::getInstance()->isInProductionGrid());
         gLoginMenuBarView->setBackgroundColor(gMenuBarView->getBackgroundColor());
-    
-        char* curl_grid = curl_escape(grid.c_str(), 0);
-        oStr << "&grid=" << curl_grid;
-        curl_free(curl_grid);
+
+        if (!grid.empty())
+        {
+                char* curl_grid = curl_escape(grid.c_str(), 0);
+                oStr << "&grid=" << curl_grid;
+                curl_free(curl_grid);
+        }
 
 #if USE_VIEWER_AUTH
         LLURLSimString::sInstance.parse();
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 4488a46..1aad3e2 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -4824,11 +4824,21 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
         if (mSelectedObjects->getNumNodes())
         {
                 LLUUID inspect_item_id = LLFloaterInspect::getSelectedUUID();
+                
                 for (S32 pass = 0; pass < 2; pass++)
                 {
+                        LLObjectSelection::iterator end_ = mSelectedObjects->end();             
+                        S32 num_nodes = mSelectedObjects->getNumNodes() ;
+                        LLObjectSelection::iterator prev_iter = mSelectedObjects->end();                
                         for (LLObjectSelection::iterator iter = mSelectedObjects->begin();
                                  iter != mSelectedObjects->end(); iter++)
                         {
+                                llassert_always(end_ == mSelectedObjects->end()) ;//mSelectedObjects should not grow
+                                llassert_always(prev_iter != iter) ; //iter should move
+                                llassert_always(num_nodes > 0) ; //iter should not circle inside mSelectedObjects.
+                                num_nodes-- ;
+                                prev_iter = iter ;
+
                                 LLSelectNode* node = *iter;
                                 LLViewerObject* objectp = node->getObject();
                                 if (!objectp)
diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp
index 520501e..250575c 100644
--- a/linden/indra/newview/llspatialpartition.cpp
+++ b/linden/indra/newview/llspatialpartition.cpp
@@ -60,6 +60,7 @@ const F32 SG_OCCLUSION_FUDGE = 1.01f;
 
 static U32 sZombieGroups = 0;
 U32 LLSpatialGroup::sNodeCount = 0;
+BOOL LLSpatialGroup::sNoDelete = FALSE;
 
 static F32 sLastMaxTexPriority = 1.f;
 static F32 sCurMaxTexPriority = 1.f;
@@ -295,6 +296,11 @@ S32 LLSphereAABB(const LLVector3& center, const LLVector3& size, const LLVector3
 
 LLSpatialGroup::~LLSpatialGroup()
 {
+        if (sNoDelete)
+        {
+                llerrs << "Illegal deletion of LLSpatialGroup!" << llendl;
+        }
+
         if (isState(DEAD))
         {
                 sZombieGroups--;
@@ -2619,7 +2625,10 @@ LLDrawInfo::LLDrawInfo(U16 start, U16 end, U32 count, U32 offset,
 
 LLDrawInfo::~LLDrawInfo()       
 {
-
+        if (LLSpatialGroup::sNoDelete)
+        {
+                llerrs << "LLDrawInfo deleted illegally!" << llendl;
+        }
 }
 
 LLVertexBuffer* LLGeometryManager::createVertexBuffer(U32 type_mask, U32 usage)
@@ -2813,7 +2822,16 @@ void LLCullResult::pushDrawInfo(U32 type, LLDrawInfo* draw_info)
 }
 
 
-
+void LLCullResult::assertDrawMapsEmpty()
+{
+        for (U32 i = 0; i < LLRenderPass::NUM_RENDER_TYPES; i++)
+        {
+                if (mRenderMapSize[i] != 0)
+                {
+                        llerrs << "Stale LLDrawInfo's in LLCullResult!" << llendl;
+                }
+        }
+}
 
 
 
diff --git a/linden/indra/newview/llspatialpartition.h b/linden/indra/newview/llspatialpartition.h
index a38e3fe..bbd4add 100644
--- a/linden/indra/newview/llspatialpartition.h
+++ b/linden/indra/newview/llspatialpartition.h
@@ -127,6 +127,7 @@ class LLSpatialGroup : public LLOctreeListener<LLDrawable>
         friend class LLSpatialPartition;
 public:
         static U32 sNodeCount;
+        static BOOL sNoDelete; //deletion of spatial groups and draw info not allowed if TRUE
 
         typedef std::vector<LLPointer<LLSpatialGroup> > sg_vector_t;
         typedef std::set<LLPointer<LLSpatialGroup> > sg_set_t;
@@ -421,7 +422,7 @@ public:
         void pushDrawable(LLDrawable* drawable);
         void pushBridge(LLSpatialBridge* bridge);
         void pushDrawInfo(U32 type, LLDrawInfo* draw_info);
-
+        
         U32 getVisibleGroupsSize()              { return mVisibleGroupsSize; }
         U32     getAlphaGroupsSize()            { return mAlphaGroupsSize; }
         U32     getDrawableGroupsSize()         { return mDrawableGroupsSize; }
@@ -429,6 +430,8 @@ public:
         U32     getVisibleBridgeSize()          { return mVisibleBridgeSize; }
         U32     getRenderMapSize(U32 type)      { return mRenderMapSize[type]; }
 
+        void assertDrawMapsEmpty();
+
 private:
         U32                                     mVisibleGroupsSize;
         U32                                     mAlphaGroupsSize;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 4dca600..009cdd2 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1278,7 +1278,6 @@ BOOL idle_startup()
                                    save_password_to_disk(NULL);
                         }
                         gSavedSettings.setBOOL("RememberPassword", remember_password);
-                        gSavedSettings.setBOOL("LoginLastLocation", gSavedSettings.getBOOL("LoginLastLocation"));
 
                         text = LLUserAuth::getInstance()->getResponse("agent_access");
                         if(text && (text[0] == 'M'))
diff --git a/linden/indra/newview/lltoolbrush.cpp b/linden/indra/newview/lltoolbrush.cpp
index 9958d50..89cb0b6 100644
--- a/linden/indra/newview/lltoolbrush.cpp
+++ b/linden/indra/newview/lltoolbrush.cpp
@@ -94,7 +94,6 @@ LLToolBrushLand::LLToolBrushLand()
         mMouseX( 0 ),
         mMouseY(0),
         mGotHover(FALSE),
-        mLastShowParcelOwners(FALSE),
         mBrushSelected(FALSE)
 {
         mBrushIndex = gSavedSettings.getS32("RadioLandBrushSize");
@@ -104,7 +103,8 @@ void LLToolBrushLand::modifyLandAtPointGlobal(const LLVector3d &pos_global,
                                                                                           MASK mask)
 {
         S32 radioAction = gSavedSettings.getS32("RadioLandBrushAction");
-
+        
+        mLastAffectedRegions.clear();
         determineAffectedRegions(mLastAffectedRegions, pos_global);
         for(region_list_t::iterator iter = mLastAffectedRegions.begin();
                 iter != mLastAffectedRegions.end(); ++iter)
@@ -418,8 +418,6 @@ void LLToolBrushLand::handleSelect()
         gFloaterTools->setStatusText("modifyland");
 //      if (!mBrushSelected)
         {
-                mLastShowParcelOwners = gSavedSettings.getBOOL("ShowParcelOwners");
-                gSavedSettings.setBOOL("ShowParcelOwners", mLastShowParcelOwners);
                 mBrushSelected = TRUE;
         }
 }
@@ -431,8 +429,6 @@ void LLToolBrushLand::handleDeselect()
         {
                 gEditMenuHandler = NULL;
         }
-        mLastShowParcelOwners = gSavedSettings.getBOOL("ShowParcelOwners");
-        gSavedSettings.setBOOL("ShowParcelOwners", mLastShowParcelOwners);
         LLViewerParcelMgr::getInstance()->setSelectionVisible(TRUE);
         mBrushSelected = FALSE;
 }
diff --git a/linden/indra/newview/lltoolbrush.h b/linden/indra/newview/lltoolbrush.h
index b3a5576..0ba6db4 100644
--- a/linden/indra/newview/lltoolbrush.h
+++ b/linden/indra/newview/lltoolbrush.h
@@ -97,7 +97,6 @@ protected:
         S32 mMouseY;
         S32 mBrushIndex;
         BOOL mGotHover;
-        BOOL mLastShowParcelOwners;
         BOOL mBrushSelected;
         // Order doesn't matter and we do check for existance of regions, so use a set
         region_list_t mLastAffectedRegions;
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index a9e733a..6879198 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -309,6 +309,7 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
         }
         else if (mHitObjectID == gAgent.getID() )
         {
+                llassert_always(gPieSelf) ;
                 gPieSelf->show(x, y, mPieMouseButtonDown);
         }
         else if (object)
diff --git a/linden/indra/newview/lltoolselectland.cpp b/linden/indra/newview/lltoolselectland.cpp
index 96e0de1..78c4c24 100644
--- a/linden/indra/newview/lltoolselectland.cpp
+++ b/linden/indra/newview/lltoolselectland.cpp
@@ -61,8 +61,7 @@ LLToolSelectLand::LLToolSelectLand( )
         mDragEndY(0),
         mMouseOutsideSlop(FALSE),
         mWestSouthBottom(),
-        mEastNorthTop(),
-        mLastShowParcelOwners(FALSE)
+        mEastNorthTop()
 { }
 
 LLToolSelectLand::~LLToolSelectLand()
@@ -216,17 +215,12 @@ void LLToolSelectLand::render()
 void LLToolSelectLand::handleSelect()
 {
         gFloaterTools->setStatusText("selectland");
-        mLastShowParcelOwners = gSavedSettings.getBOOL("ShowParcelOwners");
-        gSavedSettings.setBOOL("ShowParcelOwners", mLastShowParcelOwners);
 }
 
 
 void LLToolSelectLand::handleDeselect()
 {
         mSelection = NULL;
-        mLastShowParcelOwners = gSavedSettings.getBOOL("ShowParcelOwners");
-        //LLViewerParcelMgr::getInstance()->deselectLand();
-        gSavedSettings.setBOOL("ShowParcelOwners", mLastShowParcelOwners);
 }
 
 
diff --git a/linden/indra/newview/lltoolselectland.h b/linden/indra/newview/lltoolselectland.h
index 1e1462b..19a86b7 100644
--- a/linden/indra/newview/lltoolselectland.h
+++ b/linden/indra/newview/lltoolselectland.h
@@ -74,7 +74,6 @@ protected:
         LLVector3d              mWestSouthBottom;               // global coords, from drag
         LLVector3d              mEastNorthTop;                  // global coords, from drag
 
-        BOOL                    mLastShowParcelOwners;  // store last Show Parcel Owners setting
         LLSafeHandle<LLParcelSelection> mSelection;             // hold on to a parcel selection
 };
 
diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp
index 47c9c32..b9a5986 100644
--- a/linden/indra/newview/llviewerdisplay.cpp
+++ b/linden/indra/newview/llviewerdisplay.cpp
@@ -81,8 +81,6 @@
 #include "llpostprocess.h"
 
 extern LLPointer<LLImageGL> gStartImageGL;
-extern BOOL gDisplaySwapBuffers;
-
 
 LLPointer<LLImageGL> gDisconnectedImagep = NULL;
 
@@ -96,17 +94,18 @@ const F32		RESTORE_GL_TIME = 5.f;	// Wait this long while reloading textures bef
 
 BOOL gForceRenderLandFence = FALSE;
 BOOL gDisplaySwapBuffers = FALSE;
+BOOL gDepthDirty = FALSE;
 BOOL gResizeScreenTexture = FALSE;
 BOOL gSnapshot = FALSE;
 
 U32 gRecentFrameCount = 0; // number of 'recent' frames
-LLFrameTimer gRecentTime;
+LLFrameTimer gRecentFPSTime;
+LLFrameTimer gRecentMemoryTime;
 
 // Rendering stuff
 void pre_show_depth_buffer();
 void post_show_depth_buffer();
 void render_ui_and_swap();
-void render_ui_and_swap_if_needed();
 void render_hud_attachments();
 void render_ui_3d();
 void render_ui_2d();
@@ -187,13 +186,21 @@ void display_update_camera()
 // Write some stats to llinfos
 void display_stats()
 {
-        F32 log_freq = gSavedSettings.getF32("FPSLogFrequency");
-        if (log_freq > 0.f && gRecentTime.getElapsedTimeF32() >= log_freq)
+        F32 fps_log_freq = gSavedSettings.getF32("FPSLogFrequency");
+        if (fps_log_freq > 0.f && gRecentFPSTime.getElapsedTimeF32() >= fps_log_freq)
         {
-                F32 fps = gRecentFrameCount / log_freq;
+                F32 fps = gRecentFrameCount / fps_log_freq;
                 llinfos << llformat("FPS: %.02f", fps) << llendl;
                 gRecentFrameCount = 0;
-                gRecentTime.reset();
+                gRecentFPSTime.reset();
+        }
+        F32 mem_log_freq = gSavedSettings.getF32("MemoryLogFrequency");
+        if (mem_log_freq > 0.f && gRecentMemoryTime.getElapsedTimeF32() >= mem_log_freq)
+        {
+                gMemoryAllocated = getCurrentRSS();
+                U32 memory = (U32)(gMemoryAllocated / (1024*1024));
+                llinfos << llformat("MEMORY: %d MB", memory) << llendl;
+                gRecentMemoryTime.reset();
         }
 }
 
@@ -237,9 +244,11 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 
         gViewerWindow->checkSettings();
         
+        LLAppViewer::instance()->pingMainloopTimeout("Display:Pick");
         gViewerWindow->performPick();
         
 
+        LLAppViewer::instance()->pingMainloopTimeout("Display:CheckStates");
         LLGLState::checkStates();
         LLGLState::checkTextureChannels();
         
@@ -271,6 +280,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
         //
         if (LLStartUp::getStartupState() < STATE_STARTED)
         {
+                LLAppViewer::instance()->pingMainloopTimeout("Display:Startup");
                 display_startup();
                 return;
         }
@@ -282,6 +292,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
         // Update GL Texture statistics (used for discard logic?)
         //
 
+        LLAppViewer::instance()->pingMainloopTimeout("Display:TextureStats");
         gFrameStats.start(LLFrameStats::UPDATE_TEX_STATS);
         stop_glerror();
 
@@ -305,6 +316,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 
         if (gTeleportDisplay)
         {
+                LLAppViewer::instance()->pingMainloopTimeout("Display:Teleport");
                 const F32 TELEPORT_ARRIVAL_DELAY = 2.f; // Time to preload the world before raising the curtain after we've actually already arrived.
 
                 S32 attach_count = 0;
@@ -383,6 +395,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
         }
     else if(LLAppViewer::instance()->logoutRequestSent())
         {
+                LLAppViewer::instance()->pingMainloopTimeout("Display:Logout");
                 F32 percent_done = gLogoutTimer.getElapsedTimeF32() * 100.f / gLogoutMaxTime;
                 if (percent_done > 100.f)
                 {
@@ -399,6 +412,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
         else
         if (gRestoreGL)
         {
+                LLAppViewer::instance()->pingMainloopTimeout("Display:RestoreGL");
                 F32 percent_done = gRestoreGLTimer.getElapsedTimeF32() * 100.f / RESTORE_GL_TIME;
                 if( percent_done > 100.f )
                 {
@@ -428,6 +442,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
         //
         //
 
+        LLAppViewer::instance()->pingMainloopTimeout("Display:Camera");
         LLViewerCamera::getInstance()->setZoomParameters(zoom_factor, subfield);
         LLViewerCamera::getInstance()->setNear(MIN_NEAR_PLANE);
 
@@ -439,9 +454,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 
         if (gDisconnected)
         {
-                render_ui_and_swap_if_needed();
-                gDisplaySwapBuffers = TRUE;
-                
+                LLAppViewer::instance()->pingMainloopTimeout("Display:Disconnected");
+                render_ui_and_swap();
                 render_disconnected_background();
         }
         
@@ -450,6 +464,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
         // Set rendering options
         //
         //
+        LLAppViewer::instance()->pingMainloopTimeout("Display:RenderSetup");
         stop_glerror();
         if (gSavedSettings.getBOOL("ShowDepthBuffer"))
         {
@@ -478,6 +493,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
         // do render-to-texture stuff here
         if (gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_DYNAMIC_TEXTURES))
         {
+                LLAppViewer::instance()->pingMainloopTimeout("Display:DynamicTextures");
                 LLFastTimer t(LLFastTimer::FTM_UPDATE_TEXTURES);
                 if (LLDynamicTexture::updateAllInstances())
                 {
@@ -490,6 +506,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
         
         if (!gDisconnected)
         {
+                LLAppViewer::instance()->pingMainloopTimeout("Display:Update");
                 if (gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_HUD))
                 { //don't draw hud objects in this frame
                         gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_HUD);
@@ -527,9 +544,12 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                         }
                 }
 
+                LLAppViewer::instance()->pingMainloopTimeout("Display:Cull");
+                
                 //Increment drawable frame counter
                 LLDrawable::incrementVisible();
 
+                LLSpatialGroup::sNoDelete = TRUE;
                 LLPipeline::sUseOcclusion = 
                                 (!gUseWireframe
                                 && LLFeatureManager::getInstance()->isFeatureAvailable("UseOcclusion") 
@@ -540,10 +560,11 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                 LLVOAvatar::sMaxVisible = gSavedSettings.getS32("RenderAvatarMaxVisible");
                 
                 S32 occlusion = LLPipeline::sUseOcclusion;
-                if (!gDisplaySwapBuffers)
+                if (gDepthDirty)
                 { //depth buffer is invalid, don't overwrite occlusion state
                         LLPipeline::sUseOcclusion = llmin(occlusion, 1);
                 }
+                gDepthDirty = FALSE;
 
                 static LLCullResult result;
                 gPipeline.updateCull(*LLViewerCamera::getInstance(), result, water_clip);
@@ -553,6 +574,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                                                 gPipeline.canUseVertexShaders() &&
                                                 LLPipeline::sRenderGlow;
 
+                LLAppViewer::instance()->pingMainloopTimeout("Display:Swap");
+                
                 // now do the swap buffer (just before rendering to framebuffer)
                 { //swap and flush state from previous frame
                         {
@@ -571,9 +594,6 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                         
                         if (!for_snapshot)
                         {
-                                render_ui_and_swap_if_needed();
-                                gDisplaySwapBuffers = TRUE;
-                                
                                 glh::matrix4f proj = glh_get_current_projection();
                                 glh::matrix4f mod = glh_get_current_modelview();
                                 glViewport(0,0,512,512);
@@ -592,6 +612,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 
                 if (!for_snapshot)
                 {
+                        LLAppViewer::instance()->pingMainloopTimeout("Display:Imagery");
                         gPipeline.processImagery(*LLViewerCamera::getInstance());
                         gPipeline.generateWaterReflection(*LLViewerCamera::getInstance());
                 }
@@ -603,6 +624,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                 // Can put objects onto the retextured list.
                 //
                 // Doing this here gives hardware occlusion queries extra time to complete
+                LLAppViewer::instance()->pingMainloopTimeout("Display:UpdateImages");
                 gFrameStats.start(LLFrameStats::IMAGE_UPDATE);
 
                 {
@@ -626,6 +648,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                 // In the case of alpha objects, z-sorts them first.
                 // Also creates special lists for outlines and selected face rendering.
                 //
+                LLAppViewer::instance()->pingMainloopTimeout("Display:StateSort");
                 {
                         gFrameStats.start(LLFrameStats::STATE_SORT);
                         gPipeline.stateSort(*LLViewerCamera::getInstance(), result);
@@ -647,6 +670,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                 LLPipeline::sUseOcclusion = occlusion;
 
                 {
+                        LLAppViewer::instance()->pingMainloopTimeout("Display:Sky");
                         LLFastTimer t(LLFastTimer::FTM_UPDATE_SKY);     
                         gSky.updateSky();
                 }
@@ -658,6 +682,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                         glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
                 }
 
+                LLAppViewer::instance()->pingMainloopTimeout("Display:Render");
+                
                 //// render frontmost floater opaque for occlusion culling purposes
                 //LLFloater* frontmost_floaterp = gFloaterView->getFrontmost();
                 //// assumes frontmost floater with focus is opaque
@@ -731,11 +757,19 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                 /// Using render to texture would be faster/better, but I don't have a 
                 /// grasp of their full display stack just yet.
                 // gPostProcess->apply(gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight());
+
+                if (!for_snapshot)
+                {
+                        render_ui_and_swap();
+                }
+
+                LLSpatialGroup::sNoDelete = FALSE;
         }
         gFrameStats.start(LLFrameStats::RENDER_UI);
 
         if (gHandleKeysAsync)
         {
+                LLAppViewer::instance()->pingMainloopTimeout("Display:Keystrokes");
                 process_keystrokes_async();
                 stop_glerror();
         }
@@ -750,6 +784,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
         }
 
         display_stats();
+                                
+        LLAppViewer::instance()->pingMainloopTimeout("Display:Done");
 }
 
 void render_hud_attachments()
@@ -944,19 +980,13 @@ void render_ui_and_swap()
 
         glh_set_current_modelview(saved_view);
         glPopMatrix();
-}
 
-void render_ui_and_swap_if_needed()
-{
         if (gDisplaySwapBuffers)
         {
-                render_ui_and_swap();
-                
-                {
-                        LLFastTimer t(LLFastTimer::FTM_SWAP);
-                        gViewerWindow->mWindow->swapBuffers();
-                }
+                LLFastTimer t(LLFastTimer::FTM_SWAP);
+                gViewerWindow->mWindow->swapBuffers();
         }
+        gDisplaySwapBuffers = TRUE;
 }
 
 void renderCoordinateAxes()
diff --git a/linden/indra/newview/llviewerdisplay.h b/linden/indra/newview/llviewerdisplay.h
index 22c31b7..d4b36aa 100644
--- a/linden/indra/newview/llviewerdisplay.h
+++ b/linden/indra/newview/llviewerdisplay.h
@@ -40,6 +40,7 @@ void display_cleanup();
 void display(BOOL rebuild = TRUE, F32 zoom_factor = 1.f, int subfield = 0, BOOL for_snapshot = FALSE);
 
 extern BOOL gDisplaySwapBuffers;
+extern BOOL gDepthDirty;
 extern BOOL     gTeleportDisplay;
 extern LLFrameTimer     gTeleportDisplayTimer;
 extern BOOL                     gForceRenderLandFence;
diff --git a/linden/indra/newview/llviewerimage.cpp b/linden/indra/newview/llviewerimage.cpp
index 0316c10..a564352 100644
--- a/linden/indra/newview/llviewerimage.cpp
+++ b/linden/indra/newview/llviewerimage.cpp
@@ -88,7 +88,7 @@ void LLViewerImage::initClass()
         sNullImagep->createGLTexture(0, raw);
 
 #if 1
-        LLViewerImage* imagep = new LLViewerImage(IMG_DEFAULT, TRUE);
+        LLPointer<LLViewerImage> imagep = new LLViewerImage(IMG_DEFAULT, TRUE);
         sDefaultImagep = imagep;
         const S32 dim = 128;
         LLPointer<LLImageRaw> image_raw = new LLImageRaw(dim,dim,3);
diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index a824b29..44c592a 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -708,6 +708,10 @@ void LLViewerImageList::updateImagesUpdateStats()
                          iter != mImageList.end(); )
                 {
                         LLViewerImage* imagep = *iter++;
+
+                        llassert_always(imagep) ;
+                        llassert_always(imagep->getNumRefs() > 0 && imagep->getNumRefs() < 100000) ;
+                        
                         imagep->resetTextureStats(mForceResetTextureStats);
                 }
                 mUpdateStats = FALSE;
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index 54114e4..a989c9d 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -292,7 +292,7 @@ void LLViewerObject::markDead()
                 LLViewerObject *childp;
                 while (mChildList.size() > 0)
                 {
-                        childp = mChildList[0];
+                        childp = mChildList.back();
                         if (childp->getPCode() != LL_PCODE_LEGACY_AVATAR)
                         {
                                 //llinfos << "Marking child " << childp->getLocalID() << " as dead." << llendl;
@@ -307,7 +307,7 @@ void LLViewerObject::markDead()
                                 ((LLVOAvatar*)childp)->getOffObject();
                                 childp->setParent(NULL); // LLViewerObject::markDead 2
                         }
-                        mChildList.erase(mChildList.begin());
+                        mChildList.pop_back();
                 }
 
                 if (mDrawable.notNull())
@@ -4217,13 +4217,15 @@ void LLViewerObject::updateDrawable(BOOL force_damped)
         {
                 BOOL damped_motion = 
                         !isChanged(SHIFTED) &&                                                                          // not shifted between regions this frame and...
-                                (force_damped ||                                                                                // ...forced into damped motion by application logic or...
-                                        (!isSelected() &&                                                                       // ...not selected and...
-                                        (mDrawable->isRoot() ||                                                         // ... is root or ...
-                                        !((LLViewerObject*)getParent())->isSelected()) &&       // ... parent is not selected and ...
+                        (       force_damped ||                                                                         // ...forced into damped motion by application logic or...
+                                (       !isSelected() &&                                                                        // ...not selected and...
+                                        (       mDrawable->isRoot() ||                                                          // ... is root or ...
+                                                (getParent() && !((LLViewerObject*)getParent())->isSelected())// ... parent is not selected and ...
+                                        ) &&    
                                         getPCode() == LL_PCODE_VOLUME &&                                        // ...is a volume object and...
                                         getVelocity().isExactlyZero() &&                                        // ...is not moving physically and...
-                                        mDrawable->getGeneration() != -1)                                       // ...was not created this frame.
+                                        mDrawable->getGeneration() != -1                    // ...was not created this frame.
+                                )                                       
                         );
                 gPipeline.markMoved(mDrawable, damped_motion);
         }
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index bd8ed97..84475ab 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -685,6 +685,7 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
                         idle_iter != idle_list.end(); idle_iter++)
                 {
                         objectp = *idle_iter;
+                        llassert_always(objectp) ;
                         if (!objectp->idleUpdate(agent, world, frame_time))
                         {
                                 //  If Idle Update returns false, kill object!
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index e1590cc..f745aca 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -76,7 +76,74 @@ extern BOOL gNoRender;
 const F32 WATER_TEXTURE_SCALE = 8.f;                    //  Number of times to repeat the water texture across a region
 const S16 MAX_MAP_DIST = 10;
 
+class BaseCapabilitiesComplete : public LLHTTPClient::Responder
+{
+        LOG_CLASS(BaseCapabilitiesComplete);
+public:
+    BaseCapabilitiesComplete(LLViewerRegion* region)
+                : mRegion(region)
+    { }
+        virtual ~BaseCapabilitiesComplete()
+        {
+                if(mRegion)
+                {
+                        mRegion->setHttpResponderPtrNULL() ;
+                }
+        }
 
+        void setRegion(LLViewerRegion* region)
+        {
+                mRegion = region ;
+        }
+
+    void error(U32 statusNum, const std::string& reason)
+    {
+                LL_WARNS2("AppInit", "Capabilities") << statusNum << ": " << reason << LL_ENDL;
+                
+                if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState())
+                {
+                        LLStartUp::setStartupState( STATE_SEED_CAP_GRANTED );
+                }
+    }
+
+    void result(const LLSD& content)
+    {
+                if(!mRegion || this != mRegion->getHttpResponderPtr())//region is removed or responder is not created.
+                {
+                        return ;
+                }
+
+                LLSD::map_const_iterator iter;
+                for(iter = content.beginMap(); iter != content.endMap(); ++iter)
+                {
+                        mRegion->setCapability(iter->first, iter->second);
+                        LL_DEBUGS2("AppInit", "Capabilities") << "got capability for " 
+                                << iter->first << LL_ENDL;
+
+                        /* HACK we're waiting for the ServerReleaseNotes */
+                        if ((iter->first == "ServerReleaseNotes") && (LLFloaterReleaseMsg::sDisplayMessage))
+                        {
+                                LLFloaterReleaseMsg::show();
+                                LLFloaterReleaseMsg::sDisplayMessage = false;
+                        }
+                }
+                
+                if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState())
+                {
+                        LLStartUp::setStartupState( STATE_SEED_CAP_GRANTED );
+                }
+        }
+
+    static boost::intrusive_ptr<BaseCapabilitiesComplete> build(
+                                                                LLViewerRegion* region)
+    {
+                return boost::intrusive_ptr<BaseCapabilitiesComplete>(
+                                                         new BaseCapabilitiesComplete(region));
+    }
+
+private:
+        LLViewerRegion* mRegion;
+};
 
 
 LLViewerRegion::LLViewerRegion(const U64 &handle,
@@ -103,7 +170,6 @@ LLViewerRegion::LLViewerRegion(const U64 &handle,
         mEventPoll(NULL)
 {
         mWidth = region_width_meters;
-
         mOriginGlobal = from_region_handle(handle); 
         updateRenderMatrix();
 
@@ -170,10 +236,13 @@ void LLViewerRegion::initStats()
         mAlive = FALSE;                                 // can become false if circuit disconnects
 }
 
-
-
 LLViewerRegion::~LLViewerRegion() 
 {
+        if(mHttpResponderPtr)
+        {
+                (static_cast<BaseCapabilitiesComplete*>(mHttpResponderPtr.get()))->setRegion(NULL) ;
+        }
+
         gVLManager.cleanupData(this);
         // Can't do this on destruction, because the neighbor pointers might be invalid.
         // This should be reference counted...
@@ -1303,61 +1372,6 @@ void LLViewerRegion::unpackRegionHandshake()
         msg->sendReliable(host);
 }
 
-
-
-class BaseCapabilitiesComplete : public LLHTTPClient::Responder
-{
-        LOG_CLASS(BaseCapabilitiesComplete);
-public:
-    BaseCapabilitiesComplete(LLViewerRegion* region)
-                : mRegion(region)
-    { }
-
-    void error(U32 statusNum, const std::string& reason)
-    {
-                LL_WARNS2("AppInit", "Capabilities") << statusNum << ": " << reason << LL_ENDL;
-                
-                if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState())
-                {
-                        LLStartUp::setStartupState( STATE_SEED_CAP_GRANTED );
-                }
-    }
-
-    void result(const LLSD& content)
-    {
-                LLSD::map_const_iterator iter;
-                for(iter = content.beginMap(); iter != content.endMap(); ++iter)
-                {
-                        mRegion->setCapability(iter->first, iter->second);
-                        LL_DEBUGS2("AppInit", "Capabilities") << "got capability for " 
-                                << iter->first << LL_ENDL;
-
-                        /* HACK we're waiting for the ServerReleaseNotes */
-                        if ((iter->first == "ServerReleaseNotes") && (LLFloaterReleaseMsg::sDisplayMessage))
-                        {
-                                LLFloaterReleaseMsg::show();
-                                LLFloaterReleaseMsg::sDisplayMessage = false;
-                        }
-                }
-                
-                if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState())
-                {
-                        LLStartUp::setStartupState( STATE_SEED_CAP_GRANTED );
-                }
-        }
-
-    static boost::intrusive_ptr<BaseCapabilitiesComplete> build(
-                                                                LLViewerRegion* region)
-    {
-                return boost::intrusive_ptr<BaseCapabilitiesComplete>(
-                                                         new BaseCapabilitiesComplete(region));
-    }
-
-private:
-        LLViewerRegion* mRegion;
-};
-
-
 void LLViewerRegion::setSeedCapability(const std::string& url)
 {
   if (getCapability("Seed") == url)
@@ -1408,7 +1422,8 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
 
         llinfos << "posting to seed " << url << llendl;
 
-        LLHTTPClient::post(url, capabilityNames, BaseCapabilitiesComplete::build(this));
+        mHttpResponderPtr = BaseCapabilitiesComplete::build(this) ;
+        LLHTTPClient::post(url, capabilityNames, mHttpResponderPtr);
 }
 
 void LLViewerRegion::setCapability(const std::string& name, const std::string& url)
diff --git a/linden/indra/newview/llviewerregion.h b/linden/indra/newview/llviewerregion.h
index d4032cf..c2d11f5 100644
--- a/linden/indra/newview/llviewerregion.h
+++ b/linden/indra/newview/llviewerregion.h
@@ -208,6 +208,9 @@ public:
 
         U32     getPacketsLost() const;
 
+        void setHttpResponderPtrNULL() {mHttpResponderPtr = NULL ;}
+        const LLHTTPClient::ResponderPtr getHttpResponderPtr() const {return mHttpResponderPtr ;}
+
         // Get/set named capability URLs for this region.
         void setSeedCapability(const std::string& url);
         void setCapability(const std::string& name, const std::string& url);
@@ -373,6 +376,8 @@ protected:
 private:
         //spatial partitions for objects in this region
         std::vector<LLSpatialPartition*> mObjectPartition;
+
+        LLHTTPClient::ResponderPtr  mHttpResponderPtr ;
 };
 
 inline BOOL LLViewerRegion::getAllowDamage() const
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 9f091dc..d61fa59 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -192,12 +192,12 @@
 //
 // Globals
 //
-void render_ui_and_swap_if_needed();
 void render_ui_and_swap();
 LLBottomPanel* gBottomPanel = NULL;
 
 extern BOOL gDebugClicks;
 extern BOOL gDisplaySwapBuffers;
+extern BOOL gDepthDirty;
 extern BOOL gResizeScreenTexture;
 extern S32 gJamesInt;
 
@@ -3387,9 +3387,8 @@ void LLViewerWindow::hitObjectOrLandGlobalAsync(S32 x, S32 y_from_bot, MASK mask
                 return;
         }
         
-        render_ui_and_swap_if_needed();
         glClear(GL_DEPTH_BUFFER_BIT);
-        gDisplaySwapBuffers = FALSE;
+        gDepthDirty = TRUE;
 
         S32 scaled_x = llround((F32)x * mDisplayScale.mV[VX]);
         S32 scaled_y = llround((F32)y_from_bot * mDisplayScale.mV[VY]);
@@ -4282,7 +4281,8 @@ BOOL LLViewerWindow::thumbnailSnapshot(LLImageRaw *raw, S32 preview_width, S32 p
         LLRect window_rect = mWindowRect;
         mWindowRect.set(0, h, w, 0);
         
-        gDisplaySwapBuffers = FALSE;    
+        gDisplaySwapBuffers = FALSE;
+        gDepthDirty = TRUE;
         glClearColor(0.f, 0.f, 0.f, 0.f);
         glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
         setup3DRender();
@@ -4350,6 +4350,7 @@ BOOL LLViewerWindow::thumbnailSnapshot(LLImageRaw *raw, S32 preview_width, S32 p
         setup3DRender();
         setupViewport();
         gDisplaySwapBuffers = FALSE;
+        gDepthDirty = TRUE;
 
         // POST SNAPSHOT
         if (!gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI))
@@ -4389,7 +4390,6 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
         }
 
         // PRE SNAPSHOT
-        render_ui_and_swap_if_needed();
         gDisplaySwapBuffers = FALSE;
         
         glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
@@ -4420,6 +4420,7 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
         LLRect window_rect = mWindowRect;
         BOOL use_fbo = FALSE;
 
+        LLRenderTarget target;
         F32 scale_factor = 1.0f ;
         if(!keep_window_aspect) //image cropping
         {               
@@ -4428,37 +4429,39 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
                 snapshot_height = (S32)(ratio * image_height) ;
                 scale_factor = llmax(1.0f, 1.0f / ratio) ;      
         }
-
-        LLRenderTarget target;
-        if (gGLManager.mHasFramebufferObject && 
-                (image_width > window_width ||
-                image_height > window_height) &&
-                 !show_ui &&
-                 keep_window_aspect)
-        {
-                GLint max_size = 0;
-                glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE_EXT, &max_size);
-                
-                if (image_width <= max_size && image_height <= max_size)
-                {
-                        use_fbo = TRUE;
-                        
-                        snapshot_width = image_width;
-                        snapshot_height = image_height;
-                        target.allocate(snapshot_width, snapshot_height, GL_RGBA, TRUE, GL_TEXTURE_RECTANGLE_ARB, TRUE);
-                        window_width = snapshot_width;
-                        window_height = snapshot_height;
-                        scale_factor = 1.f;
-                        mWindowRect.set(0, 0, snapshot_width, snapshot_height);
-                        target.bindTarget();                    
-                }
-                else //tiling
+        else //the scene(window) proportion needs to be maintained.
+        {
+                if(image_width > window_width || image_height > window_height) //need to enlarge the scene
                 {
-                        F32 ratio = llmin( (F32)window_width / image_width , (F32)window_height / image_height) ;
-                        snapshot_width = (S32)(ratio * image_width) ;
-                        snapshot_height = (S32)(ratio * image_height) ;
-                        scale_factor = llmax(1.0f, 1.0f / ratio) ;      
+                        if (gGLManager.mHasFramebufferObject && !show_ui)
+                        {
+                                GLint max_size = 0;
+                                glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE_EXT, &max_size);
+                
+                                if (image_width <= max_size && image_height <= max_size) //re-project the scene
+                                {
+                                        use_fbo = TRUE;
+                                        
+                                        snapshot_width = image_width;
+                                        snapshot_height = image_height;
+                                        target.allocate(snapshot_width, snapshot_height, GL_RGBA, TRUE, GL_TEXTURE_RECTANGLE_ARB, TRUE);
+                                        window_width = snapshot_width;
+                                        window_height = snapshot_height;
+                                        scale_factor = 1.f;
+                                        mWindowRect.set(0, 0, snapshot_width, snapshot_height);
+                                        target.bindTarget();                    
+                                }
+                        }
+
+                        if(!use_fbo) //no re-projection, so tiling the scene
+                        {
+                                F32 ratio = llmin( (F32)window_width / image_width , (F32)window_height / image_height) ;
+                                snapshot_width = (S32)(ratio * image_width) ;
+                                snapshot_height = (S32)(ratio * image_height) ;
+                                scale_factor = llmax(1.0f, 1.0f / ratio) ;      
+                        }
                 }
+                //else: keep the current scene scale, re-scale it if necessary after reading out.
         }
         
         S32 buffer_x_offset = llfloor(((window_width - snapshot_width) * scale_factor) / 2.f);
@@ -4503,6 +4506,7 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
                 for (int subimage_x = 0; subimage_x < scale_factor; ++subimage_x)
                 {
                         gDisplaySwapBuffers = FALSE;
+                        gDepthDirty = TRUE;
                         if (type == SNAPSHOT_TYPE_OBJECT_ID)
                         {
                                 glClearColor(0.f, 0.f, 0.f, 0.f);
@@ -4586,6 +4590,7 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
                 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
         }
         gDisplaySwapBuffers = FALSE;
+        gDepthDirty = TRUE;
 
         // POST SNAPSHOT
         if (!gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI))
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index 6b5b9bb..a6d3c0b 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -1841,7 +1841,7 @@ F32 LLVOVolume::getBinRadius()
                 }
                 else
                 {
-                        radius = 32.f;
+                        radius = llmax(mDrawable->getRadius(), 32.f);
                 }
         }
         else
diff --git a/linden/indra/newview/llwatchdog.cpp b/linden/indra/newview/llwatchdog.cpp
index d92d381..55975ee 100644
--- a/linden/indra/newview/llwatchdog.cpp
+++ b/linden/indra/newview/llwatchdog.cpp
@@ -33,6 +33,8 @@
 #include "llviewerprecompiledheaders.h"
 #include "llwatchdog.h"
 
+const U32 WATCHDOG_SLEEP_TIME_USEC = 1000000;
+
 // This class runs the watchdog timing thread.
 class LLWatchdogTimerThread : public LLThread
 {
@@ -105,6 +107,11 @@ bool LLWatchdogTimeout::isAlive() const
         return (mTimer.getStarted() && !mTimer.hasExpired()); 
 }
 
+void LLWatchdogTimeout::reset()
+{
+        mTimer.setTimerExpirySec(mTimeout); 
+}
+
 void LLWatchdogTimeout::setTimeout(F32 d) 
 {
         mTimeout = d;
@@ -132,13 +139,14 @@ void LLWatchdogTimeout::ping(const std::string& state)
         {
                 mPingState = state;
         }
-        mTimer.setTimerExpirySec(mTimeout); 
+        reset();
 }
 
-// LlWatchdog
+// LLWatchdog
 LLWatchdog::LLWatchdog() :
         mSuspectsAccessMutex(NULL),
-        mTimer(NULL)
+        mTimer(NULL),
+        mLastClockCount(0)
 {
 }
 
@@ -166,7 +174,11 @@ void LLWatchdog::init()
         {
                 mSuspectsAccessMutex = new LLMutex(NULL);
                 mTimer = new LLWatchdogTimerThread();
-                mTimer->setSleepTime(1000);
+                mTimer->setSleepTime(WATCHDOG_SLEEP_TIME_USEC / 1000);
+                mLastClockCount = LLTimer::getTotalTime();
+
+                // mTimer->start() kicks off the thread, any code after
+                // start needs to use the mSuspectsAccessMutex
                 mTimer->start();
         }
 }
@@ -177,40 +189,64 @@ void LLWatchdog::cleanup()
         {
                 mTimer->stop();
                 delete mTimer;
+                mTimer = NULL;
         }
 
         if(mSuspectsAccessMutex)
         {
                 delete mSuspectsAccessMutex;
+                mSuspectsAccessMutex = NULL;
         }
+
+        mLastClockCount = 0;
 }
 
 void LLWatchdog::run()
 {
         lockThread();
+
+        // Check the time since the last call to run...
+        // If the time elapsed is two times greater than the regualr sleep time
+        // reset the active timeouts.
+        const U32 TIME_ELAPSED_MULTIPLIER = 2;
+        U64 current_time = LLTimer::getTotalTime();
+        U64 current_run_delta = current_time - mLastClockCount;
+        mLastClockCount = current_time;
         
-        SuspectsRegistry::iterator result = 
-                std::find_if(mSuspects.begin(), 
+        if(current_run_delta > (WATCHDOG_SLEEP_TIME_USEC * TIME_ELAPSED_MULTIPLIER))
+        {
+                llinfos << "Watchdog thread delayed: resetting entries." << llendl;
+                std::for_each(mSuspects.begin(), 
                         mSuspects.end(), 
-                        std::not1(std::mem_fun(&LLWatchdogEntry::isAlive))
+                        std::mem_fun(&LLWatchdogEntry::reset)
                         );
-
-        if(result != mSuspects.end())
+        }
+        else
         {
-                // error!!!
-                if(mTimer)
+                SuspectsRegistry::iterator result = 
+                        std::find_if(mSuspects.begin(), 
+                                mSuspects.end(), 
+                                std::not1(std::mem_fun(&LLWatchdogEntry::isAlive))
+                                );
+
+                if(result != mSuspects.end())
                 {
-                        mTimer->stop();
-                }
+                        // error!!!
+                        if(mTimer)
+                        {
+                                mTimer->stop();
+                        }
 
-                llinfos << "Watchdog detected error:" << llendl;
+                        llinfos << "Watchdog detected error:" << llendl;
 #ifdef LL_WINDOWS
-                RaiseException(0,0,0,0);
+                        RaiseException(0,0,0,0);
 #else
-                raise(SIGQUIT);
+                        raise(SIGQUIT);
 #endif
+                }
         }
 
+
         unlockThread();
 }
 
diff --git a/linden/indra/newview/llwatchdog.h b/linden/indra/newview/llwatchdog.h
index c1f2b94..d196486 100644
--- a/linden/indra/newview/llwatchdog.h
+++ b/linden/indra/newview/llwatchdog.h
@@ -48,6 +48,7 @@ public:
         // This may mean that resources used by 
         // isAlive and other method may need synchronization.
         virtual bool isAlive() const = 0;
+        virtual void reset() = 0;
         virtual void start();
         virtual void stop();
 };
@@ -59,6 +60,7 @@ public:
         virtual ~LLWatchdogTimeout();
 
         /* virtual */ bool isAlive() const;
+        /* virtual */ void reset();
         /* virtual */ void start(const std::string& state); 
         /* virtual */ void stop();
 
@@ -95,6 +97,7 @@ private:
         SuspectsRegistry mSuspects;
         LLMutex* mSuspectsAccessMutex;
         LLWatchdogTimerThread* mTimer;
+        U64 mLastClockCount;
 };
 
 #endif // LL_LLTHREADWATCHDOG_H
diff --git a/linden/indra/newview/llwearable.cpp b/linden/indra/newview/llwearable.cpp
index 6e8123a..27811e8 100644
--- a/linden/indra/newview/llwearable.cpp
+++ b/linden/indra/newview/llwearable.cpp
@@ -846,7 +846,7 @@ struct LLWearableSaveData
 void LLWearable::saveNewAsset()
 {
 //      llinfos << "LLWearable::saveNewAsset() type: " << getTypeName() << llendl;
-        //dump();
+        //llinfos << *this << llendl;
 
         char new_asset_id_string[UUID_STR_LENGTH];              /* Flawfinder: ignore */
         mAssetID.toString(new_asset_id_string);
@@ -949,31 +949,32 @@ BOOL LLWearable::isMatchedToInventoryItem( LLViewerInventoryItem* item )
                 ( mSaleInfo == item->getSaleInfo() );
 }
 
-void LLWearable::dump()
+std::ostream& operator<<(std::ostream &s, const LLWearable &w)
 {
-        llinfos << "wearable " << LLWearable::typeToTypeName( mType ) << llendl;
-        llinfos << "    Name: " << mName << llendl;
-        llinfos << "    Desc: " << mDescription << llendl;
-        //mPermissions
-        //mSaleInfo
+        s << "wearable " << LLWearable::typeToTypeName( w.mType ) << "\n";
+        s << "    Name: " << w.mName << "\n";
+        s << "    Desc: " << w.mDescription << "\n";
+        //w.mPermissions
+        //w.mSaleInfo
 
-        llinfos << "    Params:" << llendl;
-        for (param_map_t::iterator iter = mVisualParamMap.begin();
-                 iter != mVisualParamMap.end(); ++iter)
+        s << "    Params:" << "\n";
+        for (LLWearable::param_map_t::const_iterator iter = w.mVisualParamMap.begin();
+                 iter != w.mVisualParamMap.end(); ++iter)
         {
                 S32 param_id = iter->first;
                 F32 param_weight = iter->second;
-                llinfos << "        " << param_id << " " << param_weight << llendl;
+                s << "        " << param_id << " " << param_weight << "\n";
         }
 
-        llinfos << "    Textures:" << llendl;
-        for (te_map_t::iterator iter = mTEMap.begin();
-                 iter != mTEMap.end(); ++iter)
+        s << "    Textures:" << "\n";
+        for (LLWearable::te_map_t::const_iterator iter = w.mTEMap.begin();
+                 iter != w.mTEMap.end(); ++iter)
         {
                 S32 te = iter->first;
-                LLUUID& image_id = iter->second;
-                llinfos << "        " << te << " " << image_id << llendl;
+                const LLUUID& image_id = iter->second;
+                s << "        " << te << " " << image_id << "\n";
         }
+        return s;
 }
 
 
diff --git a/linden/indra/newview/llwearable.h b/linden/indra/newview/llwearable.h
index 63243eb..977d29b 100644
--- a/linden/indra/newview/llwearable.h
+++ b/linden/indra/newview/llwearable.h
@@ -118,7 +118,7 @@ public:
 
         static void                     setCurrentDefinitionVersion( S32 version ) { LLWearable::sCurrentDefinitionVersion = version; }
 
-        void                            dump();
+        friend std::ostream& operator<<(std::ostream &s, const LLWearable &w);
 
 private:
         static S32                      sCurrentDefinitionVersion;      // Depends on the current state of the avatar_lad.xml.
diff --git a/linden/indra/newview/llwearablelist.cpp b/linden/indra/newview/llwearablelist.cpp
index cabf20a..75986c1 100644
--- a/linden/indra/newview/llwearablelist.cpp
+++ b/linden/indra/newview/llwearablelist.cpp
@@ -57,13 +57,15 @@ struct LLWearableArrivedData
                 mAssetType( asset_type ),
                 mCallback( asset_arrived_callback ), 
                 mUserdata( userdata ),
-                mName( wearable_name )
+                mName( wearable_name ),
+                mRetries(0)
                 {}
 
         LLAssetType::EType mAssetType;
         void    (*mCallback)(LLWearable*, void* userdata);
         void*   mUserdata;
         LLString mName;
+        S32     mRetries;
 };
 
 
@@ -99,12 +101,12 @@ void LLWearableList::getAsset( const LLAssetID& assetID, const LLString& wearabl
 // static
 void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID& uuid, void* userdata, S32 status, LLExtStat ext_status )
 {
-        BOOL success = FALSE;
         LLWearableArrivedData* data = (LLWearableArrivedData*) userdata;
-
+        LLWearable* wearable = NULL; // NULL indicates failure
+        
         if( !filename )
         {
-                llinfos << "Bad Wearable Asset: missing file." << llendl;
+                LL_WARNS("Wearable") << "Bad Wearable Asset: missing file." << LL_ENDL;
         }
         else
         if( status >= 0 )
@@ -113,38 +115,16 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID
                 LLFILE* fp = LLFile::fopen(filename, "rb");             /*Flawfinder: ignore*/
                 if( !fp )
                 {
-                        llinfos << "Bad Wearable Asset: unable to open file: '" << filename << "'" << llendl;
+                        LL_WARNS("Wearable") << "Bad Wearable Asset: unable to open file: '" << filename << "'" << LL_ENDL;
                 }
                 else
                 {
-                        LLWearable *wearable = new LLWearable(uuid);
-                        if( wearable->importFile( fp ) )
-                        {
-//                              llinfos << "processGetAssetReply()" << llendl;
-//                              wearable->dump();
-
-                                gWearableList.mList[ uuid ] = wearable;
-                                if( data->mCallback )
-                                {
-                                        data->mCallback( wearable, data->mUserdata );
-                                }
-                                success = TRUE;
-                        }
-                        else
+                        wearable = new LLWearable(uuid);
+                        bool res = wearable->importFile( fp );
+                        if (!res)
                         {
-                                LLString::format_map_t args;
-                                // *TODO:translate
-                                args["[TYPE]"] = LLAssetType::lookupHumanReadable(data->mAssetType);
-                                if (data->mName.empty())
-                                {
-                                        LLNotifyBox::showXml("FailedToLoadWearableUnnamed", args);
-                                }
-                                else
-                                {
-                                        args["[DESC]"] = data->mName;
-                                        LLNotifyBox::showXml("FailedToLoadWearable", args);
-                                }
                                 delete wearable;
+                                wearable = NULL;
                         }
 
                         fclose( fp );
@@ -162,44 +142,64 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID
                 }
                 LLViewerStats::getInstance()->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
 
-                llwarns << "Wearable download failed: " << LLAssetStorage::getErrorString( status ) << " " << uuid << llendl;
+                LL_WARNS("Wearable") << "Wearable download failed: " << LLAssetStorage::getErrorString( status ) << " " << uuid << LL_ENDL;
                 switch( status )
                 {
                   case LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE:
                   {
-                          LLString::format_map_t args;
-                          // *TODO:translate
-                          args["[TYPE]"] = LLAssetType::lookupHumanReadable(data->mAssetType);
-                          if (data->mName.empty())
+                          // Fail
+                          break;
+                  }
+                  default:
+                  {
+                          static const S32 MAX_RETRIES = 3;
+                          if (data->mRetries < MAX_RETRIES)
                           {
-                                  LLNotifyBox::showXml("FailedToFindWearableUnnamed", args);
+                                  // Try again
+                                  data->mRetries++;
+                                  gAssetStorage->getAssetData(uuid,
+                                                                                          data->mAssetType,
+                                                                                          LLWearableList::processGetAssetReply,
+                                                                                          userdata);  // re-use instead of deleting.
+                                  return;
                           }
                           else
                           {
-                                  args["[DESC]"] = data->mName;
-                                  LLNotifyBox::showXml("FailedToFindWearable", args);
+                                  // Fail
+                                  break;
                           }
-
-                          // Asset does not exist in the database.
-                          // Can't load asset, so return NULL
-                          if( data->mCallback )
-                          {
-                                  data->mCallback( NULL, data->mUserdata );
-                          }
-                          break;
-                  }
-                  default:
-                  {
-                          // Try again
-                          gAssetStorage->getAssetData(uuid,
-                                                                                  data->mAssetType,
-                                                                                  LLWearableList::processGetAssetReply,
-                                                                                  userdata);  // re-use instead of deleting.
-                          return;
                   }
                 }
         }
 
+        if (wearable) // success
+        {
+                gWearableList.mList[ uuid ] = wearable;
+                LL_DEBUGS("Wearable") << "processGetAssetReply()" << LL_ENDL;
+                LL_DEBUGS("Wearable") << wearable << LL_ENDL;
+        }
+        else
+        {
+                LLString::format_map_t args;
+                // *TODO:translate
+                args["[TYPE]"] = LLAssetType::lookupHumanReadable(data->mAssetType);
+                if (data->mName.empty())
+                {
+                        LLNotifyBox::showXml("FailedToFindWearableUnnamed", args);
+                }
+                else
+                {
+                        args["[DESC]"] = data->mName;
+                        LLNotifyBox::showXml("FailedToFindWearable", args);
+                }
+        }
+        // Always call callback; wearable will be NULL if we failed
+        {
+                if( data->mCallback )
+                {
+                        data->mCallback( wearable, data->mUserdata );
+                }
+        }
         delete data;
 }
 
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 20fd5a7..67bf647 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -108,8 +108,6 @@
 //#define DEBUG_INDICES
 #endif
 
-void render_ui_and_swap_if_needed();
-
 const F32 BACKLIGHT_DAY_MAGNITUDE_AVATAR = 0.2f;
 const F32 BACKLIGHT_NIGHT_MAGNITUDE_AVATAR = 0.1f;
 const F32 BACKLIGHT_DAY_MAGNITUDE_OBJECT = 0.1f;
@@ -1546,10 +1544,8 @@ void LLPipeline::shiftObjects(const LLVector3 &offset)
 
         assertInitialized();
 
-        //do a swap to indicate an invalid previous frame camera
-        render_ui_and_swap_if_needed();
         glClear(GL_DEPTH_BUFFER_BIT);
-        gDisplaySwapBuffers = FALSE;
+        gDepthDirty = FALSE;
 
         for (LLDrawable::drawable_vector_t::iterator iter = mShiftList.begin();
                  iter != mShiftList.end(); iter++)
@@ -1974,7 +1970,10 @@ void LLPipeline::postSort(LLCamera& camera)
                 }
         }
 
-        //build render map
+        //rebuild groups
+        sCull->assertDrawMapsEmpty();
+
+        LLSpatialGroup::sNoDelete = FALSE;
         for (LLCullResult::sg_list_t::iterator i = sCull->beginVisibleGroups(); i != sCull->endVisibleGroups(); ++i)
         {
                 LLSpatialGroup* group = *i;
@@ -1985,6 +1984,18 @@ void LLPipeline::postSort(LLCamera& camera)
                 }
                 
                 group->rebuildGeom();
+        }
+        LLSpatialGroup::sNoDelete = TRUE;
+
+        //build render map
+        for (LLCullResult::sg_list_t::iterator i = sCull->beginVisibleGroups(); i != sCull->endVisibleGroups(); ++i)
+        {
+                LLSpatialGroup* group = *i;
+                if (sUseOcclusion && 
+                        group->isState(LLSpatialGroup::OCCLUDED))
+                {
+                        continue;
+                }
                 
                 for (LLSpatialGroup::draw_map_t::iterator j = group->mDrawMap.begin(); j != group->mDrawMap.end(); ++j)
                 {
@@ -2113,6 +2124,8 @@ void LLPipeline::postSort(LLCamera& camera)
                 } func;
                 LLSelectMgr::getInstance()->getSelection()->applyToTEs(&func);
         }
+
+        LLSpatialGroup::sNoDelete = FALSE;
 }
 
 
diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
index 12cd9fb..bbbe693 100644
--- a/linden/indra/newview/releasenotes.txt
+++ b/linden/indra/newview/releasenotes.txt
@@ -1,40 +1,103 @@
++------------------------------------------------------+
+|           Complete release notes for the             |
+|    Release Candidate Viewer can also be found at     |
+|  http://wiki.secondlife.com/wiki/Beta_Release_Notes  |
++------------------------------------------------------+
+
+Release Notes for Second Life 1.20(9) May 30th, 2008
+=====================================
+
+Fixes:
+* Fixed: VWR-7335: Revert to non-HTML search for Search>Places in 1.20
+* Fixed: VWR-7322: Chatter's name is not beside chatter's text in Communicate Local Chat (when 'Show Timestamps in chat' is unchecked)
+* Fixed: VWR-7342: Linux 1.20(7) libexpat.so.1 not found, exit on load
+* Fixed: VWR-6240: Snapshot to disk is not a complete image for a custom size larger than the screen size
+* Fixed: VWR-6948: Flexi prims are rendered differently in 1.20 - breaks products
+* Fixed: VWR-6107: When uploading animations the Ruth model appears dimly lit and unshaded
+* Fixed: VWR-2679: Joystick flycam breaks after switch to fullscreen mode
+* Fixed: VWR-1352: A strange copy operation of LLStyle
+* Fixed: VWR-6244: Building outlines get dissorted/out of position by one frame when moving the object with SpaceNavigator
+* Fixed: VWR-6016: FMOD problem: update3dPosition error
+* Fixed: VWR-7234: llcommon/files.lst has two entries for lllog.cpp
+* Fixed: Pasting multiline clipboard content into chat loses newlines
+* Fixed: RC7 doesnt show the release candidate login screen
+* Fixed: RC7 grid selection doesn't persist
+* Fixed: Change Linux viewer default compiler from gcc3.4 to gcc4.1
+* Fixed: crash in LLFolderViewFolder::setSelection
+* Fixed: Infinite loop in wearables (LLWearableList::processGetAssetReply) causes a crash
+* Fixed: Critical message window should not say "Critical message" because it is the Community Standards document
+* Fixed: Remove First Use dialogs for sitting and movement key binding during Orientation Island
+* Fixed: option to Send Crash Report is not persisting
+* Fixed: Increase thread monitoring mainloop timeout from 10 sec to 20 seconds
+* Fixed: Default the mini-map to off for new users
+* Fixed: Text on Send button for Group IM is right-justified
+* Fixed: Region/Estate> Estate tab has a misaligned outline on Estate Managers box
+* Fixed: Parcel tag overlaps image on Sell Land floater if longer than 36 characters
+* Fixed: crash on LLSurface::resolvePatchRegion()
+* Fixed: crash on LLViewerRegion::setCapability
+* Fixed: Minor bugfixes to thread monitoring during crashes, purgeAllTextures, and the user setting whether to submit crash reports
+* Fixed: Additional thread monitoring tweaks, added a timer to confirm if the watching thread has been hung
+* Partial Fix: VWR-1715: Macintosh cyclic short-term freezing of display, getting worse over time; does not respond to commands, eventually change of POV causes crash
+
+Localization Fixes:
+* Fixed: Added new translation strings for German, Korean, Japanese
+
+Release Notes for Second Life 1.20(8) May 22nd, 2008
+=====================================
+
+Fixes:
+* Fixed: VWR-7347: 'For sale' amounts in objects' Hover Tips show a garbage character
+* Fixed: RC7 is unable to buy Linden Dollars
+* Fixed: Tuned behavior of thread monitoring (also called watchdog) to deal with extraneous crashing in RC7
+* Fixed: Disabled thread monitoring for Mac and linux versions
+* Fixed: Fix the premature start of thread watchdog mainloop timeout
+
 Release Notes for Second Life 1.20(7) May 16th, 2008
 =====================================
 
 New features and changes:
-* Pasting multiline clipboard content into Chat will show a Paragraph symbol at newlines
 * Moved "Set Window Size" options from File menu into Preferences > Graphics
-* New users are rendered as a cloud, rather than naked, before they choose a gender
+* Newly created avatars without a gender, or any avatar where "clothing is still downloading" are rendered as a cloud rather than naked/wrong body shape
 * Directly interacting with a muted resident will unmute them, with a note logged in the Chat history (VWR-1735)
 * Fly button is now shown as disabled when you are sitting
+* Pasting multiline clipboard content into Chat will show a Paragraph symbol at newlines (Partial Fix behavior)
 * Group Info > Notices tab explains the storage limits of 200 notices and 14 days 
 * Added OpenGL monitoring via Advanced menu > Rendering > Debug GL option to turn on extra rendering error checking and help reproduce crashes
 * Added beta support for basic voice lipsync for voice visualization (VWR-4794) - via Advanced menu > Character
-* Changed resident names to be interactive in Chat/IM:
-** Clicking on resident names in Local Chat will open their Profile page
-** Clicking on resident names in a Group IM will open an individual IM
+* The 'camera shutter' soundclip/animation plays whenever a new image is acquired by Snapshot Preview (this camera shutter sound indicates, like a real camera, that you have taken a new picture of the world). The sound does not play repeatedly if auto-snapshot is on
+* Disabled the Snapshot Preview > Auto-snapshot checkbox, unless Freeze Frame checkbox is set. (This clarifies that Auto-snapshot previously only worked in this case.)
+
+* Clicking on resident names in Local Chat or in a Group IM will open their Profile page
+** The color of clickable resident names uses the same color as URL hyperlinks in chat. These may be changed in Preferences > Text Chat > color picker for "URLs"
 
-* Added four texture constants for referencing in llSetLinkTexture in scripts:
-** TEXTURE_BLANK, TEXTURE_DEFAULT, TEXTURE_PLYWOOD and TEXTURE_TRANSPARENT
-** Note: Scripts using these constants will run in all Second Life viewers, however previous versions of the viewer will not be able to edit and recompile scripts using the new TEXTURE_BLANK constant;  older versions trying to compile such a script will report "(XX,YY) : ERROR : Name not defined within scope."
+* Added four texture constants for referencing in llSetLinkTexture:
+** TEXTURE_BLANK is the non-transparent blank texture, equivalent to "5748decc-f629-461c-9a36-a35a221fe21f"
+** TEXTURE_DEFAULT is the default Media texture, equivalent to "8b5fec65-8d8d-9dc5-cda8-8fdf2716e361"
+** TEXTURE_PLYWOOD is the plywood texture, equivalent to "89556747-24cb-43ed-920b-47caed15465f"
+** TEXTURE_TRANSPARENT is the default "white transparent" texture, equivalent to "59facb66-4a72-40a2-815c-7d9b42c56f60"
+** Note: Scripts using these constants will run smoothly in all Second Life viewers, however previous versions of the viewer will NOT be able to edit and recompile scripts using the new constants. Older versions will report "(XX,YY) : ERROR : Name not defined within scope" when trying to compile such a script.
 
-* Thread monitoring to catch freezes
-** A new thread monitor will detect when the viewer application frozen for a period greater than 10 seconds and possibly force a crash with detailed logs
+* Thread monitoring to catch freezes:
+** A new thread monitor (also referred to as a Watchdog) will detect when the viewer application frozen for a period greater than 10 seconds and possibly force a crash with detailed logs
+** Thread monitoring can be disabled by choosing to never report crashes, or with a command line setting "--set WatchdogEnabled 0"
+** The threshold timing of the thread monitor is set in the file /app_settings/settings.xml under the key "MainloopTimeoutDefault"
 
 * Improved internationalization support:
 ** Make 'System Default' language option work on Linux and Windows.
 ** Make unicode system font support good on Linux 
 
-* Improvements to Search
+* Improvements to Search:
 ** Search > Popular Places is replaced by a Search > Showcase tab that points to the website Showcase
-** Search > Places and Search > Groups use web-based search
+** Search > Places, and Search > Groups use web-based search
 ** Classified ads have a drop-down menu to indicate Mature or Not Mature content
 
 Changes: 
 * VWR-4794: Basic voice lipsync for voice visualization
-* VWR-4204: Clicking on names in Chat/Group IM history should open Profile page or IM
+* VWR-4204: Clicking on names in Chat/Group IM history should open Profile page
 * VWR-463: Blank is a pre-defined texture in client, but not in LSL
 * Updated library version for openssl
+* Added thread monitoring to the viewer
+* Added a setting switch to completely disable thread monitoring
 * New users are shown as a cloud rather than naked until they choose a gender.
 * Move "Set Window Size" options from File menu into Preferences > Graphics
 * Make clothing-still-downloading dialog into an ignorable alert dialog
@@ -44,6 +107,8 @@ Changes:
 * Convert Search > Group tab to use HTML search
 * Search: Require Mature/Not Mature in Classifieds
 * Make strict GL debugging toggleable on-the-fly via Advanced menu > Rendering > Debug GL option - turns on extra rendering error checking and help reproduce crashes
+* The 'camera shutter' soundclip/animation plays whenever a new image is acquired by Snapshot Preview, but not repeatedly if auto-snapshot is on
+* Disabled the Snapshot Preview > Auto-snapshot checkbox, unless Freeze Frame checkbox is set
 
 Fixes:
 * Fixed: VWR-104: Unused class LLVertexProgramGL should be removed
@@ -63,12 +128,17 @@ Fixes:
 * Fixed: VWR-3857: Script (LSL) editor shows non Latin 1 characters as square boxes
 * Fixed: VWR-2275: Linux 1.18.3 Won't Link
 * Fixed: VWR-3813: gtk_check_version() API changed to return const gchar * - causes gcc ERROR
+* Fixed: VWR-1735: Directly interacting with a muted resident should unmute them
+* Fixed: VWR-2142: Parcel voice icon doesn't reflect disabled status if voice isn't used
+* Fixed: VWR-5853: Double-Clicking on vertical edge of Inventory/Gesture window destroys the floating window.
+* Fixed: VWR-2448: Snapshot Preview tool should respect 'Quiet Snapshots to Disk'
 * Fixed: llrender.cpp export
+* Fixed: Clean up log messages in viewer to make crash logs more readable and useful
 * Fixed: Create secondlife:///app/ URL to open my groups panel
 * Fixed: Create secondlife:///app/ URL to open create groups dialog
 * Fixed: Display a message if LLWebBrowserCtrl blocks a secondlife:///app/* url
 * Fixed: Abstract common glTexParameter calls
-* Fixed: Orientation Island HUD select language texture is wrong for English in 1.20
+* Fixed: Orientation Island HUD select language texture is wrong for English version in 1.20
 * Fixed: Double-clicking border of communicate window makes window unrecoverable
 * Fixed: Command line parser bug parsing "--multiple true" at beginning of a command line.
 * Fixed: --loginuri is not being handled correctly
@@ -76,15 +146,13 @@ Fixes:
 * Fixed: crash in LLMediaImplQuickTime::load
 * Fixed: crash on LLViewerParcelMedia::update
 * Fixed: Pop-up menu width should try to accomodate the longest menu item (within reason)
-* Fixed: VWR-1735: Directly interacting with a muted resident should unmute them
-* Fixed: VWR-2142: Parcel voice icon doesn't reflect disabled status if voice isn't used
-* Fixed: VWR-5853: Double-Clicking on vertical edge of Inventory/Gesture window destroys the floating window.
-* Fixed: VWR-2448: Snapshot Preview tool should respect 'Quiet Snapshots to Disk'
 * Fixed: Can't change values with debug settings floater
 * Fixed: Focus > Zoom button can't be re-selected
 * Fixed: Debug Permissions displays overlap
 * Fixed: Objects with no group tagging show group tags of previously clicked items
 * Fixed: stop bundling libexpat with the linux viewer
+* Fixed: World Map's keyboard focus that jumps from Landmarks to Teleport is broken in 1.20
+* Fixed: text results for Search > People is displayed as white text
 * Partial Fix: Pasting multiline clipboard content into chat loses newlines
 
 Localization Fixes:
@@ -334,141 +402,3 @@ Source changes:
 * VWR-2645: Source typo RELEASE_FOR_DOWNLOAD should be LL_RELEASE_FOR_DOWNLOAD ?
 * Fixed: g++ 4 viewer compile issues
 * Dead code removal createLegacyWearableFromAvatar
-
-
-Release Notes for Second Life 1.19.0(4) February 28th, 2008
-=====================================
-New features and changes:
-* Voice 
-** Voice Chat is now enabled by default to allow Residents to hear other Residents. 
-** A microphone is required to speak to other Residents.
-** Push-to-Talk is the default mode for transmitting voice.
-** These settings can be modified via the Voice Chat tab of the Preferences dialog. 
-
-* Age Verification:
-** The user interface for parcel and estate access has been clarified and improved.
-** Added the ability to restrict access to parcels and estates to age verified adults. 
-** Removed the ability to *ban* access to Residents who have provided payment info or who have used payment info. We continue to support the ability to *allow* access to only those who have provided payment info.
-
-* Crash Reporter
-** The crash reporting mechanism has been improved. Following a crash, more useful information will be sent and reports should now take less than 10 seconds.
-
-* VWR-210: Voice Support on Linux (EXPERIMENTAL) - see README-linux-voice.txt 
-
-* Other changes:
-** Change alert message that pops up when you set Busy
-** Add "Teleporting from SLURL to SLURL" to the chat history to provide quick and dirty "back" links
-** Print the name of the missing gesture in the error message
-** Remove "New Account..." and "Preferences" buttons from login screen for 1.19.0
-
-Fixes:
-* SVC-930: Prims set for sale - prices are incorrectly set when multiple prims taken to inventory and rezzed
-* SVC-1125: New Search: Beacons aren't shown when teleporting to regions with "Allow Direct Teleport" disabled
-* VWR-1125: Clicking Title Bar While Mouselook'd Repositions SL Window
-* VWR-1137: Inventory names out of sync after renaming via Properties window
-* VWR-1145: Unable To Connect help not available
-* VWR-1162: Land for sale includes L$1 parcels that are not actually for sale
-* VWR-1350: Color settings do not appear to be applied to LSL default text
-* VWR-1475: OpenJPEG always uploads single layer lossless images
-* VWR-1590: Keyboard changes inventory selection after right-click
-* VWR-1627: Classified metrics are reset to 0 when the ad is updated
-* VWR-1651: Add ability to open a partners profile whilst viewing an avatar's profile
-* VWR-1774: Some avatar positions result in no Z-axis arrow when editing attachments
-* VWR-1873: Typos in en-us locale file
-* VWR-1919: Remove texture UUID information from UI unless full-perm
-* VWR-2030: Avatar only turns half-way in Appearance Mode
-* VWR-2142: Parcel voice icon doesn't reflect disabled status if voice isn't used
-* VWR-2256: Mac updater directory permission issues
-* VWR-2367: Wrong handling of maximum length of Group Notice message
-* VWR-2404: lossless texture compression on small textures not lossless
-* VWR-2410: noise dot appear in chat window when clien running long with chatting.
-* VWR-2411: Possible crash in pipeline.cpp
-* VWR-2412: Possible crash drawpoolwater
-* VWR-2421: ATI Radeon HD 2900 XT + Second Life = "Couldn't match GPU to a class","Setting GPU Class to Class0"
-* VWR-2483: the macviewer.xcodeprj file doesn't create stripped binaries on Deployment or Universal
-* VWR-250: Preedit (composition) strings are shown poorly when typing Japanese text on Windows
-* VWR-2550: Scuplty vertex coordinates are size/256 meters too small on the positive faces
-* VWR-2614: gActiveChannelSpeakerMgr not deleted at end of program in viewer.cpp
-* VWR-2617: Adds LLSD support to flex/light/sculpt params for primitives
-* VWR-2652: Changes needed to compile viewer against lastest libopenjpeg2000
-* VWR-2684: Minor leak in floaters using layoutstacks
-* VWR-2722: Muting an object with pie menu only mutes the prim you select, not entire linkset
-* VWR-2847: Wrong hover text in Japanese UI
-* VWR-2854: Some sculpted prims render as balls on close zoom, which look fine in older clients
-* VWR-2867: Eyes rotate unnaturally around their X axis.  Clockwise/Counter-Clockwise
-* VWR-289: URLs for video media streaming need to be URL-encoded or stream doesn't work
-* VWR-2959: Windows (Visual Studio) solution file refers to a non-existing project "build_all"
-* VWR-3088: Unchecking "Automatic Appearance Camera Movement" no longer has any effect
-* VWR-3206: OpenJPEG svn478 causes slviewer to crash
-* VWR-3428: Checking a users profile while editing a linked set causes viewer crash
-* VWR-3458: Mouse cursor background is opaque white instead of transparent on big endian systems
-* VWR-3558: llLoadURL cannot be muted
-* VWR-356: Move delete to the bottom of context menus, separated by spacer
-* VWR-3748: Builds fail on 1.18.6 RC if not using MOZLIB due to missing #if LL_LIBXUL_ENABLED in 3 places in indra/newview/llpanellogin.cpp
-* VWR-3948: Underlayers no longer removable by pie menu in Windlight, release candidates
-* VWR-412: Object editing arrows hidden but clickable on objects you can't edit.
-* dialogs have extra vertical space
-* Photo Album: name in Properties cut off some Japanese characters
-* New gestures do not appear active in inventory
-* Make parcel name in menu "look" active
-* "Wear" pie option shows up for many objects even if resident does not own and cannot wear them.
-* Textures on no-transfer objects can be transferred
-* Deleted gestures still work
-* Inventory description out of sync after renaming via Properties window
-* Show private estate tiles when World Map is zoomed out
-* Properties description not updated when preview description updated
-* Buying object contents broken
-* Improve window opening behavior, ensuring it is mostly on screen
-* No-modify objects can be modified through Open pane
-* Inventory names out of sync after renaming via Properties
-* Japanese IME mode should be set and postiion of any input windows fixed for non-Japanese fields
-* ctrl-shift-w doesn't work if no windows have focus
-* Avatar falling in place - Alliez Mysterio
-* Linux crash reporter does not run on next execution after forcing an infinite loop and forcefully exiting
-* hitting enter should immediately set the value of a field
-* Inventory Folder Loading state not clearly indicated
-* Add warning dialog to the Land Sale process to warn against selling land to Anyone
-* Legacy flossexception link needs to be fixed in source
-* make link from client log in window to "Forgot Password" page
-* Remove button under estate managers list enables after estate manager clicks in the list
-* Changing search field should cancel current selection
-* Estate tab within Tools / Region Estate has wrong settings for enable of Restrict Access upon initialization
-* llEscapeURL and llUnescapeURL caps output to 255 characters
-* XUI LoadFromXML function doesn't work
-* Sanitize floater sizing behavior when SL window is made very small
-* Animation won't stop if avatar teleports while animated
-* Can't paste name of object into View > Mute List > Mute object by name
-* pressing ctrl-F10 then Escape causes keyboard to be unresponsive
-* Make SL viewer updater show a progress bar so that people know how long to wait
-* Can't double-click on groups in profile after changing your active title
-* Getting multiple copies of texture dragged onto prim
-* blue dialog's 'next' widget steals focus
-* Audio should be encoded for upload at a 'good enough' quality rather than a user-selected bitrate
-* multiple preview windows open for a single texture/snapshot saved inside a note card
-* Enhance Viewer to support new Age Verification feature
-* Rename crash setting to cause crash logger to come up for all residents
-* Change crash logger "Remember this choice" function to default to on
-* Rework Ban tab of floater_about_land
-* Windows IME positioning fixed
-* Viewer crashes in assert when playing Sword Strike animation
-* Unable to set 'Group Access' for land that is also 'Public Access' (Was VWR-3667)
-* Disable QuickTime when the installed version is less than version with RTSP exploit
-* Korean viewer crashes on startup
-* Move fullscreen message from login screen to viewer prefs
-* linux client doesn't recognise that a viewer is already running (slurl crapout)
-* Search results window displays "s..." and "n..." instead of "searching..." and "none found"
-* QuickTime disabled message can not be ignored
-* Crash on login page when using Logitech LCD Keyboard
-* SEC-17 Ability to Access Sculpted Prim Textures from Database without owning actual sculpt texture, allowing for people to "steal" sculpts.
-* info window does not pop up when transitioning from a Havok1 to Havok4 region
-* Repoint Report Bug... Viewer link to Pjira
-* Upload Animation window: Button missing in Stopped window state
-
-Source changes:
-* Upgrade Win32 libvorbis to v1.2
-* VWR-2881: Bundled Mesa libs are not GPL compatible
-* upgrade in-tree Linux GL headers to Mesa 7.x
-* upgrade in-tree Win32 GL headers to version without SGI Free B license
-* Rebuild and/or update libraries  to use statically linked libs.
-* Remove llfloaterhtmlhelp.cpp / h and floater_html_help.xml
-
diff --git a/linden/indra/newview/skins/xui/de/alerts.xml b/linden/indra/newview/skins/xui/de/alerts.xml
index 6a5635a..dcaaa0e 100644
--- a/linden/indra/newview/skins/xui/de/alerts.xml
+++ b/linden/indra/newview/skins/xui/de/alerts.xml
@@ -749,6 +749,9 @@ Sollte das Problem fortbestehen, finden Sie weitere Hilfestellung unter: http://
 MINDESTANF.
 Die Seite [_URL] für weitere Informationen öffnen?
                 </message>
+                <ignore name="ignore">
+                        Nicht unterstützte Hardware ignorieren
+                </ignore>
                 <option name="Yes">
                         Ja
                 </option>
@@ -781,6 +784,18 @@ Die Seite [_URL] für weitere Informationen öffnen?
                         510
                 </message>
         </alert>
+        <alert name="UnknownGPU">
+                <message name="message">
+                        Ihr System verwendet eine uns zurzeit unbekannte Grafikkarte.  
+Dies ist häufig der Fall bei neuer Hardware, die wir noch nicht testen konnten. 
+Second Life funktioniert aller Voraussicht nach normal, möglicherweise 
+müssen Sie aber die Grafikeinstellungen anpassen.
+(Bearbeiten &gt; Einstellungen &gt; Grafik).
+                </message>
+                <ignore name="ignore">
+                        Unbekannte Grafikkarte ignorieren
+                </ignore>
+        </alert>
         <alert name="FreezeAvatarFullname">
                 <message name="message">
                         [AVATAR_NAME] einfrieren?
@@ -1388,6 +1403,34 @@ Bitte wählen Sie einen männlichen oder weiblichen Avatar.
                         Problem beim Hinzufügen zu dieser Grundstücksliste.  Bei mindestens einem Grundstück ist die Liste voll.
                 </message>
         </alert>
+        <alert name="SetClassifiedMature">
+                <message name="message">
+                        Enthält diese Anzeige nicht jugendfreie Inhalte?
+                </message>
+                <option name="Mature">
+                        Ja
+                </option>
+                <option name="Not Mature">
+                        Nein
+                </option>
+                <option name="Cancel">
+                        Abbrechen
+                </option>
+        </alert>
+        <alert name="SetGroupMature">
+                <message name="message">
+                        Beschäftigt sich diese Gruppe mit nicht jugendfreien Inhalten?
+                </message>
+                <option name="Mature">
+                        Ja
+                </option>
+                <option name="Not Mature">
+                        Nein
+                </option>
+                <option name="Cancel">
+                        Abbrechen
+                </option>
+        </alert>
         <alert name="HelpRegionSearch" title="Nicht in Suche anzeigen">
                 <message name="message">
                         Wenn Sie diese Option auswählen, können Parzelleneigentümer ihre Parzellen nicht in der Suche anzeigen lassen
@@ -1494,8 +1537,7 @@ Sie dieses Objekt anbieten?
         </alert>
         <alert name="NoItems">
                 <message name="message">
-                        Sie sind nicht berechtigt, die ausgewählten
-                        Objekte zu kopieren.
+                        Sie sind nicht berechtigt, die ausgewählten Objekte zu kopieren.
                 </message>
         </alert>
         <alert name="CannotCopyCountItems">
@@ -2670,10 +2712,12 @@ Sie wurden zur nächstgelegenen Region teleportiert.
         </alert>
         <alert name="ClothingLoading">
                 <message name="message">
-                        Ihre Kleidung wird noch heruntergeladen.
-Sie können sich in der Welt normal verhalten und andere
-Einwohner können Sie sehen.
+                        Ihre Kleidung wird noch heruntergeladen. 
+Sie können [SECOND_LIFE] normal verwenden. Andere Benutzer können Sie korrekt dargestellt sehen.
                 </message>
+                <ignore name="ignore">
+                        Wenn das Herunterladen von Kleidung lange dauert
+                </ignore>
         </alert>
         <alert name="FirstRun">
                 <message name="message">
@@ -4583,7 +4627,7 @@ zu erleichtern, oder testen Sie sie, indem Sie sie in die Adressleiste Ihres Bro
         </alert>
         <alert name="GraphicsPreferencesHelp">
                 <message name="message">
-                        Die Optionen in diesem Dialog steuern Fenstergröße und Auflösung sowie die Qualität der Grafikdarstellung auf dem Client. Vier grundlegende Grafikeinstellungen stehen zur Wahl: Niedrig, Mittel, Hoch und Ultra. Wenn Sie das Kontrollkästchen &quot;Benutzerdefiniert&quot; anklicken, können Sie folgende Grafikeinstellungen selbst vornehmen:
+                        Die Optionen in diesem Dialog steuern Fenstergröße und Auflösung sowie die Qualität der Grafikdarstellung im Client.  Im Fenster &apos;Einstellungen&apos; &gt; &apos;Grafik&apos; stehen vier Grafikeinstellungen zur Wahl: Niedrig, Mittel, Hoch und Ultra. Die Grafikeinstellungen lassen sich auch individuell anpassen; aktivieren Sie das Kontrollkästchen &apos;Benutzerdefiniert&apos;, um die folgenden Einstellungen zu bearbeiten:
 
 Shader: Aktivieren oder deaktivieren Sie die verschiedenen Pixel-Shader. 
 
@@ -4597,11 +4641,11 @@ Max. Partikelzahl: Legt fest, wie viele Partikel gleichzeitig berechnet und ange
 
 Post-Processing-Qualität: Legt fest, mit welcher Auflösung der Glüheffekt berechnet wird. 
 
-Gitterdetails: Legt den Detailgrad bei der Berechnung bestimmter Objekte fest.
+Gitterdetails: Legt den Detailgrad bzw. die Anzahl an Dreiecken bei der Berechnung bestimmter Objekte fest. Höhere Werte führen zu einer genaueren Darstellung, dauern aber länger in der Berechnung.
 
 Beleuchtungsdetails: Legt fest, welche Lichtquellen berechnet werden.
 
-Terraindetails: Legt den Detailgrad bei der Berechnung des Terrains fest. 
+Terraindetails: Legt den Detailgrad bei der Berechnung der Terraintextur fest.
                 </message>
         </alert>
         <alert name="WLSavePresetAlert">
@@ -5044,4 +5088,9 @@ Möchten Sie die Second Life Website öffnen, um diese Angaben zu hinterlegen?
                         Nein
                 </option>
         </alert>
+        <alert name="MissingString">
+                <message name="message">
+                        Der String [STRING_NAME] fehlt in strings.xml
+                </message>
+        </alert>
 </alerts>
diff --git a/linden/indra/newview/skins/xui/de/floater_directory.xml b/linden/indra/newview/skins/xui/de/floater_directory.xml
index 506ed19..c149fb4 100644
--- a/linden/indra/newview/skins/xui/de/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/de/floater_directory.xml
@@ -222,8 +222,7 @@
                         <button label="&lt; Vorherige" label_selected="&lt; Vorherige" name="&lt; Prev" />
                         <button label="Weiter &gt;" label_selected="Weiter &gt;" name="Next &gt;" />
                         <check_box label="Nur Orte mit Bildern anzeigen" name="incpictures" />
-                        <check_box
-                             label="Parzellen mit zugangsbeschränkten Inhalten einschließen"
+                        <check_box label="Parzellen mit zugangsbeschränkten Inhalten einschließen"
                              name="incmature" />
                         <text
                              name="These are the most popular places in the world, as measured by traffic,         the amount of time people spend there.">
@@ -237,6 +236,22 @@ Zeit gemessen, die Benutzer dort verbringen.
                                 <column label="Traffic" name="dwell" />
                         </scroll_list>
                 </panel>
+                <panel label="Showcase" name="showcase_panel">
+                        <string name="searching_text">
+                                Suchen...
+                        </string>
+                        <string name="not_found_text">
+                                Nicht gefunden.
+                        </string>
+                        <button label="Zurück" name="back_btn" />
+                        <button label="Weiter" name="forward_btn" />
+                        <string name="loading_text">
+                                Wird geladen...
+                        </string>
+                        <string name="done_text">
+                                Fertig
+                        </string>
+                </panel>
                 <panel label="Landverkauf" name="land_sales_panel">
                         <string name="searching_text">
                                 Suchen...
@@ -396,6 +411,17 @@ Land in der Titelleiste auf den Namen.
                                 <column label="Members" name="members" />
                                 <column label="" name="score" />
                         </scroll_list>
+                        <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" />
+                        <check_box label="Ab-18-Inhalte einschließen" name="mature_check" />
+                        <string name="loading_text">
+                                Wird geladen...
+                        </string>
+                        <string name="done_text">
+                                Fertig
+                        </string>
                 </panel>
                 <panel label="Alle (alt)" name="find_all_old_panel">
                         <string name="searching_text">
diff --git a/linden/indra/newview/skins/xui/de/floater_im.xml b/linden/indra/newview/skins/xui/de/floater_im.xml
index db5c580..573ff6e 100644
--- a/linden/indra/newview/skins/xui/de/floater_im.xml
+++ b/linden/indra/newview/skins/xui/de/floater_im.xml
@@ -6,6 +6,9 @@
         <text name="offline_message">
                 [FIRST] [LAST] ist offline.
         </text>
+        <string name="muted_message">
+                [FIRST] [LAST] ist stummgeschaltet.
+        </string>
         <text name="generic_request_error">
                 Fehler bei Anfrage, bitte versuchen Sie es später.
         </text>
diff --git a/linden/indra/newview/skins/xui/de/floater_script_debug.xml b/linden/indra/newview/skins/xui/de/floater_script_debug.xml
index 1d13243..f8c1543 100644
--- a/linden/indra/newview/skins/xui/de/floater_script_debug.xml
+++ b/linden/indra/newview/skins/xui/de/floater_script_debug.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater name="script debug floater" title="Skriptfehler/Warnung">
+<multi_floater name="script debug floater" title="Skriptwarnung/Fehler">
         <tab_container name="Preview Tabs">
                 <floater label="Skript" name="all_scripts" title="[All scripts]" />
         </tab_container>
diff --git a/linden/indra/newview/skins/xui/de/floater_world_map.xml b/linden/indra/newview/skins/xui/de/floater_world_map.xml
index e7a01e5..c3d203d 100644
--- a/linden/indra/newview/skins/xui/de/floater_world_map.xml
+++ b/linden/indra/newview/skins/xui/de/floater_world_map.xml
@@ -4,7 +4,7 @@
                 <panel label="Objekte" name="objects_mapview" />
                 <panel label="Terrain" name="terrain_mapview" />
         </tab_container>
-        <text name="land_for_sale_label" font="SansSerifSmall">
+        <text font="SansSerifSmall" name="land_for_sale_label">
                 Land erhaeltlich
         </text>
         <text name="auction_label">
@@ -38,7 +38,7 @@
                 Beliebt
         </text>
         <check_box label=" " name="popular_chk" />
-        <text name="land_for_sale_label2" font="SansSerifSmall"> 
+        <text font="SansSerifSmall" name="land_for_sale_label2">
                 Land erhaeltlich
         </text>
         <check_box label=" " name="land_for_sale_chk" />
@@ -50,15 +50,14 @@
                 Events (18+)
         </text>
         <check_box label=" " name="event_mature_chk" />
-        <combo_box label="Meine Freunde" name="friend combo" tool_tip="Friend to Show on Map">
+        <combo_box label="Online-Freunde" name="friend combo" tool_tip="Friend to Show on Map">
                 <combo_item name="none_selected">
-                        Meine Freunde
+                        Online-Freunde
                 </combo_item>
         </combo_box>
-        <combo_box label="Meine Landmarken" name="landmark combo"
-             tool_tip="Landmark to Show on Map">
+        <combo_box label="Landmarken" name="landmark combo" tool_tip="Landmark to Show on Map">
                 <combo_item name="none_selected">
-                        Meine Landmarken
+                        Landmarken
                 </combo_item>
         </combo_box>
         <line_editor label="Nach Regionsname suchen" name="location"
@@ -79,19 +78,15 @@
         <spinner name="spin z" tool_tip="Z-Koordinate der Position auf der Karte" />
         <button label="Teleportieren" label_selected="Teleportieren" name="Teleport"
              tool_tip="Zu ausgewählter Position teleportieren" />
-        <!--button label="Ziel anzeigen" label_selected="Ziel anzeigen" name="Show Destination"
-             tool_tip="Karte auf ausgewählte Position zentrieren" /-->
-        <button label="Gesuchte Position" label_selected="Ziel anzeigen" name="Show Destination"
+        <button label="Gesuchte Position" label_selected="Ziel anzeigen"
+             name="Show Destination"
              tool_tip="Karte auf ausgewählte Position zentrieren" />
         <button label="Löschen" label_selected="Löschen" name="Clear"
              tool_tip="Verfolgung abschalten" />
-        <!--button label="Meinen Standort anzeigen" label_selected="Wo bin ich?"
-             name="Show My Location"
-             tool_tip="Karte auf Position Ihres Avatars zentrieren" /-->
-        <button label="Meine Position" label_selected="Wo bin ich?"
-             name="Show My Location"
+        <button label="Meine Position" label_selected="Wo bin ich?" name="Show My Location"
              tool_tip="Karte auf Position Ihres Avatars zentrieren" />
-        <button label="SLURL in die Zwischenablage kopieren" name="copy_slurl" font="SansSerifSmall"
+        <button font="SansSerifSmall" label="SLURL in die Zwischenablage kopieren"
+             name="copy_slurl"
              tool_tip="Kopiert die aktuelle Position als SLURL zur Verwendung im Web." />
         <slider label="Zoom" name="zoom slider" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/de/need_to_long.xml b/linden/indra/newview/skins/xui/de/need_to_long.xml
index 75c8400..2e38d5f 100644
--- a/linden/indra/newview/skins/xui/de/need_to_long.xml
+++ b/linden/indra/newview/skins/xui/de/need_to_long.xml
@@ -1,117 +1,95 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 

 <strings>

-<string><a_file>floater_about.xml</a_file>

-<b_path>/floater_about/credits_editor</b_path>

+<string><a_file>alerts.xml</a_file>

+<b_path>//GraphicsPreferencesHelp/message</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Tofu, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks,  Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall and many others.

+                        This panel controls window size and resolution and the quality of the client&apos;s graphics.  The graphics preferences interface allows you to choose between four graphics levels: Low, Mid, High, and Ultra. One may customize their graphics settings by checking the Custom checkbox and manipulating the following settings:

 

-Thank you to the following residents for helping to ensure that this is the best version yet: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf

+Shaders: Enable or disable various types of pixel shaders. 

 

-APR Copyright (C) 2000-2004 The Apache Software Foundation

-cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)

-expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.

-FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).

-GL Copyright (C) 1999-2004 Brian Paul.

-Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.

-jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)

-jpeglib Copyright (C) 1991-1998, Thomas G. Lane.

-ogg/vorbis Copyright (C) 2001, Xiphophorus

-OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.

-SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga

-SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

-xmlrpc-epi Copyright (C) 2000 Epinions, Inc.

-zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.

+Reflection Detail: Sets the types of objects that water can reflect.

 

-All rights reserved.  See licenses.txt for details.

+Avatar Rendering: Sets options that affect how the client renders avatars.

 

-Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)

+Draw Distance: Affects how far out from your viewpoint objects will be rendered in the scene.

 

+Max Particle Count: Sets the maximum number of particles you are able to see on your screen at once.

 

-Happiness is a warm puppy. -- Charles M. Schulz

-        </d_old>

+Post Process Quality: Sets the resolution with which Glow is rendered. 

+

+Mesh Detail: Sets the amout of detail used in rendering certain objects.

+

+Lighting Detail: Selects what types of lights you would like to render.

+

+Terrain Detail: Sets the amount of terrain detail you would like to see. 

+

+Sky Detail: Sets the amount of tesselation of the sky dome.  A higher value takes longer to render, but makes the sun look more rounded.

+                </d_old>

 <e_new>

-  Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Tofu, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks,  Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall and many others.

+                        This panel controls window size and resolution and the quality of the client&apos;s graphics.  The Preferences &gt; Graphics interface allows you to choose between four graphics levels: Low, Mid, High, and Ultra. You may also customize your graphics settings by checking the Custom checkbox and manipulating the following settings:

+

+Shaders: Enable or disable various types of pixel shaders. 

+

+Reflection Detail: Sets the types of objects that water can reflect.

+

+Avatar Rendering: Sets options that affect how the client renders avatars.

 

-  Thank you to the following residents for helping to ensure that this is the best version yet: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf

+Draw Distance: Affects how far out from your viewpoint objects will be rendered in the scene.

 

-  3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion

-  APR Copyright (C) 2000-2004 The Apache Software Foundation

-  cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)

-  expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.

-  FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).

-  GL Copyright (C) 1999-2004 Brian Paul.

-  Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.

-  jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)

-  jpeglib Copyright (C) 1991-1998, Thomas G. Lane.

-  ogg/vorbis Copyright (C) 2001, Xiphophorus

-  OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.

-  SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga

-  SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

-  xmlrpc-epi Copyright (C) 2000 Epinions, Inc.

-  zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.

+Max Particle Count: Sets the maximum number of particles you are able to see on your screen at once.

 

-  All rights reserved.  See licenses.txt for details.

+Post Process Quality: Sets the resolution with which Glow is rendered. 

 

-  Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)

+Mesh Detail: Sets the amount of detail or number of triangles used in rendering certain objects. A higher value takes longer to render, but makes these objects appear with more detail.

 

+Lighting Detail: Selects what types of lights you would like to render.

 

-  Happiness is a warm puppy. -- Charles M. Schulz</e_new>

+Terrain Detail: Sets the amount of detail you would like to see for the terrain texture. 

+                </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-  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, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks,  Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall und vielen anderen.

+                        Die Optionen in diesem Dialog steuern Fenstergröße und Auflösung sowie die Qualität der Grafikdarstellung im Client.  Im Fenster &apos;Einstellungen&apos; &gt; &apos;Grafik&apos; stehen vier Grafikeinstellungen zur Wahl: Niedrig, Mittel, Hoch und Ultra. Die Grafikeinstellungen lassen sich auch individuell anpassen; aktivieren Sie das Kontrollkästchen &apos;Benutzerdefiniert&apos;, um die folgenden Einstellungen zu bearbeiten:

 

-  Vielen Dank den folgenden Einwohnern, die uns geholfen haben, dies zur bisher besten Version zu machen: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf

+Shader: Aktivieren oder deaktivieren Sie die verschiedenen Pixel-Shader. 

 

-  3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion

-  APR Copyright (C) 2000-2004 The Apache Software Foundation

-  cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)

-  expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.

-  FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).

-  GL Copyright (C) 1999-2004 Brian Paul.

-  Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.

-  jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)

-  jpeglib Copyright (C) 1991-1998, Thomas G. Lane.

-  ogg/vorbis Copyright (C) 2001, Xiphophorus

-  OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.

-  SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga

-  SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

-  xmlrpc-epi Copyright (C) 2000 Epinions, Inc.

-  zlib Copyright (C) 1995-2002 Jean-loup Gailly und Mark Adler.

+Spiegelung: Legen Sie hier fest, welche Objekte sich in Wasser spiegeln.

 

-  Alle Rechte vorbehalten.  Details siehe licenses.txt.

+Avatar-Darstellung: Einige Optionen, die über die Darstellung Ihres Avatars bestimmen.

 

-  Voice-Chat-Audiocoding: Polycom(R) Siren14(TM) (ITU-T Empf. G.722.1 Anhang C)

+Sichtweite: Legt fest, bis zu welcher Entfernung von Ihrem Avatar die Objekte in der Szene berechnet und dargestellt werden.

 

+Max. Partikelzahl: Legt fest, wie viele Partikel gleichzeitig berechnet und angezeigt werden.

 

-  Happiness is a warm puppy. -- Charles M. Schulz</f_translation>

+Post-Processing-Qualität: Legt fest, mit welcher Auflösung der Glüheffekt berechnet wird. 

+

+Gitterdetails: Legt den Detailgrad bzw. die Anzahl an Dreiecken bei der Berechnung bestimmter Objekte fest. Höhere Werte führen zu einer genaueren Darstellung, dauern aber länger in der Berechnung.

+

+Beleuchtungsdetails: Legt fest, welche Lichtquellen berechnet werden.

+

+Terraindetails: Legt den Detailgrad bei der Berechnung der Terraintextur fest. 

+                </f_translation>

 <f_old_trans>

-                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, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks,  Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall und vielen anderen.

+                        Die Optionen in diesem Dialog steuern Fenstergröße und Auflösung sowie die Qualität der Grafikdarstellung auf dem Client. Vier grundlegende Grafikeinstellungen stehen zur Wahl: Niedrig, Mittel, Hoch und Ultra. Wenn Sie das Kontrollkästchen &quot;Benutzerdefiniert&quot; anklicken, können Sie folgende Grafikeinstellungen selbst vornehmen:

+

+Shader: Aktivieren oder deaktivieren Sie die verschiedenen Pixel-Shader. 

+

+Spiegelung: Legen Sie hier fest, welche Objekte sich in Wasser spiegeln.

+

+Avatar-Darstellung: Einige Optionen, die über die Darstellung Ihres Avatars bestimmen.

 

-Vielen Dank den folgenden Einwohnern, die uns geholfen haben, dies zur bisher besten Version zu machen: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf

+Sichtweite: Legt fest, bis zu welcher Entfernung von Ihrem Avatar die Objekte in der Szene berechnet und dargestellt werden.

 

-APR Copyright (C) 2000-2004 The Apache Software Foundation

-cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)

-expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.

-FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).

-GL Copyright (C) 1999-2004 Brian Paul.

-Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.

-jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)

-jpeglib Copyright (C) 1991-1998, Thomas G. Lane.

-ogg/vorbis Copyright (C) 2001, Xiphophorus

-OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.

-SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga

-SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

-xmlrpc-epi Copyright (C) 2000 Epinions, Inc.

-zlib Copyright (C) 1995-2002 Jean-loup Gailly und Mark Adler.

+Max. Partikelzahl: Legt fest, wie viele Partikel gleichzeitig berechnet und angezeigt werden.

 

-Alle Rechte vorbehalten.  Details siehe licenses.txt.

+Post-Processing-Qualität: Legt fest, mit welcher Auflösung der Glüheffekt berechnet wird. 

 

-Voice-Chat-Audiocoding: Polycom(R) Siren14(TM) (ITU-T Empf. G.722.1 Anhang C)

+Gitterdetails: Legt den Detailgrad bei der Berechnung bestimmter Objekte fest.

 

+Beleuchtungsdetails: Legt fest, welche Lichtquellen berechnet werden.

 

-Happiness is a warm puppy. -- Charles M. Schulz

-        </f_old_trans>

+Terraindetails: Legt den Detailgrad bei der Berechnung des Terrains fest. 

+                </f_old_trans>

 </string>

 </strings>

diff --git a/linden/indra/newview/skins/xui/de/need_to_translate.xml b/linden/indra/newview/skins/xui/de/need_to_translate.xml
index b6a0ccf..bd9d2f2 100644
--- a/linden/indra/newview/skins/xui/de/need_to_translate.xml
+++ b/linden/indra/newview/skins/xui/de/need_to_translate.xml
@@ -2,2134 +2,1429 @@
 

 <strings>

 <string><a_file>alerts.xml</a_file>

-<b_path>//TutorialNotFound/message</b_path>

+<b_path>//UnsupportedHardware/ignore</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        No tutorial is currently available.

+                        Ignore unsupported hardware

                 </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        Derzeit ist kein Tutorial verfügbar.

-                </f_translation>

+                        Nicht unterstützte Hardware ignorieren

+                </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//TutorialNotFound/OK</b_path>

+<b_path>//UnknownGPU/message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        OK

+Your system contains a graphics card that is unknown to us at this time.  

+This is often the case with new hardware we haven&apos;t had a chance to 

+test.  Second Life will most likely run properly, but you may need to 

+adjust your graphics settings to something more appropriate.

+(Edit &gt; Preferences &gt; Graphics).

                 </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        OK

-                </f_translation>

+Ihr System verwendet eine uns zurzeit unbekannte Grafikkarte.  

+Dies ist häufig der Fall bei neuer Hardware, die wir noch nicht testen konnten. 

+Second Life funktioniert aller Voraussicht nach normal, möglicherweise 

+müssen Sie aber die Grafikeinstellungen anpassen.

+(Bearbeiten &gt; Einstellungen &gt; Grafik).

+                </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//FreezeAvatarFullname/message</b_path>

+<b_path>//UnknownGPU/ignore</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Freeze [AVATAR_NAME]?

-He or she will temporarily be unable to move,

-chat, or interact with the world.

+                        Ignore unknown graphics card

                 </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        [AVATAR_NAME] einfrieren?

-Der Avatar wird außer Gefecht gesetzt und kann

-sich nicht mehr bewegen, chatten oder mit der Welt interagieren.

+                        Unbekannte Grafikkarte ignorieren

                 </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//FreezeAvatarFullname/Freeze</b_path>

+<b_path>//ClothingLoading/ignore</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Freeze

+                        When clothing is taking a long time to download

                 </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        Einfrieren

-                </f_translation>

+                        Wenn das Herunterladen von Kleidung lange dauert

+                </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//FreezeAvatarFullname/Unfreeze</b_path>

+<b_path>//SetClassifiedMature/message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Unfreeze

-                </e_new>

+Does this classified contain Mature content?

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        Auftauen

-                </f_translation>

+Enthält diese Anzeige nicht jugendfreie Inhalte?

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//FreezeAvatarFullname/Cancel</b_path>

+<b_path>//SetClassifiedMature/Mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Cancel

-                </e_new>

+      Yes

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        Abbrechen

-                </f_translation>

+      Ja

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//EjectAvatarFullname/message</b_path>

+<b_path>//SetClassifiedMature/Not Mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Eject [AVATAR_NAME] from your land?

-                </e_new>

+      No

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        [AVATAR_NAME] von Ihrem Land werfen?

-                </f_translation>

+      Nein

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//EjectAvatarFullname/Eject</b_path>

+<b_path>//SetClassifiedMature/Cancel</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Eject

-                </e_new>

+      Cancel

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        Ausschließen

-                </f_translation>

+      Abbrechen

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//EjectAvatarFullname/EjectandBan</b_path>

+<b_path>//SetGroupMature/message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Eject and Ban

-                </e_new>

+Does this group contain Mature content?

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        Ausschließen und Verbannen

-                </f_translation>

+Beschäftigt sich diese Gruppe mit nicht jugendfreien Inhalten?

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//EjectAvatarFullname/Cancel</b_path>

+<b_path>//SetGroupMature/Mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Cancel

-                </e_new>

+      Yes

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        Abbrechen

-                </f_translation>

+      Ja

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//SeachFilteredOnShortWords/message</b_path>

+<b_path>//SetGroupMature/Not Mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-Your search query was modified and the 

-words that were too short were removed.

-

-Searched for: [FINALQUERY]

-                </e_new>

+      No

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-Ihre Suchanfrage wurde geändert. 

-Zu kurze Begriffe wurden entfernt.

-

-Ihre Suchanfrage: [FINALQUERY]

-                </f_translation>

+      Nein

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//SeachFilteredOnShortWordsEmpty/message</b_path>

+<b_path>//SetGroupMature/Cancel</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-Your search terms were too short

-so no search was performed.

-                </e_new>

+      Cancel

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-Ihre Suchbegriffe sind zu kurz.

-Es wurde keine Suche durchgeführt.

-                </f_translation>

+      Abbrechen

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotCloseFloaterBuyLand/message</b_path>

+<b_path>//MissingString/message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        You cannot close the Buy Land window until Second Life

-estimates the price of this transaction.

+                        The string [STRING_NAME] is missing from strings.xml

                 </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        Das Fenster &apos;Land kaufen&apos; kann erst geschlossen werden,

-nachdem Second Life den Transaktionspreis geschätzt hat.

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//MaxAgentOnRegionBatch/message</b_path>

-<c_attribute></c_attribute>

+                        Der String [STRING_NAME] fehlt in strings.xml

+                </f_translation>

+</string><string><a_file>floater_active_speakers.xml</a_file>

+<b_path>/active_speakers/active_speakers_panel/speakers_list/speaking_status</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>

-                        Failure while attempting to add [NUM_ADDED] agents:

-Exceeds the [MAX_AGENTS] [LIST_TYPE] limit by [NUM_EXCESS].

-                </e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Fehler beim Versuch, [NUM_ADDED] Agenten hinzuzufügen:

-Überschreitet den Grenzwert [MAX_AGENTS] [LIST_TYPE] um [NUM_EXCESS].

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WebLaunchExternalTarget/message</b_path>

-<c_attribute></c_attribute>

+<f_translation></f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/showcase_panel</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>

-                        Open your system Web browser to view this content?

-                </e_new>

+<e_new>Showcase</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Den System-Webbrowser öffnen, um diesen Inhalt anzuzeigen?

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WebLaunchExternalTarget/ignore</b_path>

+<f_translation>Showcase</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/showcase_panel/searching_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        When opening your system browser to view a Web page

-                </e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Wenn der System-Webbrowser zur Anzeige einer Webseite geöffnet wird

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WebLaunchExternalTarget/Open</b_path>

+<f_translation>Suchen...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/showcase_panel/not_found_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        OK

-                </e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        OK

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WebLaunchExternalTarget/Cancel</b_path>

-<c_attribute></c_attribute>

+<f_translation>Nicht gefunden.</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/showcase_panel/back_btn</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>

-                        Cancel

-                </e_new>

+<e_new>Back</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Abbrechen

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ProblemAddingEstateGeneric/message</b_path>

-<c_attribute></c_attribute>

+<f_translation>Zurück</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/showcase_panel/forward_btn</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>

-                        Problems adding to this estate list.  One or more estates may have a full list.

-                </e_new>

+<e_new>Forward</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Problem beim Hinzufügen zu dieser Grundstücksliste.  Bei mindestens einem Grundstück ist die Liste voll.

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ReplaceAttachment/ignore</b_path>

+<f_translation>Weiter</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/showcase_panel/loading_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        When replacing existing attachments

-                </e_new>

+<e_new>Loading...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Beim Wechseln von Anhängen

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//BusyModePay/ignore</b_path>

+<f_translation>Wird geladen...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/showcase_panel/done_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        When paying a person or object in busy mode

-                </e_new>

+<e_new>Done</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Beim Bezahlen einer Person oder eines Objekts im Beschäftigt-Modus

-                </f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_objects_panel/owner list/type</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Type</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Typ</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_objects_panel/owner list/name</b_path>

+<f_translation>Fertig</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/back_btn</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Name</e_new>

+<e_new>Back</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Name</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_objects_panel/owner list/count</b_path>

+<f_translation>Zurück</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/forward_btn</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Count</e_new>

+<e_new>Forward</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Zählen</f_translation>

-</string><string><a_file>floater_active_speakers.xml</a_file>

-<b_path>/active_speakers/active_speakers_panel/speakers_list/speaking_status</b_path>

+<f_translation>Weiter</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/search_editor</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_avatar_textures.xml</a_file>

-<b_path>/avatar_texture_debug/baked_label</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                Baked Textures

-        </e_new>

+<e_new>Search</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Gebackene Texturen

-        </f_translation>

-</string><string><a_file>floater_avatar_textures.xml</a_file>

-<b_path>/avatar_texture_debug/composite_label</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                Composite Textures

-        </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                Zusammengesetzte Texturen

-        </f_translation>

-</string><string><a_file>floater_buy_currency.xml</a_file>

-<b_path>/buy currency/getting_data</b_path>

-<c_attribute></c_attribute>

+<f_translation>Suchen</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/search_editor</b_path>

+<c_attribute>tool_tip</c_attribute>

 <d_old></d_old>

-<e_new>

-                Getting data...

-        </e_new>

+<e_new>Search Second Life</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Daten werden geladen...

-        </f_translation>

-</string><string><a_file>floater_camera.xml</a_file>

-<b_path>/move floater</b_path>

-<c_attribute>title</c_attribute>

+<f_translation>Second Life durchsuchen</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/search_btn</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Search</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_camera.xml</a_file>

-<b_path>/move floater/rotate_tooltip</b_path>

-<c_attribute></c_attribute>

+<f_translation>Suchen</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/mature_check</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Rotate Camera Around Focus</e_new>

+<e_new>Include Mature content</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Kamera um Fokus drehen</f_translation>

-</string><string><a_file>floater_camera.xml</a_file>

-<b_path>/move floater/zoom_tooltip</b_path>

+<f_translation>Ab-18-Inhalte einschließen</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/loading_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Zoom Camera Towards Focus</e_new>

+<e_new>Loading...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Kamera auf Fokus zoomen</f_translation>

-</string><string><a_file>floater_camera.xml</a_file>

-<b_path>/move floater/move_tooltip</b_path>

+<f_translation>Wird geladen...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/done_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Move Camera Up and Down, Left and Right</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Kamera nach oben, unten, links und rechts bewegen</f_translation>

-</string><string><a_file>floater_chatterbox.xml</a_file>

-<b_path>/floater_chatterbox</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Communicate</e_new>

+<e_new>Done</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Unterhalten</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/IM_logging_string</b_path>

+<f_translation>Fertig</f_translation>

+</string><string><a_file>floater_im.xml</a_file>

+<b_path>/im_floater/muted_message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                -- Instant message logging enabled --

+                [FIRST] [LAST] is muted.

         </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                -- Instant-Message-Protokoll aktiviert --

+                [FIRST] [LAST] ist stummgeschaltet.

         </f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/IM_end_log_string</b_path>

+</string><string><a_file>notify.xml</a_file>

+<b_path>//AutoUnmuteByIM/message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                -- End of Log --

-        </e_new>

+                        [FIRST] [LAST] was sent an instant message and has been automatically unmuted.

+                </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                -- Ende des Protokolls --

-        </f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/Gesture</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Gestures</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Gesten</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/Gesture/Gestures</b_path>

+                        [FIRST] [LAST] hat eine Instant Message erhalten; die Stummschaltung wurde aufgehoben.

+                </f_translation>

+</string><string><a_file>notify.xml</a_file>

+<b_path>//AutoUnmuteByMoney/message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                                        Gestures

-                                </e_new>

+                        [FIRST] [LAST] was given money and has been automatically unmuted.

+                </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                                        Gesten

-                                </f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/show mutes</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Show Muted Text</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Stummgeschalteten Text anzeigen</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/toggle_active_speakers_btn</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>&lt; &lt;</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>&lt; &lt;</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/toggle_active_speakers_btn</b_path>

-<c_attribute>label_selected</c_attribute>

-<d_old></d_old>

-<e_new>&gt; &gt;</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>&gt; &gt;</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/toggle_active_speakers_btn</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>Click here to show list of active participants in this IM session.</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Klicken Sie hier, um eine Liste der aktiven Teilnehmer an dieser IM-Sitzung anzuzeigen.</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/chat_panel/Chat Editor</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Click here to chat.</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Zum Chatten hier klicken.</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/chat_panel/Say</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Say</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Sprechen</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/chat_panel/Say</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>(Enter)</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>(Eingabe)</f_translation>

-</string><string><a_file>floater_critical.xml</a_file>

-<b_path>/modal container/tos_title</b_path>

+                        [FIRST] [LAST] hat Geld erhalten; die Stummschaltung wurde aufgehoben.

+                </f_translation>

+</string><string><a_file>notify.xml</a_file>

+<b_path>//AutoUnmuteByInventory/message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-    Critical Message

-  </e_new>

+                        [FIRST] [LAST] was offered inventory and has been automatically unmuted.

+                </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-    Kritische Nachricht

-  </f_translation>

-</string><string><a_file>floater_customize.xml</a_file>

-<b_path>/floater customize/customize tab container/body_parts_placeholder</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Body Parts</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Körperteile</f_translation>

-</string><string><a_file>floater_customize.xml</a_file>

-<b_path>/floater customize/customize tab container/clothes_placeholder</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Clothes</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Kleidung</f_translation>

-</string><string><a_file>floater_day_cycle_options.xml</a_file>

-<b_path>/Day Cycle Floater/Day Cycle Tabs/Day Cycle/WLTimeSlider</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_day_cycle_options.xml</a_file>

-<b_path>/Day Cycle Floater/Day Cycle Tabs/Day Cycle/WLDayCycleKeys</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_device_settings.xml</a_file>

-<b_path>/floater_device_settings</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Voice Chat Device Settings</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Geräte-Einstellungen für Voice-Chat</f_translation>

-</string><string><a_file>floater_directory.xml</a_file>

-<b_path>/directory/Directory Tabs/find_all_old_panel/results/icon</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_env_settings.xml</a_file>

-<b_path>/Environment Editor Floater/EnvTimeSlider</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_env_settings.xml</a_file>

-<b_path>/Environment Editor Floater/EnvCloudSlider</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_env_settings.xml</a_file>

-<b_path>/Environment Editor Floater/EnvWaterFogSlider</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_hardware_settings.xml</a_file>

-<b_path>/Hardware Settings Floater/Antialiasing:</b_path>

+                        [FIRST] [LAST] wurde ein Inventarobjekt angeboten; die Stummschaltung wurde aufgehoben.

+                </f_translation>

+</string><string><a_file>panel_avatar_classified.xml</a_file>

+<b_path>/Classified/classified_mature_check/select_mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-    Antialiasing:

-  </e_new>

+      - Select Mature -

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-    Antialiasing:

-  </f_translation>

-</string><string><a_file>floater_hardware_settings.xml</a_file>

-<b_path>/Hardware Settings Floater/fsaa</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Antialiasing</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Antialiasing</f_translation>

-</string><string><a_file>floater_hardware_settings.xml</a_file>

-<b_path>/Hardware Settings Floater/fsaa/FSAADisabled</b_path>

+      - Jugendfreigabe wählen -

+    </f_translation>

+</string><string><a_file>panel_avatar_classified.xml</a_file>

+<b_path>/Classified/classified_mature_check/mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-      Disabled

+      Mature Content

     </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-      Deaktiviert

+      Ab-18-Inhalt

     </f_translation>

-</string><string><a_file>floater_hardware_settings.xml</a_file>

-<b_path>/Hardware Settings Floater/fsaa/2x</b_path>

+</string><string><a_file>panel_avatar_classified.xml</a_file>

+<b_path>/Classified/classified_mature_check/not_mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-      2x

+      Not Mature Content

     </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-      2x

+      Jugendfreier Inhalt

     </f_translation>

-</string><string><a_file>floater_hardware_settings.xml</a_file>

-<b_path>/Hardware Settings Floater/fsaa/4x</b_path>

+</string><string><a_file>panel_classified.xml</a_file>

+<b_path>/Classified/classified_mature_check/select_mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-      4x

+      - Select Mature -

     </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-      4x

+      - Jugendfreigabe wählen -

     </f_translation>

-</string><string><a_file>floater_hardware_settings.xml</a_file>

-<b_path>/Hardware Settings Floater/fsaa/8x</b_path>

+</string><string><a_file>panel_classified.xml</a_file>

+<b_path>/Classified/classified_mature_check/mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-      8x

+      Mature Content

     </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-      8x

+      Ab-18-Inhalt

     </f_translation>

-</string><string><a_file>floater_hardware_settings.xml</a_file>

-<b_path>/Hardware Settings Floater/fsaa/16x</b_path>

+</string><string><a_file>panel_classified.xml</a_file>

+<b_path>/Classified/classified_mature_check/not_mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-      16x

+      Not Mature Content

     </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-      16x

+      Jugendfreier Inhalt

     </f_translation>

-</string><string><a_file>floater_hud.xml</a_file>

-<b_path>/floater_hud</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Tutorial</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Tutorial</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Joystick Configuration</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Joystick-Konfiguration</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickAxis1</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>X Axis Mapping</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>X-Achse</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickAxis2</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Y Axis Mapping</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Y-Achse</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickAxis0</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Z Axis Mapping</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Z-Achse</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickAxis4</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Pitch Mapping</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Neigungswinkel</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickAxis5</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Yaw Mapping</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Gierwinkel</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickAxis3</b_path>

+</string><string><a_file>panel_groups.xml</a_file>

+<b_path>/groups/group list/name</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Roll Mapping</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Rollwinkel</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickAxis6</b_path>

-<c_attribute>label</c_attribute>

+<f_translation></f_translation>

+</string><string><a_file>panel_group_general.xml</a_file>

+<b_path>/general_tab/preferences_container/group_mature_check</b_path>

+<c_attribute>tool_tip</c_attribute>

 <d_old></d_old>

-<e_new>Zoom Mapping</e_new>

+<e_new>Sets whether your group information is considered mature.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Zoom</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/ZoomDirect</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Festlegen, ob die Informationen Ihrer Gruppe nicht jugendfrei sind.</f_translation>

+</string><string><a_file>panel_group_general.xml</a_file>

+<b_path>/general_tab/preferences_container/group_mature_check/select_mature</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Direct Zoom</e_new>

+<e_new>

+                        - Select Mature -

+                        </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Direkt-Zoom</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/Cursor3D</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>

+                        - Jugendfreigabe wählen -

+                        </f_translation>

+</string><string><a_file>panel_group_general.xml</a_file>

+<b_path>/general_tab/preferences_container/group_mature_check/mature</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>3D Cursor</e_new>

+<e_new>

+                        Mature Content

+                        </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>3D-Cursor</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/AutoLeveling</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>

+                        Ab-18-Inhalt

+                        </f_translation>

+</string><string><a_file>panel_group_general.xml</a_file>

+<b_path>/general_tab/preferences_container/group_mature_check/not_mature</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Auto Level</e_new>

+<e_new>

+                        Not Mature Content

+                        </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Automatisch ausrichten</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/Control Modes:</b_path>

+<f_translation>

+                        Jugendfreier Inhalt

+                        </f_translation>

+</string><string><a_file>panel_preferences_graphics1.xml</a_file>

+<b_path>/Display panel/WindowSizeLabel</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                Control Modes:

+                Window Size:

         </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                Steuermodi:

-        </f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/XScale</b_path>

+                Fenstergröße:

+        </f_translation>

+</string><string><a_file>panel_preferences_graphics1.xml</a_file>

+<b_path>/Display panel/windowsize combo/640x480</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>X Scale</e_new>

+<e_new>

+                        640x480

+                </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>X-Skala </f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/YScale</b_path>

+<f_translation>

+                        640x480

+                </f_translation>

+</string><string><a_file>panel_preferences_graphics1.xml</a_file>

+<b_path>/Display panel/windowsize combo/800x600</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Y Scale</e_new>

+<e_new>

+                        800x600 

+                </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Y-Skala</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/ZScale</b_path>

+<f_translation>

+                        800x600 

+                </f_translation>

+</string><string><a_file>panel_preferences_graphics1.xml</a_file>

+<b_path>/Display panel/windowsize combo/720x480</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Z Scale</e_new>

+<e_new>

+                        720x480 (NTSC)

+                </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Z-Skala</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/PitchScale</b_path>

+<f_translation>

+                        720x480 (NTSC)

+                </f_translation>

+</string><string><a_file>panel_preferences_graphics1.xml</a_file>

+<b_path>/Display panel/windowsize combo/768x576</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Pitch Scale</e_new>

+<e_new>

+                        768x576 (PAL)

+                </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Neigungsskala</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/YawScale</b_path>

+<f_translation>

+                        768x576 (PAL)

+                </f_translation>

+</string><string><a_file>panel_preferences_graphics1.xml</a_file>

+<b_path>/Display panel/windowsize combo/1024x768</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Yaw Scale</e_new>

+<e_new>

+                        1024x768

+                </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Gierskala</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/RollScale</b_path>

-<c_attribute></c_attribute>

+<f_translation>

+                        1024x768

+                </f_translation>

+</string><string><a_file>panel_preferences_graphics1.xml</a_file>

+<b_path>/Display panel/QualityPerformanceSelection</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Roll Scale</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Rollskala</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/XDeadZone</b_path>

-<c_attribute></c_attribute>

+<f_translation></f_translation>

+</string><string><a_file>panel_preferences_web.xml</a_file>

+<b_path>/web/use_external_browser/internal</b_path>

+<c_attribute>tool_tip</c_attribute>

 <d_old></d_old>

-<e_new>X Dead Zone</e_new>

+<e_new>Use the built-in web browser for help, web links, etc. This browser opens as a new window inside Second Life.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>X-Totzone </f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/YDeadZone</b_path>

+<f_translation>Den integrierten Browser zur Suche im Internet verwenden. Der Browser wird als eigenständiges Fenster in Second Life geöffnet.</f_translation>

+</string><string><a_file>panel_region_general.xml</a_file>

+<b_path>/General/version_channel_text_lbl</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Y Dead Zone</e_new>

+<e_new>

+                Version: 

+        </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Y-Totzone</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/ZDeadZone</b_path>

+<f_translation>

+                Version: 

+        </f_translation>

+</string><string><a_file>panel_region_general.xml</a_file>

+<b_path>/General/version_channel_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Z Dead Zone</e_new>

+<e_new>

+                unknown

+        </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Z-Totzone</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/PitchDeadZone</b_path>

+<f_translation>

+                unbekannt

+        </f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginInProgress</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Pitch Dead Zone</e_new>

+<e_new>Logging in. [APP_NAME] may appear frozen.  Please wait.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Neigen-Totzone</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/YawDeadZone</b_path>

+<f_translation>Anmeldevorgang gestartet. [APP_NAME] reagiert möglicherweise nicht.  Bitte warten.</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginAuthenticating</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Yaw Dead Zone</e_new>

+<e_new>Authenticating</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Gieren-Totzone</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/RollDeadZone</b_path>

+<f_translation>Authentifizierung</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginMaintenance</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Roll Dead Zone</e_new>

+<e_new>Performing account maintenance...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Rollen-Totzone</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/Feathering</b_path>

+<f_translation>Account wird aktualisiert...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginAttempt</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Feathering</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Auslaufen</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/AvatarFeathering</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

+<e_new>Previous login attempt failed. Logging in, attempt [NUMBER]</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/BuildFeathering</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/FlycamFeathering</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/ZoomScale2</b_path>

+<f_translation>Ein früherer Anmeldeversuch ist fehlgeschlagen. Anmeldung, Versuch [NUMBER]</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginPrecaching</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Zoom Scale</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Zoom-Skala</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/FlycamAxisScale6</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

+<e_new>Loading world...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/ZoomDeadZone</b_path>

+<f_translation>Welt wird geladen...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginInitializingBrowser</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Zoom Dead Zone</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Zoom-Totzone</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/FlycamAxisDeadZone6</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/SpaceNavigatorDefaults</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>SpaceNavigator Defaults</e_new>

+<e_new>Initializing embedded web browser...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>SpaceNavigator-Standards</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickMonitor</b_path>

+<f_translation>Integrierter Webbrowser wird initialisiert...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginVerifyingCache</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Joystick Monitor</e_new>

+<e_new>Verifying cache files (can take 60-90 seconds)...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Joystick-Monitor</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/Axis</b_path>

+<f_translation>Cache-Dateien werden überprüft (dauert 60-90 Sekunden)...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginProcessingResponse</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Axis [NUM]</e_new>

+<e_new>Processing Response...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Achse [NUM]</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/NoDevice</b_path>

+<f_translation>Antwort wird verarbeitet...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginInitializingWorld</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>no device detected</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Kein Gerät erkannt</f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiColorFilterPanel/wmiColorFilterBrightness</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiColorFilterPanel/wmiColorFilterSaturation</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiColorFilterPanel/wmiColorFilterContrast</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiNightVisionPanel/wmiNightVisionBrightMult</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiNightVisionPanel/wmiNightVisionNoiseSize</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiNightVisionPanel/wmiNightVisionNoiseStrength</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiBloomPanel/wmiBloomExtract</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiBloomPanel/wmiBloomSize</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiBloomPanel/wmiBloomStrength</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

+<e_new>Initializing World...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_preview_classified.xml</a_file>

-<b_path>/classified_preview</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Classified Information</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Vertrauliche Informationen</f_translation>

-</string><string><a_file>floater_preview_event.xml</a_file>

-<b_path>/event_preview</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Event Information</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Event-Informationen</f_translation>

-</string><string><a_file>floater_preview_gesture.xml</a_file>

-<b_path>/gesture_preview/library_label</b_path>

+<f_translation>Welt wird initialisiert...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginDecodingImages</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Library:

-        </e_new>

+<e_new>Decoding images...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Bibliothek:

-        </f_translation>

-</string><string><a_file>floater_preview_gesture.xml</a_file>

-<b_path>/gesture_preview/steps_label</b_path>

+<f_translation>Bilder werden entpackt...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginInitializingQuicktime</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Steps:

-        </e_new>

+<e_new>Initializing QuickTime...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Schritte:

-        </f_translation>

-</string><string><a_file>floater_preview_gesture.xml</a_file>

-<b_path>/gesture_preview/animation_trigger_type/start</b_path>

+<f_translation>QuickTime wird initialisiert...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginQuicktimeNotFound</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Start

-                </e_new>

+<e_new>QuickTime not found - unable to initialize.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Start

-                </f_translation>

-</string><string><a_file>floater_preview_gesture.xml</a_file>

-<b_path>/gesture_preview/animation_trigger_type/stop</b_path>

+<f_translation>QuickTime nicht gefunden - Initialisierung nicht möglich.</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginQuicktimeOK</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Stop

-                </e_new>

+<e_new>QuickTime initialized successfully.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Stopp

-                </f_translation>

-</string><string><a_file>floater_preview_notecard_keep_discard.xml</a_file>

-<b_path>/preview_notecard/not_allowed</b_path>

+<f_translation>QuickTime wurde initialisiert.</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginWaitingForRegionHandshake</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>You are not allowed to view this note.</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Sie können diese Notiz nicht anzeigen.</f_translation>

-</string><string><a_file>floater_preview_url.xml</a_file>

-<b_path>/url_preview</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Place Information</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Ortsinformationen</f_translation>

-</string><string><a_file>floater_region_info.xml</a_file>

-<b_path>/regioninfo</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Region/Estate</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Region/Grundstück</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolCube</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>Cube</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Würfel</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolPrism</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>Prism</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Prisma</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolPyramid</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>Pyramid</e_new>

+<e_new>Waiting for region handshake...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Pyramide</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolTetrahedron</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>Region-Handshake...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginConnectingToRegion</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Tetrahedron</e_new>

+<e_new>Connecting to region...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Tetraeder</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolCylinder</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>Region-Verbindung...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginDownloadingClothing</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Cylinder</e_new>

+<e_new>Downloading clothing...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Zylinder</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolHemiCylinder</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>Kleidung wird geladen...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipPerson</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Hemicylinder</e_new>

+<e_new>Person</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Halbzylinder</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolCone</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>Person</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipNoName</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Cone</e_new>

+<e_new>(no name)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Kegel</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolHemiCone</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>(namenlos)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipOwner</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Hemicone</e_new>

+<e_new>Owner:</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Halbkegel</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolSphere</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>Eigentümer:</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipPublic</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Sphere</e_new>

+<e_new>Public</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Kugel</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolHemiSphere</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>Öffentlich</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipIsGroup</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Hemisphere</e_new>

+<e_new>(Group)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Halbkugel</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolTorus</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>(Gruppe)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagScript</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Torus</e_new>

+<e_new>Script</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Torus</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolTube</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>Skript</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagPhysics</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Tube</e_new>

+<e_new>Physics</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Rohr</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolRing</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>Physik</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagTouch</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Ring</e_new>

+<e_new>Touch</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Ring</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolTree</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>Berühren</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagL$</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Tree</e_new>

+<e_new>L$</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Baum</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolGrass</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>L$</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagDropInventory</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Grass</e_new>

+<e_new>Drop Inventory</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Gras</f_translation>

-</string><string><a_file>menu_viewer.xml</a_file>

-<b_path>/Main Menu/View/Joystick Flycam</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Inventar fallen lassen</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagPhantom</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Joystick Flycam</e_new>

+<e_new>Phantom</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Joystick-Flycam</f_translation>

-</string><string><a_file>menu_viewer.xml</a_file>

-<b_path>/Main Menu/Help/Tutorial</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Phantom</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagTemporary</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Tutorial</e_new>

+<e_new>Temporary</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Tutorial</f_translation>

-</string><string><a_file>menu_viewer.xml</a_file>

-<b_path>/Main Menu/Help/separator7</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Temporär</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagRightClickMenu</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>-----------</e_new>

+<e_new>(Right-click for menu)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation> -----------</f_translation>

-</string><string><a_file>menu_viewer.xml</a_file>

-<b_path>/Main Menu/Help/Bug Reporting/separator7</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>(Rechtsklick für Menü)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFreeToCopy</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>-----------</e_new>

+<e_new>Free to copy</e_new>

 <f_old_trans></f_old_trans>

-<f_translation> -----------</f_translation>

-</string><string><a_file>menu_viewer.xml</a_file>

-<b_path>/Main Menu/Help/Bug Reporting/separator9</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Kopieren möglich</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipForSaleL$</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>-----------</e_new>

+<e_new>For Sale: L$[AMOUNT]</e_new>

 <f_old_trans></f_old_trans>

-<f_translation> -----------</f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/web/</b_path>

+<f_translation>Zum Verkauf: [AMOUNT] L$</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipForSaleMsg</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Web Content

-                </e_new>

+<e_new>For Sale: [MESSAGE]</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Webinhalt

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/web/</b_path>

+<f_translation>Zum Verkauf: [MESSAGE]</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagGroupBuild</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        This location has Web content

-                </e_new>

+<e_new>Group Build</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Dieser Ort verfügt über Webinhalte

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/web/</b_path>

+<f_translation>Gruppenbau</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagNoBuild</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Show Web content

-                </e_new>

+<e_new>No Build</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Webinhalt anzeigen

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/movie/</b_path>

+<f_translation>Bauen aus</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagNoEdit</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie

-                </e_new>

+<e_new>Group Build</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Video

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/movie/</b_path>

+<f_translation>Gruppenbau</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagNotSafe</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        There is a movie to play here

-                </e_new>

+<e_new>Not Safe</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Kein Video gefunden

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/movie/</b_path>

+<f_translation>Unsicher</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagNoFly</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Play movie

-                </e_new>

+<e_new>No Fly</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Video wiedergeben

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/none/</b_path>

+<f_translation>Fliegen aus</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagGroupScripts</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        No Content

-                </e_new>

+<e_new>Group Scripts</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Keine Inhalte

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/none/</b_path>

+<f_translation>Gruppenskripte</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagNoScripts</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        No media here

-                </e_new>

+<e_new>No Scripts</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Keine Medien gefunden

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/image/</b_path>

+<f_translation>Skripte aus</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipLand</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image

-                </e_new>

+<e_new>Land:</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Bild

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/image/</b_path>

+<f_translation>Land:</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//RetrievingData</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        There is an image at this location

-                </e_new>

+<e_new>Retrieving...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Dieser Ort verfügt über Bildinhalte

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/image/</b_path>

+<f_translation>Laden...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoadingData</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        View this location&apos;s image

-                </e_new>

+<e_new>Loading...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Das Bild an diesem Ort anzeigen

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/audio/</b_path>

+<f_translation>Wird geladen...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AvatarNameNobody</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Audio

-                </e_new>

+<e_new>(nobody)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Audio

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/audio/</b_path>

+<f_translation>(niemand)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AvatarNameWaiting</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        There is audio at this location

-                </e_new>

+<e_new>(waiting)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Dieser Ort verfügt über Audioinhalte

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/audio/</b_path>

+<f_translation>(wartet)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AvatarNameHippos</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        View this location&apos;s audio

-                </e_new>

+<e_new>(hippos)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Audio an diesem Ort wiedergeben

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/rtsp/</b_path>

+<f_translation>(hippos)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//GroupNameNone</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Real Time Streaming

-                </e_new>

+<e_new>(none)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Echtzeit-Streaming

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/blank/</b_path>

+<f_translation>(keiner)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorNone</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        - None -

-                </e_new>

+<e_new>No error</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        - Keine - 

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;none/none&quot;/</b_path>

+<f_translation>Kein Fehler</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorRequestFailed</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        - None -

-                </e_new>

+<e_new>Asset request: failed</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        - Keine - 

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;audio/*&quot;/</b_path>

+<f_translation>Asset-Anforderung: fehlgeschlagen</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorNonexistentFile</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Audio

-                </e_new>

+<e_new>Asset request: non-existent file</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Audio

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/*&quot;/</b_path>

+<f_translation>Asset-Anforderung: Datei existiert nicht</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorNotInDatabase</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Video

-                </e_new>

+<e_new>Asset request: asset not found in database</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Video

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;image/*&quot;/</b_path>

+<f_translation>Asset-Anforderung: Asset in Datenbank nicht gefunden</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorEOF</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image

-                </e_new>

+<e_new>End of file</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Bild

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/vnd.secondlife.qt.legacy&quot;/</b_path>

+<f_translation>Ende der Datei</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorCannotOpenFile</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie (QuickTime)

-                </e_new>

+<e_new>Cannot open file</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Video (QuickTime)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/javascript&quot;/</b_path>

+<f_translation>Datei kann nicht geöffnet werden</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorFileNotFound</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Javascript

-                </e_new>

+<e_new>File not found</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Javascript

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/ogg&quot;/</b_path>

+<f_translation>Datei nicht gefunden</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorTCPTimeout</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Ogg Audio/Video

-                </e_new>

+<e_new>File transfer timeout</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Ogg Audio/Video

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/pdf&quot;/</b_path>

+<f_translation>Zeitüberschreitung bei Dateiübertragung</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorCircuitGone</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        PDF Document

-                </e_new>

+<e_new>Circuit gone</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        PDF-Dokument

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/postscript&quot;/</b_path>

+<f_translation>Verbindung verloren</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorUnknownStatus</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Postscript Document

-                </e_new>

+<e_new>Unknown status</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Postscript-Dokument

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/rtf&quot;/</b_path>

+<f_translation>Status unbekannt</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AvatarEditingApparance</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Rich Text (RTF)

-                </e_new>

+<e_new>(Editing Appearance)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Rich Text (RTF)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/xhtml+xml&quot;/</b_path>

+<f_translation>(Aussehen wird bearbeitet)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AvatarAway</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Web Page (XHTML)

-                </e_new>

+<e_new>Away</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Webseite (XHTML)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/x-director&quot;/</b_path>

+<f_translation>Abwesend</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AvatarBusy</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Macromedia Director

-                </e_new>

+<e_new>Busy</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Macromedia Director

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/x-shockwave-flash&quot;/</b_path>

+<f_translation>Beschäftigt</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AvatarMuted</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Flash

-                </e_new>

+<e_new>Muted</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Flash

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;audio/mid&quot;/</b_path>

+<f_translation>Stummgeschaltet</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_afraid</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Audio (MIDI)

-                </e_new>

+<e_new>Afraid</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Audio (MIDI)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;audio/mpeg&quot;/</b_path>

+<f_translation>Ängstlich</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_anger</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Audio (MP3)

-                </e_new>

+<e_new>Angry</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Audio (MP3)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;audio/x-aiff&quot;/</b_path>

+<f_translation>Verärgert</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_away</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Audio (AIFF)

-                </e_new>

+<e_new>Away</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Audio (AIFF)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;audio/x-wav&quot;/</b_path>

+<f_translation>Abwesend</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_backflip</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Audio (WAV)

-                </e_new>

+<e_new>Backflip</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Audio (WAV)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;image/bmp&quot;/</b_path>

+<f_translation>Rückwärtssalto</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_laugh</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image (BMP)

-                </e_new>

+<e_new>Belly Laugh</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Bild (BMP)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;image/gif&quot;/</b_path>

+<f_translation>Lachkrampf</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_toothsmile</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image (GIF)

-                </e_new>

+<e_new>BigSmile</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Bild (GIF)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;image/jpeg&quot;/</b_path>

+<f_translation>Grinsen</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_blowkiss</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image (JPEG)

-                </e_new>

+<e_new>Blow Kiss</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Bild (JPEG)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;image/png&quot;/</b_path>

+<f_translation>Kusshand</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_bored</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image (PNG)

-                </e_new>

+<e_new>Bored</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Bild (PNG)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;image/svg+xml&quot;/</b_path>

+<f_translation>Gelangweilt</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_bow</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image (SVG)

-                </e_new>

+<e_new>Bow</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Bild (SVG)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;image/tiff&quot;/</b_path>

+<f_translation>Verbeugen</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_clap</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image (TIFF)

-                </e_new>

+<e_new>Clap</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Bild (TIFF)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;text/html&quot;/</b_path>

+<f_translation>Klatschen</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_courtbow</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Web Page

-                </e_new>

+<e_new>Court Bow</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Webseite

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;text/plain&quot;/</b_path>

+<f_translation>Diener</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_cry</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Text

-                </e_new>

+<e_new>Cry</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Text

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;text/xml&quot;/</b_path>

+<f_translation>Weinen</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance1</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        XML

-                </e_new>

+<e_new>Dance 1</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        XML

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/mpeg&quot;/</b_path>

+<f_translation>Tanz 1</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance2</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie (MPEG)

-                </e_new>

+<e_new>Dance 2</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Video (MPEG)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/mp4&quot;/</b_path>

+<f_translation>Tanz 2</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance3</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie (MP4)

-                </e_new>

+<e_new>Dance 3</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Video (MP4)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/quicktime&quot;/</b_path>

+<f_translation>Tanz 3</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance4</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie (QuickTime)

-                </e_new>

+<e_new>Dance 4</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Video (QuickTime)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/x-ms-asf&quot;/</b_path>

+<f_translation>Tanz 4</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance5</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie (Windows Media ASF)

-                </e_new>

+<e_new>Dance 5</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Video (Windows Media ASF)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/x-ms-wmv&quot;/</b_path>

+<f_translation>Tanz 5</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance6</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie (Windows Media WMV)

-                </e_new>

+<e_new>Dance 6</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Video (Windows Media WMV)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/x-msvideo&quot;/</b_path>

+<f_translation>Tanz 6</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance7</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie (AVI)

-                </e_new>

+<e_new>Dance 7</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Video (AVI)

-                </f_translation>

-</string><string><a_file>notify.xml</a_file>

-<b_path>//RezItemNoPermissions/message</b_path>

+<f_translation>Tanz 7</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance8</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Insufficient permissions to rez object.

-                </e_new>

+<e_new>Dance 8</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Keine Berechtigung zum Rezzen von Objekten.

-                </f_translation>

-</string><string><a_file>panel_audio.xml</a_file>

-<b_path>/Media panel/mute_audio</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Tanz 8</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_disdain</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Disdain</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_audio.xml</a_file>

-<b_path>/Media panel/mute_music</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Verachten</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_drink</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Drink</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_audio.xml</a_file>

-<b_path>/Media panel/mute_media</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Trinken</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_embarrased</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Embarrassed</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_audio.xml</a_file>

-<b_path>/Media panel/mute_voice</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Verlegen</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_angry_fingerwag</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Finger Wag</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_audio.xml</a_file>

-<b_path>/Media panel/mute_sfx</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Drohen</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_fist_pump</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Fist Pump</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_audio.xml</a_file>

-<b_path>/Media panel/mute_wind</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Faust pumpen</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_yoga_float</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Floating Yoga</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_audio.xml</a_file>

-<b_path>/Media panel/mute_ui</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Yogaflieger</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_frown</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Frown</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_groups.xml</a_file>

-<b_path>/groups/group list/name</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Stirnrunzeln</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_impatient</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Impatient</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_group_invite.xml</a_file>

-<b_path>/invite_panel/help_text</b_path>

+<f_translation>Ungeduldig</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_jumpforjoy</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                You can select multiple residents to 

-invite to your group. Click &apos;Open 

-Person Chooser&apos; to start.

-        </e_new>

+<e_new>Jump For Joy</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Sie können mehrere Einwohner zu Ihrer

-Gruppe einladen. Klicken Sie auf

-&apos;Personenauswahl öffnen&apos;.

-        </f_translation>

-</string><string><a_file>panel_group_invite.xml</a_file>

-<b_path>/invite_panel/role_text</b_path>

+<f_translation>Freudensprung</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_kissmybutt</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Choose what Role to assign them to:

-        </e_new>

+<e_new>Kiss My Butt</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Wählen Sie eine Rolle aus:

-        </f_translation>

-</string><string><a_file>panel_group_invite.xml</a_file>

-<b_path>/invite_panel/confirm_invite_owner_str</b_path>

+<f_translation>LMA</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_kiss</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Are you sure you want to invite new owner(s)? This action is permanent!

-        </e_new>

+<e_new>Kiss</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Möchten Sie wirklich (einen) neue(n) Eigentümer einladen? Dies kann nicht rückgängig gemacht werden!

-        </f_translation>

-</string><string><a_file>panel_master_volume.xml</a_file>

-<b_path>/master_volume/mute_master</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Küssen</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_laugh_short</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Laugh</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/play_label</b_path>

+<f_translation>Lachen</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_musclebeach</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Play

-        </e_new>

+<e_new>Muscle Beach</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Wiedergeben

-        </f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/stop_label</b_path>

+<f_translation>Posen</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_no_unhappy</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Stop

-        </e_new>

+<e_new>No (Unhappy)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Stopp

-        </f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/pause_label</b_path>

+<f_translation>Nein (Bedauernd)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_no_head</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Pause

-        </e_new>

+<e_new>No</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Pause

-        </f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/default_tooltip_label</b_path>

+<f_translation>Nein</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_nyanya</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                No Media Specified

-        </e_new>

+<e_new>Nya-nya-nya</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Keine Medien angegeben

-        </f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/media_hidden_label</b_path>

+<f_translation>Ällabätsch</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_punch_onetwo</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                (URL hidden by parcel owner)

-        </e_new>

+<e_new>One-Two Punch</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                (URL von Parzelleneigentümer versteckt)

-        </f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/media_icon_tooltip_web</b_path>

+<f_translation>Eins-Zwei-Punch</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_open_mouth</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                This location displays content from the World Wide Web. Click the Play button to display Web content.

-        </e_new>

+<e_new>Open Mouth</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                An diesem Ort werden Inhalte aus dem World Wide Web wiedergegeben. Klicken Sie auf &apos;Wiedergeben&apos;, um Webinhalte wiederzugeben.

-        </f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/media_icon_tooltip_movie</b_path>

+<f_translation>Mund offen</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_peace</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                This location displays Video content. Click the Play button to play the video.

-        </e_new>

+<e_new>Peace</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                An diesem Ort werden Videoinhalte wiedergegeben. Klicken Sie auf &apos;Wiedergeben&apos;, um das Video abzuspielen.

-        </f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/media_play_tooltip</b_path>

+<f_translation>Friede</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_point_you</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Display Web content at this location.

-        </e_new>

+<e_new>Point at Other</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Webinhalt an diesem Ort anzeigen.

-        </f_translation>

-</string><string><a_file>panel_place.xml</a_file>

-<b_path>/Place/name_label</b_path>

+<f_translation>Auf anderen zeigen</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_point_me</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Name:

-        </e_new>

+<e_new>Point at Self</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Name:

-        </f_translation>

-</string><string><a_file>panel_place.xml</a_file>

-<b_path>/Place/description_label</b_path>

+<f_translation>Auf mich zeigen</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_punch_l</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Description:

-        </e_new>

+<e_new>Punch Left</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Beschreibung:

-        </f_translation>

-</string><string><a_file>panel_place.xml</a_file>

-<b_path>/Place/information_label</b_path>

+<f_translation>Linker Haken</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_punch_r</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Information:

-        </e_new>

+<e_new>Punch Right</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Information:

-        </f_translation>

-</string><string><a_file>panel_place.xml</a_file>

-<b_path>/Place/location_label</b_path>

+<f_translation>Rechter Haken</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_rps_countdown</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Location:

-        </e_new>

+<e_new>RPS count</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Standort:

-        </f_translation>

-</string><string><a_file>panel_place_small.xml</a_file>

-<b_path>/Place/name_label</b_path>

+<f_translation>SSP zählen</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_rps_paper</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Name:

-        </e_new>

+<e_new>RPS paper</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Name:

-        </f_translation>

-</string><string><a_file>panel_place_small.xml</a_file>

-<b_path>/Place/description_label</b_path>

+<f_translation>SSP Papier</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_rps_rock</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Description:

-        </e_new>

+<e_new>RPS rock</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Beschreibung:

-        </f_translation>

-</string><string><a_file>panel_place_small.xml</a_file>

-<b_path>/Place/information_label</b_path>

+<f_translation>SSP Stein</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_rps_scissors</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Information:

-        </e_new>

+<e_new>RPS scissors</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Information:

-        </f_translation>

-</string><string><a_file>panel_place_small.xml</a_file>

-<b_path>/Place/location_label</b_path>

+<f_translation>SSP Schere</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_repulsed</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Location:

-        </e_new>

+<e_new>Repulsed</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Standort:

-        </f_translation>

-</string><string><a_file>panel_preferences_chat.xml</a_file>

-<b_path>/chat/im</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Angewidert</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_kick_roundhouse_r</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>IM</e_new>

+<e_new>Roundhouse Kick</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>IM</f_translation>

-</string><string><a_file>panel_preferences_general.xml</a_file>

-<b_path>/general_panel/fade_out_combobox/Never</b_path>

+<f_translation>Rundkick</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_sad</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Never

-                </e_new>

+<e_new>Sad</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Nie

-                </f_translation>

-</string><string><a_file>panel_preferences_general.xml</a_file>

-<b_path>/general_panel/fade_out_combobox/Show Temporarily</b_path>

+<f_translation>Traurig</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_salute</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Show Temporarily

-                </e_new>

+<e_new>Salute</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Temporär anzeigen

-                </f_translation>

-</string><string><a_file>panel_preferences_general.xml</a_file>

-<b_path>/general_panel/fade_out_combobox/Always</b_path>

+<f_translation>Salutieren</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_shout</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Always

-                </e_new>

+<e_new>Shout</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Immer

-                </f_translation>

-</string><string><a_file>panel_preferences_general.xml</a_file>

-<b_path>/general_panel/group_titles_textbox</b_path>

+<f_translation>Rufen</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_shrug</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Group Titles:

-        </e_new>

+<e_new>Shrug</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Gruppentitel:

-        </f_translation>

-</string><string><a_file>panel_preferences_general.xml</a_file>

-<b_path>/general_panel/show_all_title_checkbox</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Schulterzucken</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_smile</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Hide All Group Titles</e_new>

+<e_new>Smile</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Alle Gruppentitel ausblenden</f_translation>

-</string><string><a_file>panel_preferences_graphics1.xml</a_file>

-<b_path>/Display panel/QualityPerformanceSelection</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Lächeln</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_smoke_idle</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Smoke Idle</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_preferences_input.xml</a_file>

-<b_path>/Input panel/Camera Follow Distance:</b_path>

+<f_translation>Zigarette halten</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_smoke_inhale</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Camera Follow Distance:

-        </e_new>

+<e_new>Smoke Inhale</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Kameraabstand:

-        </f_translation>

-</string><string><a_file>panel_preferences_input.xml</a_file>

-<b_path>/Input panel/Camera Transition Time:</b_path>

+<f_translation>Rauchen</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_smoke_throw_down</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Camera Transition Time:

-        </e_new>

+<e_new>Smoke Throw Down</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Zeit für Kamerawechsel:

-        </f_translation>

-</string><string><a_file>panel_preferences_input.xml</a_file>

-<b_path>/Input panel/Camera Smoothing:</b_path>

+<f_translation>Zigarette wegwerfen</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_surprise</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Camera Smoothing:

-        </e_new>

+<e_new>Surprise</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Bewegungsglättung:

-        </f_translation>

-</string><string><a_file>panel_preferences_input.xml</a_file>

-<b_path>/Input panel/joystic_setup_button</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Überraschung</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_sword_strike_r</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Joystick Setup</e_new>

+<e_new>Sword Strike</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Joystick-Einrichtung</f_translation>

-</string><string><a_file>panel_preferences_popups.xml</a_file>

-<b_path>/popups/dont_show_label</b_path>

+<f_translation>Schwerthieb</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_angry_tantrum</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Do not show popups:

-        </e_new>

+<e_new>Tantrum</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Popups nicht anzeigen:

-        </f_translation>

-</string><string><a_file>panel_preferences_popups.xml</a_file>

-<b_path>/popups/show_label</b_path>

+<f_translation>Wutanfall</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_tongue_out</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Show popups:

-        </e_new>

+<e_new>TongueOut</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                Popups anzeigen:

-        </f_translation>

-</string><string><a_file>panel_speaker_controls.xml</a_file>

-<b_path>/active_speakers_panel/panels/moderation_mode_panel/moderation_mode/OpenVoice</b_path>

+<f_translation>Zunge rausstrecken</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_hello</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                                        Open Voice (default)

-                                </e_new>

+<e_new>Wave</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                                        Freies Voice (Standard)

-                                </f_translation>

-</string><string><a_file>panel_speaker_controls.xml</a_file>

-<b_path>/active_speakers_panel/panels/moderation_mode_panel/moderation_mode/ModeratedVoice</b_path>

+<f_translation>Winken</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_whisper</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                                        Moderated Voice

-                                </e_new>

+<e_new>Whisper</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                                        Moderiertes Voice

-                                </f_translation>

-</string><string><a_file>panel_speaker_controls.xml</a_file>

-<b_path>/active_speakers_panel/panels/moderate_chat_panel/speakers_list/speaking_status</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Flüstern</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_whistle</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Whistle</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_speaker_controls.xml</a_file>

-<b_path>/active_speakers_panel/panels/moderate_chat_panel/speaker_controls/profile_btn</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Pfeifen</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_wink</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Wink</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_status_bar.xml</a_file>

-<b_path>/status/menubar_search_bevel_bg</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Zwinkern</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_wink_hollywood</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Wink (Hollywood)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_voice_remote_expanded.xml</a_file>

-<b_path>/voice_remote/voice_channel_bg</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Zwinkern (Hollywood)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_worry</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Worry</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_voice_remote_expanded.xml</a_file>

-<b_path>/voice_remote/voice_channel_icon</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Sorgenvoll</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_yes_happy</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Yes (Happy)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_voice_remote_expanded.xml</a_file>

-<b_path>/voice_remote/channel_label</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>Ja (Erfreut)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_yes_head</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Yes</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

+<f_translation>Ja</f_translation>

 </string>

 </strings>

diff --git a/linden/indra/newview/skins/xui/de/need_to_update.xml b/linden/indra/newview/skins/xui/de/need_to_update.xml
index cb82bb7..4fe5b1c 100644
--- a/linden/indra/newview/skins/xui/de/need_to_update.xml
+++ b/linden/indra/newview/skins/xui/de/need_to_update.xml
@@ -2,346 +2,177 @@
 

 <strings>

 <string><a_file>alerts.xml</a_file>

-<b_path>//GrantModifyRights/message</b_path>

+<b_path>//ClothingLoading/message</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        Granting modify rights to another resident allows them to change 

-ANY objects you may have in-world. Be VERY careful when handing 

-out this permission.

-Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?

+                        Your clothing is still downloading.

+You can use the world normally, and other users

+will see you correctly.

                 </d_old>

 <e_new>

-                        Granting modify rights to another resident allows them to change,

-delete or take ANY objects you may have in-world. Be VERY careful

-when handing out this permission.

-Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?

+                        Your clothing is still downloading. 

+You can use [SECOND_LIFE] normally and other users will see you correctly.

                 </e_new>

 <f_translation>

-                        Die Gewährung von Änderungsrechten an andere Einwohner ermöglicht es diesen,

-JEDES BELIEBIGE Objekt zu ändern oder an sich zu nehmen, das Sie in der Second Life-Welt besitzen. Seien Sie SEHR vorsichtig beim Erteilen

-dieser Erlaubnis.

-Möchten Sie [FIRST_NAME] [LAST_NAME] Änderungsrechte gewähren?

-                </f_translation>

+                        Ihre Kleidung wird noch heruntergeladen. 

+Sie können [SECOND_LIFE] normal verwenden. Andere Benutzer können Sie korrekt dargestellt sehen.

+                </f_translation>

 <f_old_trans>

-                        Die Gewährung von Änderungsrechten an einen anderen Einwohner ermöglicht es diesem, 

-JEDES BELIEBIGE Objekt zu ändern, das Sie in der Second Life-Welt besitzen. Seien Sie SEHR vorsichtig, 

-wenn Sie diese Erlaubnis erteilen.

-Möchten Sie [FIRST_NAME] [LAST_NAME] Änderungsrechte gewähren?

+                        Ihre Kleidung wird noch heruntergeladen.

+Sie können sich in der Welt normal verhalten und andere

+Einwohner können Sie sehen.

                 </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotBuyLandNoRegion/message</b_path>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/places_panel/searching_text</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        Unable to buy land:

-Cannot find the region this land is in.

-                </d_old>

-<e_new>

-                        Unable to buy land:

-                        Cannot find the region this land is in.

-                </e_new>

-<f_translation>

-                        Land kann nicht gekauft werden:

-                        Kann die Region nicht finden, in der sich dieses Land befindet.

-                </f_translation>

+                                Searching...

+                        </d_old>

+<e_new>Searching...</e_new>

+<f_translation>Suchen...</f_translation>

 <f_old_trans>

-                        Land kann nicht gekauft werden:

-Kann die Region nicht finden, in der sich dieses Land befindet.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ParcelCanPlayMedia/message</b_path>

+                                Suchen...

+                        </f_old_trans>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/places_panel/not_found_text</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        This location can play streaming video. 

-Streaming video requires a 768 kbps or 

-faster Internet connection.

- 

-Play streaming video when available?

-(You can change this option later under 

-Preferences &gt; Audio &amp; Video.)

-                </d_old>

-<e_new>

-                        This location can play streaming media. 

-Streaming media requires a fast Internet connection.

- 

-Play streaming media when available?

-(You can change this option later under 

-Preferences &gt; Audio &amp; Video.)

-                </e_new>

-<f_translation>

-                        Dieser Ort kann Streaming-Medien abspielen. 

-Streaming-Medien erfordern eine schnelle Internet-Verbindung.

- 

-Streaming-Medien abspielen, wenn verfügbar?

-(Sie können diese Option später unter

-&apos;Einstellungen&apos; &gt; &apos;Audio &amp; Video&apos; ändern.)

-                </f_translation>

+                                None Found.

+                        </d_old>

+<e_new>None Found.</e_new>

+<f_translation>Nicht gefunden.</f_translation>

 <f_old_trans>

-                        Dieser Ort kann Streaming-Video abspielen. 

-Streaming-Video erfordert eine Internetverbindung 

-mit mindestens 768 kbit/s.

- 

-Streaming-Video abspielen, wenn verfügbar?

-(Sie können diese Option später unter 

-&apos;Einstellungen&apos; &gt; &apos;Audio &amp; Video&apos; ändern.)

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ConfirmClearBrowserCache/message</b_path>

+                                Nicht gefunden.

+                        </f_old_trans>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/people_panel/find</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        Are you sure you want to clear your

-browser cache?

-                </d_old>

+                                Find:

+                        </d_old>

 <e_new>

-                        Are you sure you want to clear your browser cache?

-                </e_new>

+        Find:

+      </e_new>

 <f_translation>

-                        Möchten Sie Ihren Browser-Cache wirklich leeren?

-                </f_translation>

+        Suchen:

+      </f_translation>

 <f_old_trans>

-                        Möchten Sie Ihren Browser-Cache

-wirklich löschen?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpWaterNormalMap/message</b_path>

+                                Suchen:

+                        </f_old_trans>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/searching_text</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        Controls what normal map is layered across the water

-to determine reflections/refractions.

-                </d_old>

-<e_new>

-                        Controls what normal map is layered across the water to determine reflections/refractions.

-                </e_new>

-<f_translation>

-                        Ermöglicht die Auswahl einer Normal-Map zur Berechnung von Reflexionen/Brechungen auf dem Wasser.

-                </f_translation>

+                                Searching...

+                        </d_old>

+<e_new>Searching...</e_new>

+<f_translation>Suchen...</f_translation>

 <f_old_trans>

-                        Ermöglicht die Auswahl einer Normal-Map zur

-Berechnung von Reflexionen/Brechungen auf dem Wasser.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpWaterWave1/message</b_path>

+                                Suchen...

+                        </f_old_trans>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                                None Found.

+                        </d_old>

+<e_new>None Found.</e_new>

+<f_translation>Nicht gefunden.</f_translation>

+<f_old_trans>

+                                Nicht gefunden.

+                        </f_old_trans>

+</string><string><a_file>floater_script_debug.xml</a_file>

+<b_path>/script debug floater</b_path>

+<c_attribute>title</c_attribute>

+<d_old>Script Errors/Warning</d_old>

+<e_new>Script Warning/Error</e_new>

+<f_translation>Skriptwarnung/Fehler</f_translation>

+<f_old_trans>Skriptfehler/Warnung</f_old_trans>

+</string><string><a_file>floater_world_map.xml</a_file>

+<b_path>/worldmap/friend combo</b_path>

+<c_attribute>label</c_attribute>

+<d_old>My Friends</d_old>

+<e_new>Online Friends</e_new>

+<f_translation>Online-Freunde</f_translation>

+<f_old_trans>Meine Freunde</f_old_trans>

+</string><string><a_file>floater_world_map.xml</a_file>

+<b_path>/worldmap/friend combo/none_selected</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        Controls where and how fast the large scaled version of the normal

-map moves in the X and Y direction.

+                        My Friends

                 </d_old>

 <e_new>

-                        Controls where and how fast the large scaled version of the normal map moves in the X and Y direction.

+                        Online Friends

                 </e_new>

 <f_translation>

-                        Steuert die Bewegungsgeschwindigkeit und -richtung der großen Normal-Map-Version in X- und Y-Richtung.

+                        Online-Freunde

                 </f_translation>

 <f_old_trans>

-                        Steuert die Bewegungsgeschwindigkeit und -richtung der großen

-Normal-Map-Version in X- und Y-Richtung.

+                        Meine Freunde

                 </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpWaterWave2/message</b_path>

+</string><string><a_file>floater_world_map.xml</a_file>

+<b_path>/worldmap/landmark combo</b_path>

+<c_attribute>label</c_attribute>

+<d_old>My Landmarks</d_old>

+<e_new>Landmarks</e_new>

+<f_translation>Landmarken</f_translation>

+<f_old_trans>Meine Landmarken</f_old_trans>

+</string><string><a_file>floater_world_map.xml</a_file>

+<b_path>/worldmap/landmark combo/none_selected</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        Controls where and how fast the the small scaled version of the

-normal map moves in the X and Y direction.

+                        My Landmarks

                 </d_old>

 <e_new>

-                        Controls where and how fast the the small scaled version of the normal map moves in the X and Y direction.

+                        Landmarks

                 </e_new>

 <f_translation>

-                        Steuert die Bewegungsgeschwindigkeit und -richtung der kleinen Normal-Map-Version in X- und Y-Richtung.

+                        Landmarken

                 </f_translation>

 <f_old_trans>

-                        Steuert die Bewegungsgeschwindigkeit und -richtung der kleinen

-Normal-Map-Version in X- und Y-Richtung.

+                        Meine Landmarken

                 </f_old_trans>

-</string><string><a_file>floater_buy_land.xml</a_file>

-<b_path>/buy land/land_use_reason</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                You hold 1,309 square meters of land.

-This parcel is 512 square meters of land.

-        </d_old>

-<e_new>

-                You hold 1,309 square meters of land. 

-This parcel is 512 square meters of land.

-        </e_new>

-<f_translation>

-                Sie besitzen 1.309 qm Land. 

-Diese Parzelle ist 512 qm groß.

-        </f_translation>

-<f_old_trans>

-                Sie besitzen 1.309 qm Land.

-Diese Parzelle ist 512 qm groß.

-        </f_old_trans>

-</string><string><a_file>floater_buy_land.xml</a_file>

-<b_path>/buy land/multiple_parcels_selected</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                Multiple different parcels selected.

-Try selecting a smaller area.

-        </d_old>

-<e_new>

-                Multiple different parcels selected. 

-Try selecting a smaller area.

-        </e_new>

-<f_translation>

-                Mehrere unterschiedliche Parzellen ausgewählt. 

-Verkleinern Sie Ihre Auswahl.

-        </f_translation>

-<f_old_trans>

-                Mehrere unterschiedliche Parzellen ausgewählt.

-Verkleinern Sie Ihre Auswahl.

-        </f_old_trans>

-</string><string><a_file>floater_buy_land.xml</a_file>

-<b_path>/buy land/not_owned_by_you</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                Land owned by another user is selected.

-Try selecting a smaller area.

-        </d_old>

-<e_new>

-                Land owned by another user is selected. 

-Try selecting a smaller area.

-        </e_new>

-<f_translation>

-                Sie haben Land ausgewählt, das einer anderen Person gehört. 

-Verkleinern Sie Ihre Auswahl.

-        </f_translation>

-<f_old_trans>

-                Sie haben Land ausgewählt, das einer anderen Person gehört.

-Verkleinern Sie Ihre Auswahl.

-        </f_old_trans>

-</string><string><a_file>floater_buy_land.xml</a_file>

-<b_path>/buy land/for_first_time_group</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                This land is reserved for first time buyers.

-You cannot buy it for a group.

-        </d_old>

-<e_new>

-                This land is reserved for first time buyers. 

-You cannot buy it for a group.

-        </e_new>

-<f_translation>

-                Dieses Land ist für Erstkäufer reserviert. 

-Es kann nicht für eine Gruppe gekauft werden.

-        </f_translation>

-<f_old_trans>

-                Dieses Land ist für Erstkäufer reserviert.

-Es kann nicht für eine Gruppe gekauft werden.

-        </f_old_trans>

-</string><string><a_file>floater_buy_land.xml</a_file>

-<b_path>/buy land/for_first_time</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                This land is reserved for first time buyers.

-You already own land.

-        </d_old>

-<e_new>

-                This land is reserved for first time buyers. 

-You already own land.

-        </e_new>

-<f_translation>

-                Dieses Land ist für Erstkäufer reserviert. 

-Sie besitzen bereits Land.

-        </f_translation>

-<f_old_trans>

-                Dieses Land ist für Erstkäufer reserviert.

-Sie besitzen bereits Land.

-        </f_old_trans>

-</string><string><a_file>floater_gesture.xml</a_file>

-<b_path>/gestures/help_label</b_path>

+</string><string><a_file>panel_avatar_classified.xml</a_file>

+<b_path>/Classified/classified_mature_check</b_path>

+<c_attribute>label</c_attribute>

+<d_old>Mature</d_old>

+<e_new></e_new>

+<f_translation></f_translation>

+<f_old_trans>Ab 18</f_old_trans>

+</string><string><a_file>panel_group_notices.xml</a_file>

+<b_path>/notices_tab/lbl2</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                Click a gesture or press a key to play animations and sounds.

+                Notices are kept for 30 days. Click the notice below you wish to view.

+Click the &apos;Refresh&apos; button to check if new notices have been received.

         </d_old>

 <e_new>

-                Double-click a gesture to play animations and sounds.

+                Notices are kept for 14 days. Click the notice below you wish to view.

+Click the &apos;Refresh&apos; button to check if new notices have been received.

+Notice lists are limited to 200 notices per group on a daily basis.

         </e_new>

 <f_translation>

-                Doppelklicken Sie auf eine Geste, um Animationen und Sound abzuspielen.

-        </f_translation>

-<f_old_trans>

-                Klicken Sie auf eine Geste oder drücken Sie eine Taste, 

-um Animationen und Sound abzuspielen.

-        </f_old_trans>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick</b_path>

-<c_attribute>title</c_attribute>

-<d_old>Flycam Options</d_old>

-<e_new>Joystick Configuration</e_new>

-<f_translation>Joystick-Konfiguration</f_translation>

-</string><string><a_file>floater_preview_notecard_keep_discard.xml</a_file>

-<b_path>/preview_notecard/no_object</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                Unable to find object containing this note.:

-        </d_old>

-<e_new>Unable to find object containing this note.:</e_new>

-<f_translation>Es wurde kein Objekt gefunden, das diese Notiz enthält:</f_translation>

-<f_old_trans>

-                Es wurde kein Objekt gefunden, das diese Notiz enthält:

+                Mitteilungen werden 14 Tage lang aufbewahrt. Klicken Sie auf eine Mitteilung, um sie anzuzeigen.

+Klicken Sie auf &apos;Aktualisieren&apos;, um neue Mitteilungen zu suchen.

+Eine Mitteilungsliste speichert maximal 200 Mitteilungen pro Gruppe täglich.

+        </f_translation>

+<f_old_trans>

+                Mitteilungen werden 14 Tage lang aufbewahrt. Klicken

+Sie auf eine Mitteilung, um sie anzuzeigen. Klicken Sie

+auf &apos;Aktualisieren&apos;, um neue Mitteilungen zu suchen.

         </f_old_trans>

-</string><string><a_file>panel_friends.xml</a_file>

-<b_path>/friends/friend_list/icon_edit_mine</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old>Friend can edit your objects</d_old>

-<e_new>Friend can edit, delete or take objects</e_new>

-<f_translation>Freunde können Objekte bearbeiten, löschen und an sich nehmen</f_translation>

-<f_old_trans>Freund kann Ihre Objekte bearbeiten</f_old_trans>

-</string><string><a_file>panel_group_invite.xml</a_file>

-<b_path>/invite_panel/invitee_list</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old>Hold the Ctrl key and click resident names  to multi-select.</d_old>

-<e_new>Hold the Ctrl key and click resident names to multi-select.</e_new>

-<f_translation>Halten Sie zur Mehrfachauswahl die Strg-Taste gedrückt und klicken Sie auf die Einwohnernamen.</f_translation>

-<f_old_trans>Halten Sie zur Mehrfachauswahl die Strg-Taste gedrückt und klicken Sie auf die Einwohnernamen.</f_old_trans>

-</string><string><a_file>panel_group_invite.xml</a_file>

-<b_path>/invite_panel/role_name</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old>Choose from the list of Roles you  are allowed to assign members to.</d_old>

-<e_new>Choose from the list of Roles you are allowed to assign members to.</e_new>

-<f_translation>Wählen Sie aus der Liste der Rollen, die Sie an Mitglieder vergeben dürfen.</f_translation>

-<f_old_trans>Choose from the list of Roles you  are allowed to assign members to.</f_old_trans>

-</string><string><a_file>panel_group_invite.xml</a_file>

-<b_path>/invite_panel/loading</b_path>

+</string><string><a_file>panel_login.xml</a_file>

+<b_path>/panel_login/forgot_password_text</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                (loading...)

+                Forgot your password?

         </d_old>

-<e_new>(loading...)</e_new>

-<f_translation>(wird geladen...)</f_translation>

-<f_old_trans>

-                (wird geladen...)

-        </f_old_trans>

-</string><string><a_file>panel_preferences_chat.xml</a_file>

-<b_path>/chat/users</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Users</d_old>

-<e_new>Chat</e_new>

-<f_translation>Chat</f_translation>

-<f_old_trans>Benutzer</f_old_trans>

-</string><string><a_file>panel_preferences_voice.xml</a_file>

-<b_path>/chat/device_settings_text</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                NOTE: Running the Device Settings or Voice Chat Setup will temporarily disconnect you from Voice Chat.

-        </d_old>

-<e_new>

-                NOTE: Running the Device Settings will temporarily disconnect you from Voice Chat.

+<e_new>Forgot your name or password?

         </e_new>

-<f_translation>

-                HINWEIS: Beim Öffnen der Geräte-Einstellungen werden Sie vorübergehend vom Voice-Chat getrennt.

-        </f_translation>

+<f_translation>Namen oder Kennwort vergessen?

+        </f_translation>

 <f_old_trans>

-                HINWEIS: Beim Öffnen der Geräte-Einstellungen oder der Voice-Chat-Einrichtung werden Sie vorübergehend vom Voice-Chat getrennt.

+                Kennwort vergessen?

         </f_old_trans>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/Redock Windows</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                Redock Windows

-        </d_old>

-<e_new>Redock Windows</e_new>

-<f_translation>Fenster andocken</f_translation>

-<f_old_trans>Fenster andocken</f_old_trans>

 </string>

 </strings>

diff --git a/linden/indra/newview/skins/xui/de/notify.xml b/linden/indra/newview/skins/xui/de/notify.xml
index 62adbc1..f22acd9 100644
--- a/linden/indra/newview/skins/xui/de/notify.xml
+++ b/linden/indra/newview/skins/xui/de/notify.xml
@@ -918,6 +918,21 @@ Klicken Sie auf &apos;Akzeptieren&apos;, um dem Gespräch beizutreten, oder auf
                         Stummschalten
                 </option>
         </notify>
+        <notify name="AutoUnmuteByIM">
+                <message name="message">
+                        [FIRST] [LAST] hat eine Instant Message erhalten; die Stummschaltung wurde aufgehoben.
+                </message>
+        </notify>
+        <notify name="AutoUnmuteByMoney">
+                <message name="message">
+                        [FIRST] [LAST] hat Geld erhalten; die Stummschaltung wurde aufgehoben.
+                </message>
+        </notify>
+        <notify name="AutoUnmuteByInventory">
+                <message name="message">
+                        [FIRST] [LAST] wurde ein Inventarobjekt angeboten; die Stummschaltung wurde aufgehoben.
+                </message>
+        </notify>
         <notify name="VoiceInviteGroup">
                 <message name="message">
                         [NAME] ist einem Voice-Chat mit der Gruppe [GROUP] beigetreten. 
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 8ff4d0e..237fe27 100644
--- a/linden/indra/newview/skins/xui/de/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/xui/de/panel_avatar_classified.xml
@@ -8,7 +8,17 @@
         <button label="Teleportieren" name="classified_teleport_btn" />
         <button label="Karte" name="classified_map_btn" />
         <combo_box label="" name="classified_category_combo" />
-        <check_box label="Ab 18" name="classified_mature_check" />
+        <check_box label="Ab 18" name="classified_mature_check">
+                <combo_item name="select_mature">
+                        - Jugendfreigabe wählen -
+                </combo_item>
+                <combo_item name="mature">
+                        Ab-18-Inhalt
+                </combo_item>
+                <combo_item name="not_mature">
+                        Jugendfreier Inhalt
+                </combo_item>
+        </check_box>
         <text name="classified_info_text"
              tool_tip="Je mehr Sie für die Anzeige bezahlen, desto weiter oben in der Liste erscheint sie.">
                 Anzeige: Noch nicht veröffentlicht
diff --git a/linden/indra/newview/skins/xui/de/panel_classified.xml b/linden/indra/newview/skins/xui/de/panel_classified.xml
index 35dd93f..acdcb13 100644
--- a/linden/indra/newview/skins/xui/de/panel_classified.xml
+++ b/linden/indra/newview/skins/xui/de/panel_classified.xml
@@ -8,7 +8,17 @@
         <button label="Teleportieren" name="classified_teleport_btn" />
         <button label="Auf Karte" name="classified_map_btn" />
         <button label="Profil" name="classified_profile_btn" />
-        <check_box label="Ab 18" name="classified_mature_check" />
+        <check_box label="Ab 18" name="classified_mature_check">
+                <combo_item name="select_mature">
+                        - Jugendfreigabe wählen -
+                </combo_item>
+                <combo_item name="mature">
+                        Ab-18-Inhalt
+                </combo_item>
+                <combo_item name="not_mature">
+                        Jugendfreier Inhalt
+                </combo_item>
+        </check_box>
         <combo_box label="" name="classified_category_combo" />
         <button label="Aktualisieren" name="classified_update_btn" />
         <string name="ad_placed_paid">
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 14cfae1..0a32de2 100644
--- a/linden/indra/newview/skins/xui/de/panel_group_general.xml
+++ b/linden/indra/newview/skins/xui/de/panel_group_general.xml
@@ -67,6 +67,18 @@ Falls in den nächsten 48 Stunden niemand sonst dieser Gruppe beitritt, wird sie
                      tool_tip="Wenn &apos;Beitrittsgebühr&apos; aktiviert ist, müssen neue Mitglieder diesen Betrag zahlen." />
                 <check_box label="Ab-18-Gruppe" name="mature"
                      tool_tip="Festlegen, ob die Informationen Ihrer Gruppe nicht jugendfrei sind." />
+                <combo_box name="group_mature_check"
+                     tool_tip="Festlegen, ob die Informationen Ihrer Gruppe nicht jugendfrei sind.">
+                        <combo_item name="select_mature">
+                                - Jugendfreigabe wählen -
+                        </combo_item>
+                        <combo_item name="mature">
+                                Ab-18-Inhalt
+                        </combo_item>
+                        <combo_item name="not_mature">
+                                Jugendfreier Inhalt
+                        </combo_item>
+                </combo_box>
                 <panel name="title_container">
                         <text name="active_title_label">
                                 Mein aktiver Titel
diff --git a/linden/indra/newview/skins/xui/de/panel_group_notices.xml b/linden/indra/newview/skins/xui/de/panel_group_notices.xml
index 9a819eb..0e151de 100644
--- a/linden/indra/newview/skins/xui/de/panel_group_notices.xml
+++ b/linden/indra/newview/skins/xui/de/panel_group_notices.xml
@@ -16,9 +16,9 @@ gesendet. Mitteilungen können unter
                 Gruppenmitteilungsarchiv
         </text>
         <text name="lbl2">
-                Mitteilungen werden 14 Tage lang aufbewahrt. Klicken
-Sie auf eine Mitteilung, um sie anzuzeigen. Klicken Sie
-auf &apos;Aktualisieren&apos;, um neue Mitteilungen zu suchen.
+                Mitteilungen werden 14 Tage lang aufbewahrt. Klicken Sie auf eine Mitteilung, um sie anzuzeigen.
+Klicken Sie auf &apos;Aktualisieren&apos;, um neue Mitteilungen zu suchen.
+Eine Mitteilungsliste speichert maximal 200 Mitteilungen pro Gruppe täglich.
         </text>
         <scroll_list name="notice_list">
                 <column label="" name="icon" />
diff --git a/linden/indra/newview/skins/xui/de/panel_login.xml b/linden/indra/newview/skins/xui/de/panel_login.xml
index c3d3d1b..ac08744 100644
--- a/linden/indra/newview/skins/xui/de/panel_login.xml
+++ b/linden/indra/newview/skins/xui/de/panel_login.xml
@@ -39,7 +39,7 @@
                 [Viewer Channel Name]
         </text>
         <text name="forgot_password_text">
-                Kennwort vergessen?
+                Namen oder Kennwort vergessen?
         </text>
         <text name="forgot_password_url">
                 http://secondlife.com/account/request.php
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml b/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml
index c251a50..bc40ec0 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml
@@ -17,16 +17,34 @@
         <text_editor name="FullScreenInfo" width="480">
                 Wenn deaktiviert, schaltet die Anzeige bei Anmeldung auf Vollbild um.
         </text_editor>
-        <combo_box name="windowsize combo" left="115">
+        <text name="WindowSizeLabel">
+                Fenstergröße:
+        </text>
+        <combo_box left="115" name="windowsize combo">
+                <combo_item name="640x480">
+                        640x480
+                </combo_item>
+                <combo_item name="800x600">
+                        800x600
+                </combo_item>
+                <combo_item name="720x480">
+                        720x480 (NTSC)
+                </combo_item>
+                <combo_item name="768x576">
+                        768x576 (PAL)
+                </combo_item>
+                <combo_item name="1024x768">
+                        1024x768
+                </combo_item>
         </combo_box>
         <text name="DisplayResLabel" width="100">
                 Anzeigeauflösung:
         </text>
-        <combo_box name="fullscreen combo" left="115" />
+        <combo_box left="115" name="fullscreen combo" />
         <text name="AspectRatioLabel1" tool_tip="Breite/Höhe" width="100">
                 Aspektverhältnis:
         </text>
-        <combo_box name="aspect_ratio" tool_tip="Breite/Höhe" left="115">
+        <combo_box left="115" name="aspect_ratio" tool_tip="Breite/Höhe">
                 <combo_item type="string" length="1" name="4:3(StandardCRT)">
                         4:3 (Standard-CRT)
                 </combo_item>
@@ -40,7 +58,7 @@
                         16:9 (Widescreen)
                 </combo_item>
         </combo_box>
-        <check_box label="Verhältnis automatisch erkennen" name="aspect_auto_detect" left="275" />
+        <check_box label="Verhältnis automatisch erkennen" left="275" name="aspect_auto_detect" />
         <text type="string" length="1" name="UI Size:">
                 UI-Größe:
         </text>
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_web.xml b/linden/indra/newview/skins/xui/de/panel_preferences_web.xml
index af493e6..ce44ba6 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/xui/de/panel_preferences_web.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <panel label="Web" name="web">

         <radio_group name="use_external_browser">

-                <radio_item name="external" tool_tip="Externen Browser für Hilfe, Weblinks usw. verwenden. Im Vollbildmodus nicht empfohlen.">

+                <radio_item name="external"

+                     tool_tip="Externen Browser für Hilfe, Weblinks usw. verwenden. Im Vollbildmodus nicht empfohlen.">

                         Externen Browser verwenden (Firefox, Safari, Internet Explorer)

                 </radio_item>

-                <radio_item name="internal">

+                <radio_item name="internal"

+                     tool_tip="Den integrierten Browser zur Suche im Internet verwenden. Der Browser wird als eigenständiges Fenster in Second Life geöffnet.">

                         Integrierten Browser verwenden

                 </radio_item>

         </radio_group>

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 b4357f0..ec4561f 100644
--- a/linden/indra/newview/skins/xui/de/panel_region_general.xml
+++ b/linden/indra/newview/skins/xui/de/panel_region_general.xml
@@ -6,6 +6,12 @@
         <text name="region_text">
                 unbekannt
         </text>
+        <text name="version_channel_text_lbl">
+                Version:
+        </text>
+        <text name="version_channel_text">
+                unbekannt
+        </text>
         <check_box label="Terraformen blockieren" name="block_terraform_check" />
         <button label="?" name="terraform_help" />
         <check_box label="Fliegen blockieren" name="block_fly_check" />
diff --git a/linden/indra/newview/skins/xui/de/strings.xml b/linden/indra/newview/skins/xui/de/strings.xml
new file mode 100644
index 0000000..be64d7f
--- /dev/null
+++ b/linden/indra/newview/skins/xui/de/strings.xml
@@ -0,0 +1,390 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<strings name="">

+        <string name="LoginInProgress">

+                Anmeldevorgang gestartet. [APP_NAME] reagiert möglicherweise nicht.  Bitte warten.

+        </string>

+        <string name="LoginAuthenticating">

+                Authentifizierung

+        </string>

+        <string name="LoginMaintenance">

+                Account wird aktualisiert...

+        </string>

+        <string name="LoginAttempt">

+                Ein früherer Anmeldeversuch ist fehlgeschlagen. Anmeldung, Versuch [NUMBER]

+        </string>

+        <string name="LoginPrecaching">

+                Welt wird geladen...

+        </string>

+        <string name="LoginInitializingBrowser">

+                Integrierter Webbrowser wird initialisiert...

+        </string>

+        <string name="LoginVerifyingCache">

+                Cache-Dateien werden überprüft (dauert 60-90 Sekunden)...

+        </string>

+        <string name="LoginProcessingResponse">

+                Antwort wird verarbeitet...

+        </string>

+        <string name="LoginInitializingWorld">

+                Welt wird initialisiert...

+        </string>

+        <string name="LoginDecodingImages">

+                Bilder werden entpackt...

+        </string>

+        <string name="LoginInitializingQuicktime">

+                QuickTime wird initialisiert...

+        </string>

+        <string name="LoginQuicktimeNotFound">

+                QuickTime nicht gefunden - Initialisierung nicht möglich.

+        </string>

+        <string name="LoginQuicktimeOK">

+                QuickTime wurde initialisiert.

+        </string>

+        <string name="LoginWaitingForRegionHandshake">

+                Region-Handshake...

+        </string>

+        <string name="LoginConnectingToRegion">

+                Region-Verbindung...

+        </string>

+        <string name="LoginDownloadingClothing">

+                Kleidung wird geladen...

+        </string>

+        <string name="TooltipPerson">

+                Person

+        </string>

+        <string name="TooltipNoName">

+                (namenlos)

+        </string>

+        <string name="TooltipOwner">

+                Eigentümer:

+        </string>

+        <string name="TooltipPublic">

+                Öffentlich

+        </string>

+        <string name="TooltipIsGroup">

+                (Gruppe)

+        </string>

+        <string name="TooltipFlagScript">

+                Skript

+        </string>

+        <string name="TooltipFlagPhysics">

+                Physik

+        </string>

+        <string name="TooltipFlagTouch">

+                Berühren

+        </string>

+        <string name="TooltipFlagL$">

+                L$

+        </string>

+        <string name="TooltipFlagDropInventory">

+                Inventar fallen lassen

+        </string>

+        <string name="TooltipFlagPhantom">

+                Phantom

+        </string>

+        <string name="TooltipFlagTemporary">

+                Temporär

+        </string>

+        <string name="TooltipFlagRightClickMenu">

+                (Rechtsklick für Menü)

+        </string>

+        <string name="TooltipFreeToCopy">

+                Kopieren möglich

+        </string>

+        <string name="TooltipForSaleL$">

+                Zum Verkauf: [AMOUNT] L$

+        </string>

+        <string name="TooltipForSaleMsg">

+                Zum Verkauf: [MESSAGE]

+        </string>

+        <string name="TooltipFlagGroupBuild">

+                Gruppenbau

+        </string>

+        <string name="TooltipFlagNoBuild">

+                Bauen aus

+        </string>

+        <string name="TooltipFlagNoEdit">

+                Gruppenbau

+        </string>

+        <string name="TooltipFlagNotSafe">

+                Unsicher

+        </string>

+        <string name="TooltipFlagNoFly">

+                Fliegen aus

+        </string>

+        <string name="TooltipFlagGroupScripts">

+                Gruppenskripte

+        </string>

+        <string name="TooltipFlagNoScripts">

+                Skripte aus

+        </string>

+        <string name="TooltipLand">

+                Land:

+        </string>

+        <string name="RetrievingData">

+                Laden...

+        </string>

+        <string name="LoadingData">

+                Wird geladen...

+        </string>

+        <string name="AvatarNameNobody">

+                (niemand)

+        </string>

+        <string name="AvatarNameWaiting">

+                (wartet)

+        </string>

+        <string name="AvatarNameHippos">

+                (hippos)

+        </string>

+        <string name="GroupNameNone">

+                (keiner)

+        </string>

+        <string name="AssetErrorNone">

+                Kein Fehler

+        </string>

+        <string name="AssetErrorRequestFailed">

+                Asset-Anforderung: fehlgeschlagen

+        </string>

+        <string name="AssetErrorNonexistentFile">

+                Asset-Anforderung: Datei existiert nicht

+        </string>

+        <string name="AssetErrorNotInDatabase">

+                Asset-Anforderung: Asset in Datenbank nicht gefunden

+        </string>

+        <string name="AssetErrorEOF">

+                Ende der Datei

+        </string>

+        <string name="AssetErrorCannotOpenFile">

+                Datei kann nicht geöffnet werden

+        </string>

+        <string name="AssetErrorFileNotFound">

+                Datei nicht gefunden

+        </string>

+        <string name="AssetErrorTCPTimeout">

+                Zeitüberschreitung bei Dateiübertragung

+        </string>

+        <string name="AssetErrorCircuitGone">

+                Verbindung verloren

+        </string>

+        <string name="AssetErrorUnknownStatus">

+                Status unbekannt

+        </string>

+        <string name="AvatarEditingApparance">

+                (Aussehen wird bearbeitet)

+        </string>

+        <string name="AvatarAway">

+                Abwesend

+        </string>

+        <string name="AvatarBusy">

+                Beschäftigt

+        </string>

+        <string name="AvatarMuted">

+                Stummgeschaltet

+        </string>

+        <string name="anim_express_afraid">

+                Ängstlich

+        </string>

+        <string name="anim_express_anger">

+                Verärgert

+        </string>

+        <string name="anim_away">

+                Abwesend

+        </string>

+        <string name="anim_backflip">

+                Rückwärtssalto

+        </string>

+        <string name="anim_express_laugh">

+                Lachkrampf

+        </string>

+        <string name="anim_express_toothsmile">

+                Grinsen

+        </string>

+        <string name="anim_blowkiss">

+                Kusshand

+        </string>

+        <string name="anim_express_bored">

+                Gelangweilt

+        </string>

+        <string name="anim_bow">

+                Verbeugen

+        </string>

+        <string name="anim_clap">

+                Klatschen

+        </string>

+        <string name="anim_courtbow">

+                Diener

+        </string>

+        <string name="anim_express_cry">

+                Weinen

+        </string>

+        <string name="anim_dance1">

+                Tanz 1

+        </string>

+        <string name="anim_dance2">

+                Tanz 2

+        </string>

+        <string name="anim_dance3">

+                Tanz 3

+        </string>

+        <string name="anim_dance4">

+                Tanz 4

+        </string>

+        <string name="anim_dance5">

+                Tanz 5

+        </string>

+        <string name="anim_dance6">

+                Tanz 6

+        </string>

+        <string name="anim_dance7">

+                Tanz 7

+        </string>

+        <string name="anim_dance8">

+                Tanz 8

+        </string>

+        <string name="anim_express_disdain">

+                Verachten

+        </string>

+        <string name="anim_drink">

+                Trinken

+        </string>

+        <string name="anim_express_embarrased">

+                Verlegen

+        </string>

+        <string name="anim_angry_fingerwag">

+                Drohen

+        </string>

+        <string name="anim_fist_pump">

+                Faust pumpen

+        </string>

+        <string name="anim_yoga_float">

+                Yogaflieger

+        </string>

+        <string name="anim_express_frown">

+                Stirnrunzeln

+        </string>

+        <string name="anim_impatient">

+                Ungeduldig

+        </string>

+        <string name="anim_jumpforjoy">

+                Freudensprung

+        </string>

+        <string name="anim_kissmybutt">

+                LMA

+        </string>

+        <string name="anim_express_kiss">

+                Küssen

+        </string>

+        <string name="anim_laugh_short">

+                Lachen

+        </string>

+        <string name="anim_musclebeach">

+                Posen

+        </string>

+        <string name="anim_no_unhappy">

+                Nein (Bedauernd)

+        </string>

+        <string name="anim_no_head">

+                Nein

+        </string>

+        <string name="anim_nyanya">

+                Ällabätsch

+        </string>

+        <string name="anim_punch_onetwo">

+                Eins-Zwei-Punch

+        </string>

+        <string name="anim_express_open_mouth">

+                Mund offen

+        </string>

+        <string name="anim_peace">

+                Friede

+        </string>

+        <string name="anim_point_you">

+                Auf anderen zeigen

+        </string>

+        <string name="anim_point_me">

+                Auf mich zeigen

+        </string>

+        <string name="anim_punch_l">

+                Linker Haken

+        </string>

+        <string name="anim_punch_r">

+                Rechter Haken

+        </string>

+        <string name="anim_rps_countdown">

+                SSP zählen

+        </string>

+        <string name="anim_rps_paper">

+                SSP Papier

+        </string>

+        <string name="anim_rps_rock">

+                SSP Stein

+        </string>

+        <string name="anim_rps_scissors">

+                SSP Schere

+        </string>

+        <string name="anim_express_repulsed">

+                Angewidert

+        </string>

+        <string name="anim_kick_roundhouse_r">

+                Rundkick

+        </string>

+        <string name="anim_express_sad">

+                Traurig

+        </string>

+        <string name="anim_salute">

+                Salutieren

+        </string>

+        <string name="anim_shout">

+                Rufen

+        </string>

+        <string name="anim_express_shrug">

+                Schulterzucken

+        </string>

+        <string name="anim_express_smile">

+                Lächeln

+        </string>

+        <string name="anim_smoke_idle">

+                Zigarette halten

+        </string>

+        <string name="anim_smoke_inhale">

+                Rauchen

+        </string>

+        <string name="anim_smoke_throw_down">

+                Zigarette wegwerfen

+        </string>

+        <string name="anim_express_surprise">

+                Überraschung

+        </string>

+        <string name="anim_sword_strike_r">

+                Schwerthieb

+        </string>

+        <string name="anim_angry_tantrum">

+                Wutanfall

+        </string>

+        <string name="anim_express_tongue_out">

+                Zunge rausstrecken

+        </string>

+        <string name="anim_hello">

+                Winken

+        </string>

+        <string name="anim_whisper">

+                Flüstern

+        </string>

+        <string name="anim_whistle">

+                Pfeifen

+        </string>

+        <string name="anim_express_wink">

+                Zwinkern

+        </string>

+        <string name="anim_wink_hollywood">

+                Zwinkern (Hollywood)

+        </string>

+        <string name="anim_express_worry">

+                Sorgenvoll

+        </string>

+        <string name="anim_yes_happy">

+                Ja (Erfreut)

+        </string>

+        <string name="anim_yes_head">

+                Ja

+        </string>

+</strings>

diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index e3d0dbf..08a316a 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -1077,7 +1077,7 @@ Your system contains a graphics card that is unknown to us at this time.
 This is often the case with new hardware we haven't had a chance to 
 test.  Second Life will most likely run properly, but you may need to 
 adjust your graphics settings to something more appropriate.
-(Edit->Preferences->Graphics).
+(Edit menu > Preferences > Graphics).
                 </message>
                 <ignore name="ignore">
                         Ignore unknown graphics card
diff --git a/linden/indra/newview/skins/xui/en-us/floater_critical.xml b/linden/indra/newview/skins/xui/en-us/floater_critical.xml
index 126a8ac..5ce1f5c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_critical.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_critical.xml
@@ -2,19 +2,18 @@
 <floater can_close="false" can_drag_on_left="false" can_minimize="false"
      can_resize="false" height="500" min_height="100" min_width="100"
      name="modal container" title="" width="600">
-        <button bottom="-484" font="SansSerif" halign="center" height="20" label="Continue"
-             label_selected="Continue" left="376" mouse_opaque="true" name="Continue"
+        <button bottom="15" font="SansSerif" halign="center" height="20" label="Continue"
+             label_selected="Continue" left="370" mouse_opaque="true" name="Continue"
              width="100" />
-        <button bottom="-484" font="SansSerif" halign="center" height="20" label="Cancel"
+        <button bottom="15" font="SansSerif" halign="center" height="20" label="Cancel"
              label_selected="Cancel" left_delta="108" mouse_opaque="true" name="Cancel"
              width="100" />
-  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom="-31" drop_shadow_visible="true" follows="left|top" font="SansSerif" h_pad="0" halign="left" height="15" left="16" mouse_opaque="true" name="tos_title" v_pad="0" width="568">
-    Critical Message
-  </text>
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom="-77" drop_shadow_visible="true" follows="left|top" font="SansSerif" h_pad="0" halign="left" height="30" left="32" mouse_opaque="true" name="tos_heading" v_pad="0" width="552">
+        <!-- No title text here because our "critical message" is usually the
+        community standards. JC -->
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom="-35" drop_shadow_visible="true" follows="left|top" font="SansSerif" h_pad="0" halign="left" height="20" left="20" mouse_opaque="true" name="tos_heading" v_pad="0" width="552">
                 Please read the following message carefully.
         </text>
-        <text_editor bottom="-376" embedded_items="false" follows="left|top" font="SansSerif" height="283" left="16" max_length="65536" mouse_opaque="true" text_readonly_color="255,255,255,255" bg_readonly_color="0, 30, 80, 200" name="tos_text" width="568" word_wrap="true">
+        <text_editor bottom="45" embedded_items="false" follows="left|top" font="SansSerif" left="20" max_length="65536" mouse_opaque="true" text_readonly_color="255,255,255,255" bg_readonly_color="0, 30, 80, 200" name="tos_text" right="-20" top="-45" word_wrap="true">
                 TOS_TEXT
         </text_editor>
 </floater>
\ No newline at end of file
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 43f255c..dd7520c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
@@ -385,71 +385,94 @@ To buy direct, visit the land and click on the place name in the title bar.
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
                              mouse_opaque="true" name="result_text" v_pad="0" width="328" />
                 </panel>
-    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-                     label="Places" left="1" mouse_opaque="false"
-                     name="places_panel"
+                <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+                     label="Places" left="1" mouse_opaque="false" name="places_panel"
                      width="778">
-      <string name="searching_text">Searching...</string>
-      <string name="not_found_text">None Found.</string>
-      <button bottom="-30" follows="top|left" font="SansSerifSmall" height="20"
-                                label="Back"
-                                left="10"
-                                name="back_btn" width="70" />
-      <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-                                label="Forward" left_delta="75"
-                                name="forward_btn" width="70" />
-      <line_editor bevel_style="in"
-                                                border_style="line"
-                                                border_thickness="1"
-                                                bottom_delta="0"
-                                                enabled="true"
-                                                follows="top|left|right"
-                                                font="SansSerif"
-                                                handle_edit_keys_directly="false"
-                                                commit_on_focus_lost="false"
-                                                height="20"
-                                                hidden="false"
-                                                label="Search"
-                                                left_delta="80"
-                                                width="180"
-                                                max_length="254"
-                                                mouse_opaque="true"
-                                                name="search_editor"
-                                                select_all_on_focus_received="false"
-                                                select_on_focus="false"
-                                                tab_group="1"
-                                                tool_tip="Search Second Life" />
-      <button follows="top|right" font="SansSerif" height="20"
-                                label="Search"
-                                left_delta="185"
-                                bottom_delta="0"
-                                name="search_btn" width="70" />
-      <check_box bottom_delta="0"
-                                control_name="ShowMatureFindAll" follows="right|top"
+                        <string name="searching_text">
+                                Searching...
+                        </string>
+                        <string name="not_found_text">
+                                None Found.
+                        </string>
+                        <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+                             height="20" label="Next &gt;" label_selected="Next &gt;"
+                             mouse_opaque="true" name="Next &gt;" right="344" width="80" />
+                        <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
+                             height="20" label="&lt; Prev" label_selected="&lt; Prev"
+                             mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+                             h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
+                             name="find" v_pad="0" width="50">
+                                Find:
+                        </text>
+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
+                             follows="left|top" font="SansSerif" height="18" left_delta="38"
+                             max_length="63" mouse_opaque="true" name="name" width="128" />
+                        <check_box bottom_delta="-18" control_name="ShowMatureSims" follows="left|top"
                              font="SansSerifSmall" height="16" initial_value="false"
-                             label="Include Mature content"
-                             left_delta="133"
-                             name="mature_check"
-                             width="156" />
-      <web_browser name="places_browser"
-                                bottom="25"
-                                follows="top|left|bottom|right"
-                                font="SansSerifSmall"
-                                left="10"
-                                right="-10"
-                                top="-40" />
-      <text bottom="5"
-                                follows="bottom|left"
-                                halign="left"
-                                left="10"
-                                width="150"
-                                name="status_text"
-                                height="16" />
-      <string name="loading_text">Loading...</string>
-      <string name="done_text">Done</string>
-      <string name="redirect_404_url">http://secondlife.com/app/search/notfound.html</string>
-      <string name="default_search_page">"http://secondlife.com/app/search/index_places.php?"</string>
-    </panel>
+                             label="Include parcels with Mature content" left_delta="0"
+                             mouse_opaque="true" name="incmature" width="204" />
+                        <combo_box allow_text_entry="false" bottom="-24" follows="left|top" height="18" left="182"
+                             max_chars="20" mouse_opaque="true" name="Category" width="128">
+                                <combo_item name="AnyCategory" value="any">
+                                        Any Category
+                                </combo_item>
+                                <combo_item name="LindenLocation" value="linden">
+                                        Linden Location
+                                </combo_item>
+                                <combo_item name="Adult" value="adult">
+                                        Adult
+                                </combo_item>
+                                <combo_item name="Arts&amp;Culture" value="arts">
+                                        Arts &amp; Culture
+                                </combo_item>
+                                <combo_item name="Business" value="store">
+                                        Business
+                                </combo_item>
+                                <combo_item name="Educational" value="educational">
+                                        Educational
+                                </combo_item>
+                                <combo_item name="Gaming" value="game">
+                                        Gaming
+                                </combo_item>
+                                <combo_item name="Hangout" value="gather">
+                                        Hangout
+                                </combo_item>
+                                <combo_item name="NewcomerFriendly" value="newcomer">
+                                        Newcomer Friendly
+                                </combo_item>
+                                <combo_item name="Parks&amp;Nature" value="park">
+                                        Parks &amp; Nature
+                                </combo_item>
+                                <combo_item name="Residential" value="home">
+                                        Residential
+                                </combo_item>
+                                <combo_item name="Shopping" value="shopping">
+                                        Shopping
+                                </combo_item>
+                                <combo_item name="Other" value="other">
+                                        Other
+                                </combo_item>
+                        </combo_box>
+                        <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
+                             label="Search" label_selected="Search" left_delta="136" mouse_opaque="true"
+                             name="Search" width="70" />
+                        <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
+                             draw_heading="true" fg_disable_color="1, 1, 1, 1"
+                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
+                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+                             multi_select="false" name="results" search_column="2" width="339">
+                                <column label="" name="icon" width="24" />
+                                <column label="" name="type" width="-1" />
+                                <column dynamicwidth="true" label="Name" name="name" />
+                                <column label="Traffic" name="dwell" width="75" />
+                        </scroll_list>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+                             mouse_opaque="true" name="result_text" v_pad="0" width="328" />
+                </panel>
     <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                      label="People" left="1" mouse_opaque="false" name="people_panel"
                      width="778">
diff --git a/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml
index 9ccfedb..6606980 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml
@@ -72,7 +72,7 @@
                              select_all_on_focus_received="false" select_on_focus="false" tab_group="1"

                              width="106" />

                         <button bottom="7" enabled="true" follows="right|bottom" font="SansSerif"

-                             halign="right" height="20" label="Send" left="116" mouse_opaque="true"

+                             halign="center" height="20" label="Send" left="116" mouse_opaque="true"

                              name="send_btn" scale_image="true" width="60" />

                 </layout_panel>

                 <layout_panel auto_resize="false" bottom="0" can_resize="true"

diff --git a/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml b/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
index c549e29..a5d25a4 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
@@ -2,9 +2,9 @@
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
      can_resize="false" height="485" min_height="485" min_width="450"
      name="sell land" title="Sell Land" width="450">
-        <texture_picker bottom_delta="-155" enabled="false" follows="top|left" height="135" left="244"
+        <texture_picker bottom_delta="-175" enabled="false" follows="top|left" height="135" left="244"
              name="info_image" right="424" width="180" />
-        <text bottom_delta="119" follows="top|left" font="SansSerifSmall" left="16"
+        <text bottom_delta="144" follows="top|left" font="SansSerifSmall" left="16"
              name="info_parcel_label"  width="48">
                 Parcel:
         </text>
@@ -20,11 +20,11 @@
              name="info_size" right="-20" >
                 [AREA] sq. m.
         </text>
-        <text bottom_delta="-64" follows="top|left" font="SansSerifHuge" height="24"
+        <text bottom_delta="-94" follows="top|left" font="SansSerifHuge" height="24"
              left="16" name="info_action" text_color="white" width="200">
                 To sell this parcel:
         </text>
-        <icon bottom_delta="-96" follows="top|left" height="64" image_name="badge_note.j2c"
+        <icon bottom_delta="-66" follows="top|left" height="64" image_name="badge_note.j2c"
              left="0" name="step_price" width="64" />
         <text bottom_delta="38" follows="top|left" height="16" left="72" name="price_label"
              right="-20" font="SansSerifBig" >
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml b/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml
index 393ce42..fa172aa 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml
@@ -92,7 +92,7 @@ regions in the estate.
         <button bottom_delta="3" follows="left|top" font="SansSerifSmall" height="18" label="?"
              name="estate_manager_help" right="470" width="18" />
         <view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
-             right="470" width="200" />
+             height="60" right="470" width="200" />
         <name_list bottom_delta="0" follows="left|top" height="60" left_delta="0" multi_select="true"
              name="estate_manager_name_list" width="200" />
         <button bottom_delta="-26" enabled="true" follows="left|top" height="20"
diff --git a/linden/indra/newview/skins/xui/ja/alerts.xml b/linden/indra/newview/skins/xui/ja/alerts.xml
index 4fea2a8..f010bc3 100644
--- a/linden/indra/newview/skins/xui/ja/alerts.xml
+++ b/linden/indra/newview/skins/xui/ja/alerts.xml
@@ -751,6 +751,9 @@ Studio exhibitのウェブ・ページで確認してください。
  必須動作環境の条件
 ［_URL］ にアクセスして、さらに詳しい情報をご覧になりますか?
                 </message>
+                <ignore name="ignore">
+                        サポート外のハードウェアを無視する
+                </ignore>
                 <option name="Yes">
                         はい
                 </option>
@@ -783,6 +786,16 @@ Studio exhibitのウェブ・ページで確認してください。
                         510
                 </message>
         </alert>
+        <alert name="UnknownGPU">
+                <message name="message">
+                        お使いのシステムには、現時点では不明なグラフィック・カードが搭載されています。  
+これは、当社による動作テストが行われていない新しいハードウェアが使用されている場合がほとんどです。  Second Lifeはほぼ間違いなく正常に動作しますが、必要に応じたグラフィック設定の調整が必要になる場合があります。
+([編集]&gt;[環境設定]&gt;[グラフィック])。
+                </message>
+                <ignore name="ignore">
+                        不明なグラフィック・カードを無視する
+                </ignore>
+        </alert>
         <alert name="DisplaySettingsNoShaders">
                 <message name="message">
                         [SECOND_LIFE] は、グラフィック・ドライバの初期化中にクラッシュしました。
@@ -1473,6 +1486,34 @@ www.secondlife.comに戻って、新規アカウントの作成を行います�
                         不動産リストの追加に関する問題。1つ以上の不動産で、リストが満杯になっています。
                 </message>
         </alert>
+        <alert name="SetClassifiedMature">
+                <message name="message">
+                        このクラシファイド広告には、成人向けコンテンツが含まれていますか?
+                </message>
+                <option name="Mature">
+                        はい
+                </option>
+                <option name="Not Mature">
+                        いいえ
+                </option>
+                <option name="Cancel">
+                        キャンセル
+                </option>
+        </alert>
+        <alert name="SetGroupMature">
+                <message name="message">
+                        このグループには、成人向けコンテンツが含まれていますか?
+                </message>
+                <option name="Mature">
+                        はい
+                </option>
+                <option name="Not Mature">
+                        いいえ
+                </option>
+                <option name="Cancel">
+                        キャンセル
+                </option>
+        </alert>
         <alert name="HelpRegionSearch" title="検索で表示しない">
                 <message name="message">
                         このボックスをチェックすると、区画のオーナーは、自分の区画が検索結果にリストされることを阻止できます。
@@ -1592,8 +1633,7 @@ www.secondlife.comに戻って、新規アカウントの作成を行います�
         </alert>
         <alert name="NoItems">
                 <message name="message">
-                        選択したアイテムを譲渡できる権限
-                        がありません。
+                        選択したアイテムを譲渡できる権限がありません。
                 </message>
         </alert>
         <alert name="CannotCopyCountItems">
@@ -2767,10 +2807,12 @@ L$は贈与されません。
         </alert>
         <alert name="ClothingLoading">
                 <message name="message">
-                        あなたの服をダウンロード中です。
-通常どおりに世界を使え、他のユーザーもあなたを
-正常に見ることができます。
+                        あなたの服を、ダウンロード中です。 
+通常どおりに[SECOND_LIFE]を使え、他のユーザーもあなたを正常に見ることができます。
                 </message>
+                <ignore name="ignore">
+                        服のダウンロードに長い時間がかかる場合
+                </ignore>
         </alert>
         <alert name="FirstRun">
                 <message name="message">
@@ -4639,25 +4681,25 @@ Linden Lab
         </alert>
         <alert name="GraphicsPreferencesHelp">
                 <message name="message">
-                        このパネルはウィンドウのサイズと解像度、およびクライアントのグラフィックの品質を制御します。  グラフィックの環境設定のインタフェースでは、次の 4 つの中からグラフィック・レベルを選択できます。 低、中、高、超高。 ［カスタム］チェックボックをクリックし、次の設定を操作することで、グラフィックスの設定をカスタマイズすることができます。
+                        このパネルはウィンドウのサイズと解像度、およびクライアントのグラフィックの品質を制御します。  [環境設定]&gt;[グラフィック]のインタフェースでは、次の 4 つの中からグラフィック・レベルを選択できます。低、中、高、超高。 また、[カスタム]チェックボックスをクリックし、次の設定を操作することで、グラフィックスの設定をカスタマイズすることもできます。
 
-シェーダー： ピクセル・シェーダーのさまざまな種類を有効または無効にします。 
+シェーダー:ピクセル・シェーダーのさまざまな種類を有効または無効にします。 
 
-反射詳細： 水が反射するオブジェクトの種類を設定します。
+反射詳細:水が反射するオブジェクトの種類を設定します。
 
-アバター・レンダリング： クライアントによるアバターのレンダリング方法に影響するオプションを設定します。
+アバター・レンダリング:クライアントによるアバターのレンダリング方法に影響するオプションを設定します。
 
-描画距離： あなたの視点から視界のどのくらいの距離まで、オブジェクトがレンダリングされるかに影響します。
+描画距離:あなたの視点から視界のどのくらいの距離まで、オブジェクトがレンダリングされるかに影響します。
 
-最大パーティクル数： 画面に一度に見ることができるパーティクルの最大数を設定します。
+最大パーティクル数:画面に一度に見ることができるパーティクルの最大数を設定します。
 
-ポストプロセス品質： グロー効果（輝き）がレンダリングされる際の解像度を設定します。 
+ポストプロセス品質:グロー効果(輝き)がレンダリングされる際の解像度を設定します。 
 
-メッシュ詳細： 特定のオブジェクトのレンダリング時の細部表現を設定します。
+メッシュ詳細: 特定のオブジェクトのレンダリング時の細部表現、または三角形の数を設定します。 値を大きくするほどレンダリングに時間がかかりますが、オブジェクトがより詳細に表示されます。
 
-ライティング詳細： レンダリングする光源の種類を選択します。
+ライティング詳細:レンダリングする光源の種類を選択します。
 
-地形詳細: 地形の細部表現を設定します。 
+地形詳細: 地形���クス��ャ��細部表現を設定します。
                 </message>
         </alert>
         <alert name="WLSavePresetAlert">
@@ -5086,4 +5128,9 @@ Second Lifeのウェブサイトにアクセスして、設定しますか？
                         いいえ
                 </option>
         </alert>
+        <alert name="MissingString">
+                <message name="message">
+                        文字列[STRING_NAME]がstrings.xmlに含まれていません
+                </message>
+        </alert>
 </alerts>
diff --git a/linden/indra/newview/skins/xui/ja/floater_directory.xml b/linden/indra/newview/skins/xui/ja/floater_directory.xml
index 81b533b..0090ceb 100644
--- a/linden/indra/newview/skins/xui/ja/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_directory.xml
@@ -229,6 +229,22 @@
                                 <column label="ﾄﾗﾌｨｯｸ" name="dwell" />
                         </scroll_list>
                 </panel>
+                <panel label="ショーケース" name="showcase_panel">
+                        <string name="searching_text">
+                                検索中...
+                        </string>
+                        <string name="not_found_text">
+                                何も見つかりませんでした。
+                        </string>
+                        <button label="戻る" name="back_btn" />
+                        <button label="転送" name="forward_btn" />
+                        <string name="loading_text">
+                                ロード中...
+                        </string>
+                        <string name="done_text">
+                                完了
+                        </string>
+                </panel>
                 <panel label="土地の販売" name="land_sales_panel">
                         <string name="searching_text">
                                 検索中...
@@ -286,7 +302,7 @@
                                 検索中...
                         </string>
                         <string name="not_found_text">
-                                何も見つかりませんでした
+                                何も見つかりませんでした。
                         </string>
                         <button label="＜以前" label_selected="＜以前" name="&lt; Prev" />
                         <button label="次へ＞" label_selected="次へ＞" name="Next &gt;" />
@@ -353,7 +369,7 @@
                         <button label="＜以前" label_selected="＜以前" name="&lt; Prev" />
                         <button label="次へ＞" label_selected="次へ＞" name="Next &gt;" />
                         <text name="find">
-                                検索：
+                                検索:
                         </text>
                         <button label="検索" label_selected="検索" name="Search" />
                         <scroll_list name="results">
@@ -367,7 +383,7 @@
                                 検索中...
                         </string>
                         <string name="not_found_text">
-                                何も見つかりませんでした
+                                何も見つかりませんでした。
                         </string>
                         <button label="＜以前" label_selected="＜以前" name="&lt; Prev" />
                         <button label="次へ＞" label_selected="次へ＞" name="Next &gt;" />
@@ -383,6 +399,17 @@
                                 <column label="メンバー" name="members" />
                                 <column label="" name="score" />
                         </scroll_list>
+                        <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" />
+                        <check_box label="成人向けコンテンツを含める" name="mature_check" />
+                        <string name="loading_text">
+                                ロード中...
+                        </string>
+                        <string name="done_text">
+                                完了
+                        </string>
                 </panel>
                 <panel label="全(旧)" name="find_all_old_panel">
                         <string name="searching_text">
diff --git a/linden/indra/newview/skins/xui/ja/floater_im.xml b/linden/indra/newview/skins/xui/ja/floater_im.xml
index a89916d..7761f9d 100644
--- a/linden/indra/newview/skins/xui/ja/floater_im.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_im.xml
@@ -6,6 +6,9 @@
         <text name="offline_message">
                 [FIRST] [LAST]はオフラインです。
         </text>
+        <string name="muted_message">
+                [FIRST] [LAST]はミュートされています。
+        </string>
         <text name="generic_request_error">
                 要求中にエラーが発生しました。後でもう一度試してください。
         </text>
diff --git a/linden/indra/newview/skins/xui/ja/floater_script_debug.xml b/linden/indra/newview/skins/xui/ja/floater_script_debug.xml
index 0c53d05..dd934e3 100644
--- a/linden/indra/newview/skins/xui/ja/floater_script_debug.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_script_debug.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater name="script debug floater" title="スクリプト������ラー／警告">
+<multi_floater name="script debug floater" title="スクリプト警告／エラー">
         <tab_container name="Preview Tabs">
                 <floater label="スクリプト" name="all_scripts" title="[All scripts]" />
         </tab_container>
diff --git a/linden/indra/newview/skins/xui/ja/floater_world_map.xml b/linden/indra/newview/skins/xui/ja/floater_world_map.xml
index 7138dd9..f755964 100644
--- a/linden/indra/newview/skins/xui/ja/floater_world_map.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_world_map.xml
@@ -38,10 +38,10 @@
                 人気
         </text>
         <check_box label=" " name="popular_chk" />
-        <text name="land_for_sale_label2" left_delta="15">
+        <text left_delta="15" name="land_for_sale_label2">
                 売出し中の土地
         </text>
-        <check_box label=" " name="land_for_sale_chk" left_delta="85"/>
+        <check_box label=" " left_delta="85" name="land_for_sale_chk" />
         <text name="events_label">
                 イベント
         </text>
@@ -50,16 +50,16 @@
                 イベント(M)
         </text>
         <check_box label=" " name="event_mature_chk" />
-        <combo_box label="��分のフレンド" name="friend combo"
+        <combo_box label="�����ライン���フレンド" name="friend combo"
              tool_tip="Friend to Show on Map">
                 <combo_item name="none_selected">
-                        ��分のフレンド
+                        �����ライン���フレンド
                 </combo_item>
         </combo_box>
-        <combo_box label="自分������ンドマーク" name="landmark combo"
+        <combo_box label="ランドマーク" name="landmark combo"
              tool_tip="Landmark to Show on Map">
                 <combo_item name="none_selected">
-                        自分������ンドマーク
+                        ランドマーク
                 </combo_item>
         </combo_box>
         <line_editor label="地域名で検索" name="location"
diff --git a/linden/indra/newview/skins/xui/ja/need_to_long.xml b/linden/indra/newview/skins/xui/ja/need_to_long.xml
index 8f8920f..84dc606 100644
--- a/linden/indra/newview/skins/xui/ja/need_to_long.xml
+++ b/linden/indra/newview/skins/xui/ja/need_to_long.xml
@@ -2,154 +2,95 @@
 

 <strings>

 <string><a_file>alerts.xml</a_file>

-<b_path>//HelpRegionObjectBonus/message</b_path>

+<b_path>//GraphicsPreferencesHelp/message</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        The Object Bonus is a multiplier for primitives allowed on any given

-parcel. The range allowed is 1 to 10. Set at &apos;1&apos;, each 512m2 parcel

-is allowed 117 objects. Set at &apos;2&apos;, each 512m2 parcel is

-allowed 234, or twice as many, and so on. The max number of objects

-allowed per region remains 15,000 no matter what the

-Object Bonus is. once set, be aware that lowering the Object Bonus may cause

-objects to be returned or deleted. 

- 

-Default: 1.0

+                        This panel controls window size and resolution and the quality of the client&apos;s graphics.  The graphics preferences interface allows you to choose between four graphics levels: Low, Mid, High, and Ultra. One may customize their graphics settings by checking the Custom checkbox and manipulating the following settings:

+

+Shaders: Enable or disable various types of pixel shaders. 

+

+Reflection Detail: Sets the types of objects that water can reflect.

+

+Avatar Rendering: Sets options that affect how the client renders avatars.

+

+Draw Distance: Affects how far out from your viewpoint objects will be rendered in the scene.

+

+Max Particle Count: Sets the maximum number of particles you are able to see on your screen at once.

+

+Post Process Quality: Sets the resolution with which Glow is rendered. 

+

+Mesh Detail: Sets the amout of detail used in rendering certain objects.

+

+Lighting Detail: Selects what types of lights you would like to render.

+

+Terrain Detail: Sets the amount of terrain detail you would like to see. 

+

+Sky Detail: Sets the amount of tesselation of the sky dome.  A higher value takes longer to render, but makes the sun look more rounded.

                 </d_old>

 <e_new>

-                        The Object Bonus is a multiplier for primitives allowed on any given

-parcel. The range allowed is 1 to 10. Set at &apos;1&apos;, each 512m2 parcel

-is allowed 117 objects. Set at &apos;2&apos;, each 512m2 parcel is

-allowed 234, or twice as many, and so on. The max number of objects

-allowed per region remains 15,000 no matter what the

-Object Bonus is. Once set, be aware that lowering the Object Bonus may cause objects to be returned or deleted. 

- 

-Default: 1.0

+                        This panel controls window size and resolution and the quality of the client&apos;s graphics.  The Preferences &gt; Graphics interface allows you to choose between four graphics levels: Low, Mid, High, and Ultra. You may also customize your graphics settings by checking the Custom checkbox and manipulating the following settings:

+

+Shaders: Enable or disable various types of pixel shaders. 

+

+Reflection Detail: Sets the types of objects that water can reflect.

+

+Avatar Rendering: Sets options that affect how the client renders avatars.

+

+Draw Distance: Affects how far out from your viewpoint objects will be rendered in the scene.

+

+Max Particle Count: Sets the maximum number of particles you are able to see on your screen at once.

+

+Post Process Quality: Sets the resolution with which Glow is rendered. 

+

+Mesh Detail: Sets the amount of detail or number of triangles used in rendering certain objects. A higher value takes longer to render, but makes these objects appear with more detail.

+

+Lighting Detail: Selects what types of lights you would like to render.

+

+Terrain Detail: Sets the amount of detail you would like to see for the terrain texture. 

                 </e_new>

+<f_old_trans></f_old_trans>

 <f_translation>

-                        オブジェクトボーナスは、区画において許可されているプリムの倍率数を

-意味します。認可されている範囲は1から10です。したがって、&apos;1&apos;に設定すると、512 m2の土地には、

-117のオブジェクトが許可されます。&apos;2&apos;に設定すると、同じ512 m2の土地には、1のときの2倍にあたる

-234のオブジェクトが許可され、3以降も同様に増えていきます。全地域の最高オブジェクト数は、

-オブジェクトボーナスの値に影響されず、

-15,000のまま変わりません。いったん決定した後でオブジェクトボーナスの値を下げると、オブジェクトが返却または削除される可能性がありますのでご注意ください。 

-ディフォルト: 1.0

-                </f_translation>

-<f_old_trans>

-                        オブジェクトボーナスは、区画において許可されているプリムの倍率数を

-意味します。認可されている範囲は1から10です。したがって、&apos;1&apos;に設定すると、512 m2の土地には、

-117のオブジェクトが許可されます。&apos;2&apos;に設定すると、同じ512 m2の土地には、1のときの2倍にあたる

-234のオブジェクトが許可され、3以降も同様に増えていきます。全地域の最高オブジェクト数は、

-オブジェクトボーナスの値に影響されず、

-15,000のまま変わりません。いったん決定した後でオブジェクトボーナスの値を下げると、

-オブジェクトが返却または削除される可能性がありますのでご注意ください。 

- 

-デフォルト: 1.0

-                </f_old_trans>

-</string><string><a_file>floater_about.xml</a_file>

-<b_path>/floater_about/credits_editor</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Tofu, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks,  Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall and many others.

+                        このパネルはウィンドウのサイズと解像度、およびクライアントのグラフィックの品質を制御します。  [環境設定]&gt;[グラフィック]のインタフェースでは、次の 4 つの中からグラフィック・レベルを選択できます。低、中、高、超高。 また、[カスタム]チェックボックスをクリックし、次の設定を操作することで、グラフィックスの設定をカスタマイズすることもできます。

 

-Thank you to the following residents for helping to ensure that this is the best version yet: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf

+シェーダー:ピクセル・シェーダーのさまざまな種類を有効または無効にします。 

 

-APR Copyright (C) 2000-2004 The Apache Software Foundation

-cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)

-expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.

-FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).

-GL Copyright (C) 1999-2004 Brian Paul.

-Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.

-jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)

-jpeglib Copyright (C) 1991-1998, Thomas G. Lane.

-ogg/vorbis Copyright (C) 2001, Xiphophorus

-OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.

-SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga

-SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

-xmlrpc-epi Copyright (C) 2000 Epinions, Inc.

-zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.

+反射詳細:水が反射するオブジェクトの種類を設定します。

 

-All rights reserved.  See licenses.txt for details.

+アバター・レンダリング:クライアントによるアバターのレンダリング方法に影響するオプションを設定します。

 

-Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)

+描画距離:あなたの視点から視界のどのくらいの距離まで、オブジェクトがレンダリングされるかに影響します。

 

+最大パーティクル数:画面に一度に見ることができるパーティクルの最大数を設定します。

 

-Happiness is a warm puppy. -- Charles M. Schulz

-        </d_old>

-<e_new>

-  Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Tofu, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks,  Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall and many others.

+ポストプロセス品質:グロー効果(輝き)がレンダリングされる際の解像度を設定します。 

 

-  Thank you to the following residents for helping to ensure that this is the best version yet: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf

+メッシュ詳細: 特定のオブジェクトのレンダリング時の細部表現、または三角形の数を設定します。 値を大きくするほどレンダリングに時間がかかりますが、オブジェクトがより詳細に表示されます。

 

-  3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion

-  APR Copyright (C) 2000-2004 The Apache Software Foundation

-  cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)

-  expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.

-  FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).

-  GL Copyright (C) 1999-2004 Brian Paul.

-  Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.

-  jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)

-  jpeglib Copyright (C) 1991-1998, Thomas G. Lane.

-  ogg/vorbis Copyright (C) 2001, Xiphophorus

-  OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.

-  SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga

-  SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

-  xmlrpc-epi Copyright (C) 2000 Epinions, Inc.

-  zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.

+ライティング詳細:レンダリングする光源の種類を選択します。

 

-  All rights reserved.  See licenses.txt for details.

+地形詳細: 地形テクスチャの細部表現を設定します。 

+                </f_translation>

 

-  Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)

+<f_old_trans>

+                        このパネルはウィンドウのサイズと解像度、およびクライアントのグラフィックの品質を制御します。  グラフィックの環境設定のインタフェースでは、次の 4 つの中からグラフィック・レベルを選択できます。 低、中、高、超高。 ［カスタム］チェックボックをクリックし、次の設定を操作することで、グラフィックスの設定をカスタマイズすることができます。

 

+シェーダー： ピクセル・シェーダーのさまざまな種類を有効または無効にします。 

 

-  Happiness is a warm puppy. -- Charles M. Schulz</e_new>

-<f_translation>

-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、Enus、Kraft、Naveen、Simon、Q、Ronp、Laurap、Ram、KyleJM、Marty、Kend、Daveh、Prospero、Melissa、Nat、Hamilton、Green、Seraph、Ekim、Miz、Jimmy、Kosmo、Rome、Doris、JT、Benoc、Whump、Mango、Trinity、Patch、TJ、Christy、Bao、Joohwan、Kate、Oreh、Angela、Johan、Cheah、Lan、Matias、Brandy、Cogsworth、Aleks、 Mitchell、Space、Einstein、Bambers、Colton、Malbers、Maggie、Umesh、Santosh、Rose、Stash、Rothman、Winnie、Stella、Niall と、その他多数の人達によって作成されました。

+反射詳細： 水が反射するオブジェクトの種類を設定します。

 

-このバージョンをこれまでで最高のものになるようご協力をいただいた以下の住人の皆様に深く感謝いたします。aaron23 decuir、Abelv Vollmar、Abyssin Otoro、ActingIll Igaly、Adamas Carter、Addy Broome、Adelia Menges、Alexandra Rucker、Alexandrea Fride、Alissa Sabre、Alyx Jonson、Ann Otoole、Anton Fargis、Aradia Dielli、Araina jewell、Arcane Clawtooth、arcangelo vantelli、Are Sperber、Argent Stonecutter、arkady yost、Ashcroft Burnham、Ashen Arida、Auron Forcella、Azadine Umarov、Azildin Furst、Balp Allen、Balpien Hammerer、Barney Boomslang、Barrett Slade、becky pippen、Beeflin Grut、Beer Dailey、Behemoth Greenwood、bigmanu greene、bitova loon、Bonca Chikuwa、Bonnie Bechir、Brandon Catteneo、buttonpusher jones、Carina Raymaker、Ceera Murakami、Celierra Darling、ChatNoir Moonsoo、Cheetah Hammerer、chet neurocam、Cinthya Loveless、Cold Spitteler、Coral Quinnell、Crash Pointe、CrazyTB Oh、Creem Pye、Crom Chaffe、ctrl althouse、dade carver、Dael Ra、dakota schwade、Dale Innis、Damian McLeod、Danger Lytton、danielluh ashton、DanOfWA Flanagan、Davec Horsforth、Davidius Morigi、davie zinner、Day Oh、DBDigital Epsilon、Deany Fall、deBruce Munro、Decaf Coffey、Dedric Mauriac、Deeso Saeed、Dekka Raymaker、dexter eberhart、Dildo Spitz、Dizzy Banjo、djcabello klaar、Dnali Anabuki、Domchi Underwood、Doran Zemlja、Drew Dwi、Duckless Vandyke、Duncan Stenvaag、Dylan Rickenbacker、dzogchen Moody、Dzonatas Sol、Eddy Stryker、Edward Griffith、Edward Pearse、ein duesenburg、Elle Pollack、Elle74 Zaftig、Emileigh Starbrook、Emma Nowhere、ener bing、Erdrick Balbozar、eric domela、Evangeline Biedermann、Excalibur Longstaff、Fake Fitzgerald、Feldspar Millgrove、Feynt Mistral、Fluf Fredriksson、Forbid Utorid、Fortyniner Beck、Francesco Despres、Francisco Koolhoven、Franta Burt、Fury Rosewood、garde Burrel、Garmin Kawaguichi、Gavin Ichigo、Gellan Glenelg、Genie Demina、Gennifer Meredith、Gigs Taggart、Goldie Katsu、Gwyneth Llewelyn、Haravikk Mistral、Harleen Gretzky、Haruki Watanabe、Heather Manatiso、Henri Beauchamp、Honey Fairweather、Hypatia Callisto、Ice Brodie、icktoofay Kamachi、IntLibber Brautigan、Janise Dreamscape、Jay Shinobu、Jenni Ryba、Jeremy Ondricek、JetZep Zabelin、Jims Smythe、Jini Hammerer、Jopy Weber、JustOneMore Loon、Kaluura Boa、Kara Markova、Kevin Susenko、Khyra Ares、Kii Lilliehook、Kitty Barnett、Kris Kuttelwascher、Lanita Wingtips、Laura18 Streeter、Lee Ludd、Lettrius Jewell、Liberty Tesla、LilyAnna Carter、Lindal Kidd、Lisa Lowe、Lisa McConnell、Lola Machin、luca peck、Lupus Clawtooth、M1sha Dallin、Macsima Dagostino、Mana Janus、Mani Canning、Manjusri Binder、marceledward edman、march Korda、marchino villota、Marcus Llewellyn、MartinRJ Fayray、Matthew Dowd、Max Kleiber、mazzy fastback、McCabe Maxsted、Mckailen Kohnke、Meghan Dench、Melvin Starbrook、Mercia Mcmahon、Miakoda Carnell、Michelle2 Zenovka、Michi Lumin、mick parnall、Milla Michinaga、Millie Thompson、miranda Ashby、Mircea Lobo、MIssSara Beck、mouse mimistrobell、Myria Boa、Nanci Barthelmess、Nargus Asturias、Natalya Debevec、Nedrae Messmer、Nexeus Fatale、Niky Zenovka、Nimrod Szondi、Ninane Yoshikawa、Noch Tripsa、nokithecat writer、Nyko Merlin、Onyx Halberd、oryx tempel、Osprey Therian、Pac Hyun、Panagea McMillan、Patrick Ferrentino、PattehPh0x Katsu、ponk bing、Poppy Linden、Prajna Vella、Precious Rhiano、Prokofy Neva、Randall Lovenkraft、Rascal Ratelle、Raydon Writer、Rhaorth Antonelli、Rock Hayek、Ron Crimson、Ron Khondji、Ronald Richez、Rui Clary、Ruud Lathrop、Sakkano Imako、Sam Reinard、Sascha Vandyke、Scrippy Scofield、Sean18 McCarey、Sedona Mills、Sekonda Huet、Seraph Nephilim、Sergei Milos、Shadowquine Maltz、shai khalifa、sheilah flatley、Sheri Underwood、Shuggy Husky、Sierra Janus、Sigma Avro、Simil Miles、simon kline、Simon Nolan、Sindy Tsure、Sparks Keynes、Squirrel Wood、Stahi Columbia、StarSong Bright、Summer Seale、Sunn Thunders、Susan Koltai、Syler Zhora、Synack Fitzgerald、Tayra Dagostino、Tee Cramer、Teravus Ousley、Thomas Shikami、Tia Araw、Tillie Ariantho、Topher Brooks、Torley Linden、Twosteppin Jewell、tx Oh、urantia jewell、vaguegirl Petty、VeC Merlin、venus petrov、vv33d Beck、vynka dean、zann canto、zeebster colasanti、Zi Ree、Zion Tristan、Zorin Frobozz、Zyzzy Zarf

+アバター・レンダリング： クライアントによるアバターのレンダリング方法に影響するオプションを設定します。

 

-3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion

-APR Copyright (C) 2000-2004 The Apache Software Foundation

-cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)

-expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.

-FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).

-GL Copyright (C) 1999-2004 Brian Paul.

-Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.

-jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)

-jpeglib Copyright (C) 1991-1998, Thomas G. Lane.

-ogg/vorbis Copyright (C) 2001, Xiphophorus

-OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.

-SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga

-SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

-xmlrpc-epi Copyright (C) 2000 Epinions, Inc.

-zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.

+描画距離： あなたの視点から視界のどのくらいの距離まで、オブジェクトがレンダリングされるかに影響します。

 

-無���複��・������������������詳細���licenses.txt����照��������������。

+������パー�����ク���数： ����に一度に��������������������������テ�����������最大数���設定������。

 

-Voice chat Audio coding:Polycom(R) Siren14(TM) (ITU-T Rec.G.722.1 Annex C)

+ポストプロセス品質： グロー効果（輝き）がレンダリングされる際の解像度を設定します。 

 

+メッシュ詳細： 特定のオブジェクトのレンダリング時の細部表現を設定します。

 

-Happiness is a warm puppy. (しあわせはcあったかい子犬)-- チャールズ・M・シュルツ</f_translation>

-<f_old_trans>

-                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、Enus、Kraft、Naveen、Simon、Q、Ronp、Laurap、Ram、KyleJM、Marty、Kend、Daveh、Prospero、Melissa、Nat、Hamilton、Green、Seraph、Ekim、Miz、Jimmy、Kosmo、Rome、Doris、JT、Benoc、Whump、Mango、Trinity、Patch、TJ、Christy、Bao、Joohwan、Kate、Oreh、Angela、Johan、Cheah、Lan、Matias、Brandy、Cogsworth、Aleks、 Mitchell、Space、Einstein、Bambers、Colton、Malbers、Maggie、Umesh、Santosh、Rose、Stash、Rothman、Winnie、Stella、Niall と、その他多数の人達によって作成されました。

-

-このバージョンをこれまでで最高のものになるようご協力をいただいた以下の住人の皆様に深く感謝いたします。 aaron23 decuir、Abelv Vollmar、Abyssin Otoro、ActingIll Igaly、Adamas Carter、Addy Broome、Adelia Menges、Alexandra Rucker、Alexandrea Fride、Alissa Sabre、Alyx Jonson、Ann Otoole、Anton Fargis、Aradia Dielli、Araina jewell、Arcane Clawtooth、arcangelo vantelli、Are Sperber、Argent Stonecutter、arkady yost、Ashcroft Burnham、Ashen Arida、Auron Forcella、Azadine Umarov、Azildin Furst、Balp Allen、Balpien Hammerer、Barney Boomslang、Barrett Slade、becky pippen、Beeflin Grut、Beer Dailey、Behemoth Greenwood、bigmanu greene、bitova loon、Bonca Chikuwa、Bonnie Bechir、Brandon Catteneo、buttonpusher jones、Carina Raymaker、Ceera Murakami、Celierra Darling、ChatNoir Moonsoo、Cheetah Hammerer、chet neurocam、Cinthya Loveless、Cold Spitteler、Coral Quinnell、Crash Pointe、CrazyTB Oh、Creem Pye、Crom Chaffe、ctrl althouse、dade carver、Dael Ra、dakota schwade、Dale Innis、Damian McLeod、Danger Lytton、danielluh ashton、DanOfWA Flanagan、Davec Horsforth、Davidius Morigi、davie zinner、Day Oh、DBDigital Epsilon、Deany Fall、deBruce Munro、Decaf Coffey、Dedric Mauriac、Deeso Saeed、Dekka Raymaker、dexter eberhart、Dildo Spitz、Dizzy Banjo、djcabello klaar、Dnali Anabuki、Domchi Underwood、Doran Zemlja、Drew Dwi、Duckless Vandyke、Duncan Stenvaag、Dylan Rickenbacker、dzogchen Moody、Dzonatas Sol、Eddy Stryker、Edward Griffith、Edward Pearse、ein duesenburg、Elle Pollack、Elle74 Zaftig、Emileigh Starbrook、Emma Nowhere、ener bing、Erdrick Balbozar、eric domela、Evangeline Biedermann、Excalibur Longstaff、Fake Fitzgerald、Feldspar Millgrove、Feynt Mistral、Fluf Fredriksson、Forbid Utorid、Fortyniner Beck、Francesco Despres、Francisco Koolhoven、Franta Burt、Fury Rosewood、garde Burrel、Garmin Kawaguichi、Gavin Ichigo、Gellan Glenelg、Genie Demina、Gennifer Meredith、Gigs Taggart、Goldie Katsu、Gwyneth Llewelyn、Haravikk Mistral、Harleen Gretzky、Haruki Watanabe、Heather Manatiso、Henri Beauchamp、Honey Fairweather、Hypatia Callisto、Ice Brodie、icktoofay Kamachi、IntLibber Brautigan、Janise Dreamscape、Jay Shinobu、Jenni Ryba、Jeremy Ondricek、JetZep Zabelin、Jims Smythe、Jini Hammerer、Jopy Weber、JustOneMore Loon、Kaluura Boa、Kara Markova、Kevin Susenko、Khyra Ares、Kii Lilliehook、Kitty Barnett、Kris Kuttelwascher、Lanita Wingtips、Laura18 Streeter、Lee Ludd、Lettrius Jewell、Liberty Tesla、LilyAnna Carter、Lindal Kidd、Lisa Lowe、Lisa McConnell、Lola Machin、luca peck、Lupus Clawtooth、M1sha Dallin、Macsima Dagostino、Mana Janus、Mani Canning、Manjusri Binder、marceledward edman、march Korda、marchino villota、Marcus Llewellyn、MartinRJ Fayray、Matthew Dowd、Max Kleiber、mazzy fastback、McCabe Maxsted、Mckailen Kohnke、Meghan Dench、Melvin Starbrook、Mercia Mcmahon、Miakoda Carnell、Michelle2 Zenovka、Michi Lumin、mick parnall、Milla Michinaga、Millie Thompson、miranda Ashby、Mircea Lobo、MIssSara Beck、mouse mimistrobell、Myria Boa、Nanci Barthelmess、Nargus Asturias、Natalya Debevec、Nedrae Messmer、Nexeus Fatale、Niky Zenovka、Nimrod Szondi、Ninane Yoshikawa、Noch Tripsa、nokithecat writer、Nyko Merlin、Onyx Halberd、oryx tempel、Osprey Therian、Pac Hyun、Panagea McMillan

-

-3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion

-APR Copyright (C) 2000-2004 The Apache Software Foundation

-cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)

-expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.

-FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).

-GL Copyright (C) 1999-2004 Brian Paul.

-Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.

-jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)

-jpeglib Copyright (C) 1991-1998, Thomas G. Lane.

-ogg/vorbis Copyright (C) 2001, Xiphophorus

-OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.

-SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga

-SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

-xmlrpc-epi Copyright (C) 2000 Epinions, Inc.

-zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.

-

-</f_old_trans>

+ライティング詳細： レンダリングする光源の種類を選択します。

+

+地形詳細: 地形の細部表現を設定します。 

+                </f_old_trans>

 </string>

 </strings>

diff --git a/linden/indra/newview/skins/xui/ja/need_to_translate.xml b/linden/indra/newview/skins/xui/ja/need_to_translate.xml
index bf2914c..3fd5d5e 100644
--- a/linden/indra/newview/skins/xui/ja/need_to_translate.xml
+++ b/linden/indra/newview/skins/xui/ja/need_to_translate.xml
@@ -2,2128 +2,1427 @@
 

 <strings>

 <string><a_file>alerts.xml</a_file>

-<b_path>//TutorialNotFound/message</b_path>

+<b_path>//UnsupportedHardware/ignore</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        No tutorial is currently available.

+                        Ignore unsupported hardware

                 </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        現在利用可能���������ト����������������������。

+                        �����ート外���������������������無視����

                 </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//TutorialNotFound/OK</b_path>

+<b_path>//UnknownGPU/message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        OK

+Your system contains a graphics card that is unknown to us at this time.  

+This is often the case with new hardware we haven&apos;t had a chance to 

+test.  Second Life will most likely run properly, but you may need to 

+adjust your graphics settings to something more appropriate.

+(Edit &gt; Preferences &gt; Graphics).

                 </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        OK

+お使いのシステムには、現時点では不明なグラフィック・カードが搭載されています。  

+これは、当社による動作テストが行われていない新しいハードウェアが使用されている場合がほとんどです。  Second Lifeはほぼ間違いなく正常に動作しますが、必要に応じたグラフィック設定の調整が必要になる場合があります。

+([編集]&gt;[環境設定]&gt;[グラフィック])。

                 </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//FreezeAvatarFullname/message</b_path>

+<b_path>//UnknownGPU/ignore</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Freeze [AVATAR_NAME]?

-He or she will temporarily be unable to move,

-chat, or interact with the world.

+                        Ignore unknown graphics card

                 </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        [AVATAR_NAME]をフリーズしますか?

-フリーズされた人は一時的に動けなくなり、チャットなど、この世界に対する関わりを持つことができなくなります。

+                        不明なグラフィック・カードを無視する

                 </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//FreezeAvatarFullname/Freeze</b_path>

+<b_path>//ClothingLoading/ignore</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Freeze

+                        When clothing is taking a long time to download

                 </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        ����ー��

+                        服�������������������に長い��間がかかる場合

                 </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//FreezeAvatarFullname/Unfreeze</b_path>

+<b_path>//SetClassifiedMature/message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Unfreeze

-                </e_new>

+Does this classified contain Mature content?

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        解���

-                </f_translation>

+このクラシファイド���告には、成人向けコンテンツが含まれていますか?

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//FreezeAvatarFullname/Cancel</b_path>

+<b_path>//SetClassifiedMature/Mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Cancel

-                </e_new>

+      Yes

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        ������ンセル

-                </f_translation>

+������

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//EjectAvatarFullname/message</b_path>

+<b_path>//SetClassifiedMature/Not Mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Eject [AVATAR_NAME] from your land?

-                </e_new>

+      No

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        ������の土地から[AVATAR_NAME]を追放しますか?

-                </f_translation>

+������

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//EjectAvatarFullname/Eject</b_path>

+<b_path>//SetClassifiedMature/Cancel</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Eject

-                </e_new>

+      Cancel

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        追放

-                </f_translation>

+キャンセル

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//EjectAvatarFullname/EjectandBan</b_path>

+<b_path>//SetGroupMature/message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Eject and Ban

-                </e_new>

+Does this group contain Mature content?

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        追��������止

-                </f_translation>

+このグループには、���人向けコンテンツが含�����������ますか?

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//EjectAvatarFullname/Cancel</b_path>

+<b_path>//SetGroupMature/Mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Cancel

-                </e_new>

+      Yes

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        ������ンセル

-                </f_translation>

+������

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//SeachFilteredOnShortWords/message</b_path>

+<b_path>//SetGroupMature/Not Mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-Your search query was modified and the 

-words that were too short were removed.

-

-Searched for: [FINALQUERY]

-                </e_new>

+      No

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-指定した検索クエリは変更され、短すぎる語句は取り除かれています。

-

-検索語句: [FINALQUERY]

-                </f_translation>

+いいえ

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//SeachFilteredOnShortWordsEmpty/message</b_path>

+<b_path>//SetGroupMature/Cancel</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-Your search terms were too short

-so no search was performed.

-                </e_new>

+      Cancel

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-指定���た検索語句が短すぎたた������検索���行�����ませんでした。

-                </f_translation>

+�������������

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotCloseFloaterBuyLand/message</b_path>

+<b_path>//MissingString/message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        You cannot close the Buy Land window until Second Life

-estimates the price of this transaction.

+                        The string [STRING_NAME] is missing from strings.xml

                 </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        Second Lifeによるこの取引の見積りが完了するまで［土地を購入］ウィンドウを閉じることはできません。

+                        文字列[STRING_NAME]がstrings.xmlに含まれていません

                 </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//MaxAgentOnRegionBatch/message</b_path>

-<c_attribute></c_attribute>

+</string><string><a_file>floater_active_speakers.xml</a_file>

+<b_path>/active_speakers/active_speakers_panel/speakers_list/speaking_status</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>

-                        Failure while attempting to add [NUM_ADDED] agents:

-Exceeds the [MAX_AGENTS] [LIST_TYPE] limit by [NUM_EXCESS].

-                </e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        [NUM_ADDED] 個のエージェントを追加しようとして失敗しました: [MAX_AGENTS] [LIST_TYPE] 制限を [NUM_EXCESS] 個超過しています。

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WebLaunchExternalTarget/message</b_path>

-<c_attribute></c_attribute>

+<f_translation></f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/showcase_panel</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>

-                        Open your system Web browser to view this content?

-                </e_new>

+<e_new>Showcase</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        お使いのシステムのウェブ・ブラウザーを開いて、この内容を表示しますか?

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WebLaunchExternalTarget/ignore</b_path>

+<f_translation>ショーケース</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/showcase_panel/searching_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        When opening your system browser to view a Web page

-                </e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        お使いのシステムのブラウザーを開いてウェブ・ページを表示しようとしたとき

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WebLaunchExternalTarget/Open</b_path>

+<f_translation>検索中...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/showcase_panel/not_found_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        OK

-                </e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        OK

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WebLaunchExternalTarget/Cancel</b_path>

-<c_attribute></c_attribute>

+<f_translation>何も見つかりませんでした。</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/showcase_panel/back_btn</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>

-                        Cancel

-                </e_new>

+<e_new>Back</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        キャンセル

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ProblemAddingEstateGeneric/message</b_path>

-<c_attribute></c_attribute>

+<f_translation>戻る</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/showcase_panel/forward_btn</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>

-                        Problems adding to this estate list.  One or more estates may have a full list.

-                </e_new>

+<e_new>Forward</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        不動産リストの追加に関する問題。1つ以上の不動産で、リストが満杯になっています。

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ReplaceAttachment/ignore</b_path>

+<f_translation>転送</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/showcase_panel/loading_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        When replacing existing attachments

-                </e_new>

+<e_new>Loading...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        現在、装着しているものを置換するとき

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//BusyModePay/ignore</b_path>

+<f_translation>ロード中...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/showcase_panel/done_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        When paying a person or object in busy mode

-                </e_new>

+<e_new>Done</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        ビジー・モードの人またはオブジェクトに支払うとき

-                </f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_objects_panel/owner list/type</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Type</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>タイプ</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_objects_panel/owner list/name</b_path>

+<f_translation>完了</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/back_btn</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Name</e_new>

+<e_new>Back</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>名前</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_objects_panel/owner list/count</b_path>

+<f_translation>戻る</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/forward_btn</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Count</e_new>

+<e_new>Forward</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>カウント</f_translation>

-</string><string><a_file>floater_active_speakers.xml</a_file>

-<b_path>/active_speakers/active_speakers_panel/speakers_list/speaking_status</b_path>

+<f_translation>転送</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/search_editor</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_avatar_textures.xml</a_file>

-<b_path>/avatar_texture_debug/baked_label</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                Baked Textures

-        </e_new>

+<e_new>Search</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                構築されたテクスチャー

-        </f_translation>

-</string><string><a_file>floater_avatar_textures.xml</a_file>

-<b_path>/avatar_texture_debug/composite_label</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                Composite Textures

-        </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                合成テクスチャー

-        </f_translation>

-</string><string><a_file>floater_buy_currency.xml</a_file>

-<b_path>/buy currency/getting_data</b_path>

-<c_attribute></c_attribute>

+<f_translation>検索</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/search_editor</b_path>

+<c_attribute>tool_tip</c_attribute>

 <d_old></d_old>

-<e_new>

-                Getting data...

-        </e_new>

+<e_new>Search Second Life</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                データを取得しています...

-        </f_translation>

-</string><string><a_file>floater_camera.xml</a_file>

-<b_path>/move floater</b_path>

-<c_attribute>title</c_attribute>

+<f_translation>Second Lifeを検索</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/search_btn</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Search</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_camera.xml</a_file>

-<b_path>/move floater/rotate_tooltip</b_path>

-<c_attribute></c_attribute>

+<f_translation>検索</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/mature_check</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Rotate Camera Around Focus</e_new>

+<e_new>Include Mature content</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>�������������を中����������ラ���回転</f_translation>

-</string><string><a_file>floater_camera.xml</a_file>

-<b_path>/move floater/zoom_tooltip</b_path>

+<f_translation>成人向��������������������������</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/loading_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Zoom Camera Towards Focus</e_new>

+<e_new>Loading...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>�����������スに向けてカ���ラをズーム</f_translation>

-</string><string><a_file>floater_camera.xml</a_file>

-<b_path>/move floater/move_tooltip</b_path>

+<f_translation>��ー��中...</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/done_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Move Camera Up and Down, Left and Right</e_new>

+<e_new>Done</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>カメラを上下左右に移動</f_translation>

-</string><string><a_file>floater_chatterbox.xml</a_file>

-<b_path>/floater_chatterbox</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Communicate</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>コミュニケーション</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/IM_logging_string</b_path>

+<f_translation>完了</f_translation>

+</string><string><a_file>floater_im.xml</a_file>

+<b_path>/im_floater/muted_message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                -- Instant message logging enabled --

+                [FIRST] [LAST] is muted.

         </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                -- ��������タ�����������������������������記録が有効 --

+                [FIRST] [LAST]������������������������������

         </f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/IM_end_log_string</b_path>

+</string><string><a_file>notify.xml</a_file>

+<b_path>//AutoUnmuteByIM/message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                -- End of Log --

-        </e_new>

+                        [FIRST] [LAST] was sent an instant message and has been automatically unmuted.

+                </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                -- ログ記録終了 --

-        </f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/Gesture</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Gestures</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>ジェスチャー</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/Gesture/Gestures</b_path>

+                        [FIRST] [LAST]にインスタント・メッセージが送信され、ミュートが自動的に解除されました。

+                </f_translation>

+</string><string><a_file>notify.xml</a_file>

+<b_path>//AutoUnmuteByMoney/message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                                        Gestures

-                                </e_new>

+                        [FIRST] [LAST] was given money and has been automatically unmuted.

+                </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                                        ジェスチャー

-                                </f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/show mutes</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Show Muted Text</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>ミュートされたテキストを表示</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/toggle_active_speakers_btn</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>&lt; &lt;</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>&lt; &lt;</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/toggle_active_speakers_btn</b_path>

-<c_attribute>label_selected</c_attribute>

-<d_old></d_old>

-<e_new>&gt; &gt;</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>&gt; &gt;</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/toggle_active_speakers_btn</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>Click here to show list of active participants in this IM session.</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>ここをクリックして、このIMセッションへのアクティブな参加者リストを表示。</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/chat_panel/Chat Editor</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Click here to chat.</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>チャットを開始するには、ここをクリックします。</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/chat_panel/Say</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Say</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>発言</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/chat_panel/Say</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>(Enter)</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>（Enter）</f_translation>

-</string><string><a_file>floater_critical.xml</a_file>

-<b_path>/modal container/tos_title</b_path>

+                        [FIRST] [LAST]にお金が与えられ、ミュートが自動的に解除されました。

+                </f_translation>

+</string><string><a_file>notify.xml</a_file>

+<b_path>//AutoUnmuteByInventory/message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-    Critical Message

-  </e_new>

+                        [FIRST] [LAST] was offered inventory and has been automatically unmuted.

+                </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-クリティカル・メッセージ

-  </f_translation>

-</string><string><a_file>floater_customize.xml</a_file>

-<b_path>/floater customize/customize tab container/body_parts_placeholder</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Body Parts</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>身体部位</f_translation>

-</string><string><a_file>floater_customize.xml</a_file>

-<b_path>/floater customize/customize tab container/clothes_placeholder</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Clothes</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>服</f_translation>

-</string><string><a_file>floater_day_cycle_options.xml</a_file>

-<b_path>/Day Cycle Floater/Day Cycle Tabs/Day Cycle/WLTimeSlider</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_day_cycle_options.xml</a_file>

-<b_path>/Day Cycle Floater/Day Cycle Tabs/Day Cycle/WLDayCycleKeys</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_device_settings.xml</a_file>

-<b_path>/floater_device_settings</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Voice Chat Device Settings</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>ボイスチャット機器の設定</f_translation>

-</string><string><a_file>floater_directory.xml</a_file>

-<b_path>/directory/Directory Tabs/find_all_old_panel/results/icon</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_env_settings.xml</a_file>

-<b_path>/Environment Editor Floater/EnvTimeSlider</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_env_settings.xml</a_file>

-<b_path>/Environment Editor Floater/EnvCloudSlider</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_env_settings.xml</a_file>

-<b_path>/Environment Editor Floater/EnvWaterFogSlider</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_groups.xml</a_file>

-<b_path>/groups/group list/name</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_hardware_settings.xml</a_file>

-<b_path>/Hardware Settings Floater/Antialiasing:</b_path>

+                        [FIRST] [LAST]に持ち物が与えられ、ミュートが自動的に解除されました。

+                </f_translation>

+</string><string><a_file>panel_avatar_classified.xml</a_file>

+<b_path>/Classified/classified_mature_check/select_mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-    Antialiasing:

-  </e_new>

+      - Select Mature -

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-アンチエイリアシング:

-  </f_translation>

-</string><string><a_file>floater_hardware_settings.xml</a_file>

-<b_path>/Hardware Settings Floater/fsaa</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Antialiasing</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>アンチエイリアシング</f_translation>

-</string><string><a_file>floater_hardware_settings.xml</a_file>

-<b_path>/Hardware Settings Floater/fsaa/FSAADisabled</b_path>

+      -成熟度を選択-

+    </f_translation>

+</string><string><a_file>panel_avatar_classified.xml</a_file>

+<b_path>/Classified/classified_mature_check/mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-      Disabled

+      Mature Content

     </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-無���

+成人���けコンテンツ

     </f_translation>

-</string><string><a_file>floater_hardware_settings.xml</a_file>

-<b_path>/Hardware Settings Floater/fsaa/2x</b_path>

+</string><string><a_file>panel_avatar_classified.xml</a_file>

+<b_path>/Classified/classified_mature_check/not_mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-      2x

+      Not Mature Content

     </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-2x

+      非成人向けコンテンツ

     </f_translation>

-</string><string><a_file>floater_hardware_settings.xml</a_file>

-<b_path>/Hardware Settings Floater/fsaa/4x</b_path>

+</string><string><a_file>panel_classified.xml</a_file>

+<b_path>/Classified/classified_mature_check/select_mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-      4x

+      - Select Mature -

     </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-4x

+      -成熟度を選択-

     </f_translation>

-</string><string><a_file>floater_hardware_settings.xml</a_file>

-<b_path>/Hardware Settings Floater/fsaa/8x</b_path>

+</string><string><a_file>panel_classified.xml</a_file>

+<b_path>/Classified/classified_mature_check/mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-      8x

+      Mature Content

     </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-8x

+成人向けコンテンツ

     </f_translation>

-</string><string><a_file>floater_hardware_settings.xml</a_file>

-<b_path>/Hardware Settings Floater/fsaa/16x</b_path>

+</string><string><a_file>panel_classified.xml</a_file>

+<b_path>/Classified/classified_mature_check/not_mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-      16x

+      Not Mature Content

     </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-16x

+      非成人向けコンテンツ

     </f_translation>

-</string><string><a_file>floater_hud.xml</a_file>

-<b_path>/floater_hud</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Tutorial</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>チュートリアル</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Joystick Configuration</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>ジョイスティックの設定</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickAxis1</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>X Axis Mapping</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>X軸マッピング</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickAxis2</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Y Axis Mapping</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Y軸マッピング</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickAxis0</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Z Axis Mapping</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Z軸マッピング</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickAxis4</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Pitch Mapping</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>ピッチ・マッピング</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickAxis5</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Yaw Mapping</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>ヨー・マッピング</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickAxis3</b_path>

+</string><string><a_file>panel_groups.xml</a_file>

+<b_path>/groups/group list/name</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Roll Mapping</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>ロール・マッピング</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickAxis6</b_path>

-<c_attribute>label</c_attribute>

+<f_translation></f_translation>

+</string><string><a_file>panel_group_general.xml</a_file>

+<b_path>/general_tab/preferences_container/group_mature_check</b_path>

+<c_attribute>tool_tip</c_attribute>

 <d_old></d_old>

-<e_new>Zoom Mapping</e_new>

+<e_new>Sets whether your group information is considered mature.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>ズーム・マッピング</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/ZoomDirect</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>あなたのグループ情報が成人向けとみなされるかどうかを指定します。</f_translation>

+</string><string><a_file>panel_group_general.xml</a_file>

+<b_path>/general_tab/preferences_container/group_mature_check/select_mature</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Direct Zoom</e_new>

+<e_new>

+                        - Select Mature -

+                        </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>直接ズーム</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/Cursor3D</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>

+                        -成熟度を選択-

+                        </f_translation>

+</string><string><a_file>panel_group_general.xml</a_file>

+<b_path>/general_tab/preferences_container/group_mature_check/mature</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>3D Cursor</e_new>

+<e_new>

+                        Mature Content

+                        </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>3Dカーソル</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/AutoLeveling</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>

+                        成人向けコンテンツ

+                        </f_translation>

+</string><string><a_file>panel_group_general.xml</a_file>

+<b_path>/general_tab/preferences_container/group_mature_check/not_mature</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Auto Level</e_new>

+<e_new>

+                        Not Mature Content

+                        </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>自動レベル</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/Control Modes:</b_path>

+<f_translation>

+                        非成人向けコンテンツ

+                        </f_translation>

+</string><string><a_file>panel_preferences_graphics1.xml</a_file>

+<b_path>/Display panel/WindowSizeLabel</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                Control Modes:

+                Window Size:

         </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                制御�����ド:

+                ���������ドウ・サイズ:

         </f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/XScale</b_path>

+</string><string><a_file>panel_preferences_graphics1.xml</a_file>

+<b_path>/Display panel/windowsize combo/640x480</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>X Scale</e_new>

+<e_new>

+                        640x480

+                </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Xスケール</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/YScale</b_path>

+<f_translation>

+                        640x480

+                </f_translation>

+</string><string><a_file>panel_preferences_graphics1.xml</a_file>

+<b_path>/Display panel/windowsize combo/800x600</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Y Scale</e_new>

+<e_new>

+                        800x600 

+                </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Yスケール</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/ZScale</b_path>

+<f_translation>

+                        800x600 

+                </f_translation>

+</string><string><a_file>panel_preferences_graphics1.xml</a_file>

+<b_path>/Display panel/windowsize combo/720x480</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Z Scale</e_new>

+<e_new>

+                        720x480 (NTSC)

+                </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Zスケール</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/PitchScale</b_path>

+<f_translation>

+                        720x480 (NTSC)

+                </f_translation>

+</string><string><a_file>panel_preferences_graphics1.xml</a_file>

+<b_path>/Display panel/windowsize combo/768x576</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Pitch Scale</e_new>

+<e_new>

+                        768x576 (PAL)

+                </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>ピッチ・スケール</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/YawScale</b_path>

+<f_translation>

+                        768x576 (PAL)

+                </f_translation>

+</string><string><a_file>panel_preferences_graphics1.xml</a_file>

+<b_path>/Display panel/windowsize combo/1024x768</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Yaw Scale</e_new>

+<e_new>

+                        1024x768

+                </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>ヨー・スケール</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/RollScale</b_path>

-<c_attribute></c_attribute>

+<f_translation>

+                        1024x768

+                </f_translation>

+</string><string><a_file>panel_preferences_graphics1.xml</a_file>

+<b_path>/Display panel/QualityPerformanceSelection</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Roll Scale</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>ロール・スケール</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/XDeadZone</b_path>

-<c_attribute></c_attribute>

+<f_translation></f_translation>

+</string><string><a_file>panel_preferences_web.xml</a_file>

+<b_path>/web/use_external_browser/internal</b_path>

+<c_attribute>tool_tip</c_attribute>

 <d_old></d_old>

-<e_new>X Dead Zone</e_new>

+<e_new>Use the built-in web browser for help, web links, etc. This browser opens as a new window inside Second Life.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Xデッド・ゾーン</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/YDeadZone</b_path>

+<f_translation>ヘルプやWebリンクに埋め込みWebブラウザを使用します。ブラウザはSecond Lifeの新しいウィンドウとして開きます。</f_translation>

+</string><string><a_file>panel_region_general.xml</a_file>

+<b_path>/General/version_channel_text_lbl</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Y Dead Zone</e_new>

+<e_new>

+                Version: 

+        </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Yデッド・ゾーン</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/ZDeadZone</b_path>

+<f_translation>

+                バージョン: 

+        </f_translation>

+</string><string><a_file>panel_region_general.xml</a_file>

+<b_path>/General/version_channel_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Z Dead Zone</e_new>

+<e_new>

+                unknown

+        </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>Zデッド・ゾーン</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/PitchDeadZone</b_path>

+<f_translation>

+                不明

+        </f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginInProgress</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Pitch Dead Zone</e_new>

+<e_new>Logging in. [APP_NAME] may appear frozen.  Please wait.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>ピッチ・デッド・ゾーン</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/YawDeadZone</b_path>

+<f_translation>ログイン中です。[APP_NAME]の表示がフリーズする場合があります。  しばらくお待ちください。</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginAuthenticating</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Yaw Dead Zone</e_new>

+<e_new>Authenticating</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>����������������・�����ン</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/RollDeadZone</b_path>

+<f_translation>認������������������...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginMaintenance</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Roll Dead Zone</e_new>

+<e_new>Performing account maintenance...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>�������・��ッ������������</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/Feathering</b_path>

+<f_translation>������ウ�����・����������������実行���ています...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginAttempt</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Feathering</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>羽毛</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/AvatarFeathering</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/BuildFeathering</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/FlycamFeathering</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

+<e_new>Previous login attempt failed. Logging in, attempt [NUMBER]</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/ZoomScale2</b_path>

+<f_translation>前回のログインに失敗しました。 ログイン中です([NUMBER]回目)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginPrecaching</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Zoom Scale</e_new>

+<e_new>Loading world...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>ズーム・スケール</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/FlycamAxisScale6</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/ZoomDeadZone</b_path>

+<f_translation>ワールドをロードしています...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginInitializingBrowser</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Zoom Dead Zone</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>ズーム・デッド・ゾーン</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/FlycamAxisDeadZone6</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/SpaceNavigatorDefaults</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>SpaceNavigator Defaults</e_new>

+<e_new>Initializing embedded web browser...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>SpaceNavigator��������������設���</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickMonitor</b_path>

+<f_translation>埋���込���Web����������������期���しています...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginVerifyingCache</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Joystick Monitor</e_new>

+<e_new>Verifying cache files (can take 60-90 seconds)...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>����イステ��ッ����������ー</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/Axis</b_path>

+<f_translation>��ャッ����������������を検��しています(所要時間は60～90秒)...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginProcessingResponse</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Axis [NUM]</e_new>

+<e_new>Processing Response...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>軸 [NUM]</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/NoDevice</b_path>

+<f_translation>応答を処理しています...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginInitializingWorld</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>no device detected</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>デバイスは検出されませんでした</f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiColorFilterPanel/wmiColorFilterBrightness</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiColorFilterPanel/wmiColorFilterSaturation</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiColorFilterPanel/wmiColorFilterContrast</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiNightVisionPanel/wmiNightVisionBrightMult</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiNightVisionPanel/wmiNightVisionNoiseSize</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiNightVisionPanel/wmiNightVisionNoiseStrength</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

+<e_new>Initializing World...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiBloomPanel/wmiBloomExtract</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiBloomPanel/wmiBloomSize</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiBloomPanel/wmiBloomStrength</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_preview_classified.xml</a_file>

-<b_path>/classified_preview</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Classified Information</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>クラシファイド広告情報</f_translation>

-</string><string><a_file>floater_preview_event.xml</a_file>

-<b_path>/event_preview</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Event Information</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>イベント情報</f_translation>

-</string><string><a_file>floater_preview_gesture.xml</a_file>

-<b_path>/gesture_preview/library_label</b_path>

+<f_translation>ワールドを初期化しています...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginDecodingImages</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Library:

-        </e_new>

+<e_new>Decoding images...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                ライブラリ：

-        </f_translation>

-</string><string><a_file>floater_preview_gesture.xml</a_file>

-<b_path>/gesture_preview/steps_label</b_path>

+<f_translation>画像をデコードしています...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginInitializingQuicktime</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Steps:

-        </e_new>

+<e_new>Initializing QuickTime...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                手順：

-        </f_translation>

-</string><string><a_file>floater_preview_gesture.xml</a_file>

-<b_path>/gesture_preview/animation_trigger_type/start</b_path>

+<f_translation>QuickTimeを初期化しています...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginQuicktimeNotFound</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Start

-                </e_new>

+<e_new>QuickTime not found - unable to initialize.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        開始

-                </f_translation>

-</string><string><a_file>floater_preview_gesture.xml</a_file>

-<b_path>/gesture_preview/animation_trigger_type/stop</b_path>

+<f_translation>QuickTimeが見つかりません。初期化に失敗しました。</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginQuicktimeOK</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Stop

-                </e_new>

+<e_new>QuickTime initialized successfully.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        停止

-                </f_translation>

-</string><string><a_file>floater_preview_notecard_keep_discard.xml</a_file>

-<b_path>/preview_notecard/not_allowed</b_path>

+<f_translation>QuickTimeが正常に初期化されました。</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginWaitingForRegionHandshake</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>You are not allowed to view this note.</e_new>

+<e_new>Waiting for region handshake...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>あなたはこのノートを見ることができません。</f_translation>

-</string><string><a_file>floater_preview_url.xml</a_file>

-<b_path>/url_preview</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Place Information</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>場所の情報</f_translation>

-</string><string><a_file>floater_region_info.xml</a_file>

-<b_path>/regioninfo</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Region/Estate</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>地域/不動産</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolCube</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>Cube</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>キューブ</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolPrism</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>Prism</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>プリズム</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolPyramid</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>地域のハンドシェイクを待っています...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginConnectingToRegion</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Pyramid</e_new>

+<e_new>Connecting to region...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>���������������</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolTetrahedron</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>地域���接続������������す...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginDownloadingClothing</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Tetrahedron</e_new>

+<e_new>Downloading clothing...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>4面体</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolCylinder</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>服をダウンロードしています...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipPerson</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Cylinder</e_new>

+<e_new>Person</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>シリンダー</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolHemiCylinder</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>人</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipNoName</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Hemicylinder</e_new>

+<e_new>(no name)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>�����柱</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolCone</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>(������なし)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipOwner</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Cone</e_new>

+<e_new>Owner:</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>円錐</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolHemiCone</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>オーナー:</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipPublic</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Hemicone</e_new>

+<e_new>Public</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>������錐</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolSphere</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>������</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipIsGroup</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Sphere</e_new>

+<e_new>(Group)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>��形</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolHemiSphere</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>(グ���ープ)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagScript</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Hemisphere</e_new>

+<e_new>Script</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>半��</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolTorus</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>スク���プト</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagPhysics</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Torus</e_new>

+<e_new>Physics</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>トー��ス</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolTube</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>��理作用</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagTouch</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Tube</e_new>

+<e_new>Touch</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>���ューブ</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolRing</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>触���</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagL$</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Ring</e_new>

+<e_new>L$</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>リング</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolTree</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>L$</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagDropInventory</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Tree</e_new>

+<e_new>Drop Inventory</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>���木</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolGrass</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>���ち物をドロップする</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagPhantom</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Grass</e_new>

+<e_new>Phantom</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>草地</f_translation>

-</string><string><a_file>menu_viewer.xml</a_file>

-<b_path>/Main Menu/View/Joystick Flycam</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>ファントム</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagTemporary</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Joystick Flycam</e_new>

+<e_new>Temporary</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>��ョ���スティック・フライカム</f_translation>

-</string><string><a_file>menu_viewer.xml</a_file>

-<b_path>/Main Menu/Help/Tutorial</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>�����的</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagRightClickMenu</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Tutorial</e_new>

+<e_new>(Right-click for menu)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>チ����������ル</f_translation>

-</string><string><a_file>menu_viewer.xml</a_file>

-<b_path>/Main Menu/Help/separator7</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>(右������ック�������������表示)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFreeToCopy</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>-----------</e_new>

+<e_new>Free to copy</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>-----------</f_translation>

-</string><string><a_file>menu_viewer.xml</a_file>

-<b_path>/Main Menu/Help/Bug Reporting/separator9</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>コピー可能</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipForSaleL$</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>-----------</e_new>

+<e_new>For Sale: L$[AMOUNT]</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>-----------</f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/web/</b_path>

+<f_translation>売り出し中:L$[AMOUNT]</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipForSaleMsg</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Web Content

-                </e_new>

+<e_new>For Sale: [MESSAGE]</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        ウェブ・コンテンツ

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/web/</b_path>

+<f_translation>売り出し中: [MESSAGE]</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagGroupBuild</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        This location has Web content

-                </e_new>

+<e_new>Group Build</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        ここにウェブ・コンテンツがあります。

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/web/</b_path>

+<f_translation>グループ作成</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagNoBuild</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Show Web content

-                </e_new>

+<e_new>No Build</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        ウェブ・コンテンツを表示

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/movie/</b_path>

+<f_translation>作成禁止</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagNoEdit</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie

-                </e_new>

+<e_new>Group Build</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        ムービー

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/movie/</b_path>

+<f_translation>グループ作成</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagNotSafe</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        There is a movie to play here

-                </e_new>

+<e_new>Not Safe</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        ここにはムービーがあります

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/movie/</b_path>

+<f_translation>危険</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagNoFly</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Play movie

-                </e_new>

+<e_new>No Fly</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        ムービー再生

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/none/</b_path>

+<f_translation>飛行禁止</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagGroupScripts</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        No Content

-                </e_new>

+<e_new>Group Scripts</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        コンテンツなし

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/none/</b_path>

+<f_translation>グループ・スクリプト</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagNoScripts</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        No media here

-                </e_new>

+<e_new>No Scripts</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        メディアなし

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/image/</b_path>

+<f_translation>スクリプトなし</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipLand</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image

-                </e_new>

+<e_new>Land:</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        画像

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/image/</b_path>

+<f_translation>土地:</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//RetrievingData</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        There is an image at this location

-                </e_new>

+<e_new>Retrieving...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        ここには画像があります

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/image/</b_path>

+<f_translation>検索中...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoadingData</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        View this location&apos;s image

-                </e_new>

+<e_new>Loading...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        ここの画像を表示

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/audio/</b_path>

+<f_translation>ロード中...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AvatarNameNobody</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Audio

-                </e_new>

+<e_new>(nobody)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        オーディオ

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/audio/</b_path>

+<f_translation>(無人)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AvatarNameWaiting</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        There is audio at this location

-                </e_new>

+<e_new>(waiting)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        ここではオーディオが聞けます

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/audio/</b_path>

+<f_translation>(待機中)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AvatarNameHippos</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        View this location&apos;s audio

-                </e_new>

+<e_new>(hippos)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        ここのオーディオを再生する

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/rtsp/</b_path>

+<f_translation>(カバ)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//GroupNameNone</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Real Time Streaming

-                </e_new>

+<e_new>(none)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        リアルタイム・ストリーミング

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/blank/</b_path>

+<f_translation>(なし)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorNone</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        - None -

-                </e_new>

+<e_new>No error</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        -- なし --

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;none/none&quot;/</b_path>

+<f_translation>エラーなし</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorRequestFailed</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        - None -

-                </e_new>

+<e_new>Asset request: failed</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        -- なし --

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;audio/*&quot;/</b_path>

+<f_translation>資産の要求: 失敗</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorNonexistentFile</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Audio

-                </e_new>

+<e_new>Asset request: non-existent file</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        オーディオ

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/*&quot;/</b_path>

+<f_translation>資産の要求: 存在しないファイル</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorNotInDatabase</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Video

-                </e_new>

+<e_new>Asset request: asset not found in database</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        ビデオ

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;image/*&quot;/</b_path>

+<f_translation>資産の要求: データベースでは見つからない資産</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorEOF</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image

-                </e_new>

+<e_new>End of file</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        画像

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/vnd.secondlife.qt.legacy&quot;/</b_path>

+<f_translation>ファイルの終わり</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorCannotOpenFile</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie (QuickTime)

-                </e_new>

+<e_new>Cannot open file</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        ムービー (QuickTime)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/javascript&quot;/</b_path>

+<f_translation>ファイルを開くことができません</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorFileNotFound</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Javascript

-                </e_new>

+<e_new>File not found</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Javascript

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/ogg&quot;/</b_path>

+<f_translation>ファイルが見つかりません</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorTCPTimeout</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Ogg Audio/Video

-                </e_new>

+<e_new>File transfer timeout</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Oggオーディオ/ビデオ

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/pdf&quot;/</b_path>

+<f_translation>ファイル転送タイムアウトです</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorCircuitGone</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        PDF Document

-                </e_new>

+<e_new>Circuit gone</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        PDFドキュメント

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/postscript&quot;/</b_path>

+<f_translation>接続が解除されました</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorUnknownStatus</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Postscript Document

-                </e_new>

+<e_new>Unknown status</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Postscriptドキュメント

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/rtf&quot;/</b_path>

+<f_translation>ステータスが不明です</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AvatarEditingApparance</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Rich Text (RTF)

-                </e_new>

+<e_new>(Editing Appearance)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        リッチ・テキスト (RTF)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/xhtml+xml&quot;/</b_path>

+<f_translation>(容姿の編集)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AvatarAway</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Web Page (XHTML)

-                </e_new>

+<e_new>Away</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        ウェブ・ページ (XHTML)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/x-director&quot;/</b_path>

+<f_translation>退席中</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AvatarBusy</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Macromedia Director

-                </e_new>

+<e_new>Busy</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Macromedia Director

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/x-shockwave-flash&quot;/</b_path>

+<f_translation>取り込み中</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AvatarMuted</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Flash

-                </e_new>

+<e_new>Muted</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Flash

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;audio/mid&quot;/</b_path>

+<f_translation>ミュート</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_afraid</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Audio (MIDI)

-                </e_new>

+<e_new>Afraid</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        オーディオ (MIDI)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;audio/mpeg&quot;/</b_path>

+<f_translation>怖れ</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_anger</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Audio (MP3)

-                </e_new>

+<e_new>Angry</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        オーディオ (MP3)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;audio/x-aiff&quot;/</b_path>

+<f_translation>怒り</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_away</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Audio (AIFF)

-                </e_new>

+<e_new>Away</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        オーディオ (AIFF)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;audio/x-wav&quot;/</b_path>

+<f_translation>退席中</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_backflip</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Audio (WAV)

-                </e_new>

+<e_new>Backflip</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        オーディオ (WAV)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;image/bmp&quot;/</b_path>

+<f_translation>後ろ宙返り</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_laugh</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image (BMP)

-                </e_new>

+<e_new>Belly Laugh</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        画像 (BMP)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;image/gif&quot;/</b_path>

+<f_translation>大笑い</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_toothsmile</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image (GIF)

-                </e_new>

+<e_new>BigSmile</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        画像 (GIF)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;image/jpeg&quot;/</b_path>

+<f_translation>満面の笑顔</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_blowkiss</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image (JPEG)

-                </e_new>

+<e_new>Blow Kiss</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        画像 (JPEG)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;image/png&quot;/</b_path>

+<f_translation>投げキッス</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_bored</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image (PNG)

-                </e_new>

+<e_new>Bored</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        画像 (PNG)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;image/svg+xml&quot;/</b_path>

+<f_translation>退屈</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_bow</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image (SVG)

-                </e_new>

+<e_new>Bow</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        画像 (SVG)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;image/tiff&quot;/</b_path>

+<f_translation>おじぎ</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_clap</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image (TIFF)

-                </e_new>

+<e_new>Clap</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        画像 (TIFF)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;text/html&quot;/</b_path>

+<f_translation>拍手</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_courtbow</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Web Page

-                </e_new>

+<e_new>Court Bow</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        ウェブ・ページ

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;text/plain&quot;/</b_path>

+<f_translation>深いおじぎ</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_cry</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Text

-                </e_new>

+<e_new>Cry</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        テキスト

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;text/xml&quot;/</b_path>

+<f_translation>泣く</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance1</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        XML

-                </e_new>

+<e_new>Dance 1</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        XML

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/mpeg&quot;/</b_path>

+<f_translation>ダンス1</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance2</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie (MPEG)

-                </e_new>

+<e_new>Dance 2</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        ムービー (MPEG)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/mp4&quot;/</b_path>

+<f_translation>ダンス2</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance3</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie (MP4)

-                </e_new>

+<e_new>Dance 3</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        ムービー (MP4)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/quicktime&quot;/</b_path>

+<f_translation>ダンス3</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance4</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie (QuickTime)

-                </e_new>

+<e_new>Dance 4</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        ムービー (QuickTime)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/x-ms-asf&quot;/</b_path>

+<f_translation>ダンス4</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance5</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie (Windows Media ASF)

-                </e_new>

+<e_new>Dance 5</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        ムービー (Windows Media ASF)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/x-ms-wmv&quot;/</b_path>

+<f_translation>ダンス5</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance6</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie (Windows Media WMV)

-                </e_new>

+<e_new>Dance 6</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        ムービー (Windows Media WMV)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/x-msvideo&quot;/</b_path>

+<f_translation>ダンス6</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance7</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie (AVI)

-                </e_new>

+<e_new>Dance 7</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        ムービー (AVI)

-                </f_translation>

-</string><string><a_file>notify.xml</a_file>

-<b_path>//RezItemNoPermissions/message</b_path>

+<f_translation>ダンス7</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance8</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Insufficient permissions to rez object.

-                </e_new>

+<e_new>Dance 8</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        オブジェクトをrezするにはパーミッション（承認）が不足してます。

-                </f_translation>

-</string><string><a_file>panel_audio.xml</a_file>

-<b_path>/Media panel/mute_audio</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>ダンス8</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_disdain</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Disdain</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-<f_old_trans></f_old_trans>

-</string><string><a_file>panel_audio.xml</a_file>

-<b_path>/Media panel/mute_music</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>侮蔑</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_drink</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Drink</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_audio.xml</a_file>

-<b_path>/Media panel/mute_media</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>酔っぱらう</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_embarrased</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Embarrassed</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_audio.xml</a_file>

-<b_path>/Media panel/mute_voice</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>困惑</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_angry_fingerwag</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Finger Wag</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_audio.xml</a_file>

-<b_path>/Media panel/mute_sfx</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>指を振る</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_fist_pump</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Fist Pump</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_audio.xml</a_file>

-<b_path>/Media panel/mute_wind</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>ガッツポーズ</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_yoga_float</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Floating Yoga</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_audio.xml</a_file>

-<b_path>/Media panel/mute_ui</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>ヨガ浮遊</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_frown</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Frown</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_groups.xml</a_file>

-<b_path>/groups/group list/name</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>しかめっ面</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_impatient</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Impatient</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_group_invite.xml</a_file>

-<b_path>/invite_panel/help_text</b_path>

+<f_translation>いらいらする</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_jumpforjoy</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                You can select multiple residents to 

-invite to your group. Click &apos;Open 

-Person Chooser&apos; to start.

-        </e_new>

+<e_new>Jump For Joy</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                あなたのグループに、一度に複数の人を招待することができます。［リストから人を選ぶ］をクリックしてください。

-        </f_translation>

-</string><string><a_file>panel_group_invite.xml</a_file>

-<b_path>/invite_panel/role_text</b_path>

+<f_translation>飛び上がって喜ぶ</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_kissmybutt</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Choose what Role to assign them to:

-        </e_new>

+<e_new>Kiss My Butt</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                割り当て先の役割を選択：

-        </f_translation>

-</string><string><a_file>panel_group_invite.xml</a_file>

-<b_path>/invite_panel/confirm_invite_owner_str</b_path>

+<f_translation>挑発ポーズ</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_kiss</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Are you sure you want to invite new owner(s)? This action is permanent!

-        </e_new>

+<e_new>Kiss</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                本当に新しい所有者を招待しますか?この操作は取り消しできません。

-        </f_translation>

-</string><string><a_file>panel_master_volume.xml</a_file>

-<b_path>/master_volume/mute_master</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>キス</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_laugh_short</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Laugh</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/play_label</b_path>

+<f_translation>笑う</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_musclebeach</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Play

-        </e_new>

+<e_new>Muscle Beach</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                再生

-        </f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/stop_label</b_path>

+<f_translation>力こぶを見せる</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_no_unhappy</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Stop

-        </e_new>

+<e_new>No (Unhappy)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                停止

-        </f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/pause_label</b_path>

+<f_translation>不満げに否定する</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_no_head</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Pause

-        </e_new>

+<e_new>No</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                一時停止

-        </f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/default_tooltip_label</b_path>

+<f_translation>否定する</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_nyanya</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                No Media Specified

-        </e_new>

+<e_new>Nya-nya-nya</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                メディアが指定されていません

-        </f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/media_hidden_label</b_path>

+<f_translation>冷やかす</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_punch_onetwo</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                (URL hidden by parcel owner)

-        </e_new>

+<e_new>One-Two Punch</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                （区画オーナーが URL を非表示に設定）

-        </f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/media_icon_tooltip_web</b_path>

+<f_translation>ワンツー・パンチ</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_open_mouth</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                This location displays content from the World Wide Web. Click the Play button to display Web content.

-        </e_new>

+<e_new>Open Mouth</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                このロケーションではワールド・ワイド・ウェブの内容が表示されます。ウェブ・コンテンツを表示するには［再生］ボタンをクリックしてください。

-        </f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/media_icon_tooltip_movie</b_path>

+<f_translation>口を開けて驚く</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_peace</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                This location displays Video content. Click the Play button to play the video.

-        </e_new>

+<e_new>Peace</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                このロケーションではビデオ・コンテンツが表示されます。ビデオを再生するには［再生］ボタンをクリックしてください。

-        </f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/media_play_tooltip</b_path>

+<f_translation>ピース・サイン</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_point_you</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Display Web content at this location.

-        </e_new>

+<e_new>Point at Other</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                このロケーションでウェブ・コンテンツを表示します。

-        </f_translation>

-</string><string><a_file>panel_place.xml</a_file>

-<b_path>/Place/name_label</b_path>

+<f_translation>他人を指差す</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_point_me</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Name:

-        </e_new>

+<e_new>Point at Self</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                名前：

-        </f_translation>

-</string><string><a_file>panel_place.xml</a_file>

-<b_path>/Place/description_label</b_path>

+<f_translation>自分を指差す</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_punch_l</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Description:

-        </e_new>

+<e_new>Punch Left</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                説明：

-        </f_translation>

-</string><string><a_file>panel_place.xml</a_file>

-<b_path>/Place/information_label</b_path>

+<f_translation>左パンチ</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_punch_r</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Information:

-        </e_new>

+<e_new>Punch Right</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                情報:

-        </f_translation>

-</string><string><a_file>panel_place.xml</a_file>

-<b_path>/Place/location_label</b_path>

+<f_translation>右パンチ</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_rps_countdown</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Location:

-        </e_new>

+<e_new>RPS count</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                ロケーション：

-        </f_translation>

-</string><string><a_file>panel_place_small.xml</a_file>

-<b_path>/Place/name_label</b_path>

+<f_translation>じゃんけんポーズ</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_rps_paper</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Name:

-        </e_new>

+<e_new>RPS paper</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                名前：

-        </f_translation>

-</string><string><a_file>panel_place_small.xml</a_file>

-<b_path>/Place/description_label</b_path>

+<f_translation>パー</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_rps_rock</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Description:

-        </e_new>

+<e_new>RPS rock</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                説明：

-        </f_translation>

-</string><string><a_file>panel_place_small.xml</a_file>

-<b_path>/Place/information_label</b_path>

+<f_translation>グー</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_rps_scissors</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Information:

-        </e_new>

+<e_new>RPS scissors</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                情報:

-        </f_translation>

-</string><string><a_file>panel_place_small.xml</a_file>

-<b_path>/Place/location_label</b_path>

+<f_translation>チョキ</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_repulsed</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Location:

-        </e_new>

+<e_new>Repulsed</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                ロケーション：

-        </f_translation>

-</string><string><a_file>panel_preferences_chat.xml</a_file>

-<b_path>/chat/im</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>嫌悪感</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_kick_roundhouse_r</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>IM</e_new>

+<e_new>Roundhouse Kick</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>IM</f_translation>

-</string><string><a_file>panel_preferences_general.xml</a_file>

-<b_path>/general_panel/fade_out_combobox/Never</b_path>

+<f_translation>まわし蹴り</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_sad</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Never

-                </e_new>

+<e_new>Sad</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        なし

-                </f_translation>

-</string><string><a_file>panel_preferences_general.xml</a_file>

-<b_path>/general_panel/fade_out_combobox/Show Temporarily</b_path>

+<f_translation>悲しむ</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_salute</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Show Temporarily

-                </e_new>

+<e_new>Salute</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        一時的に表示

-                </f_translation>

-</string><string><a_file>panel_preferences_general.xml</a_file>

-<b_path>/general_panel/fade_out_combobox/Always</b_path>

+<f_translation>敬礼する</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_shout</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Always

-                </e_new>

+<e_new>Shout</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        いつも

-                </f_translation>

-</string><string><a_file>panel_preferences_general.xml</a_file>

-<b_path>/general_panel/group_titles_textbox</b_path>

+<f_translation>叫ぶ</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_shrug</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Group Titles:

-        </e_new>

+<e_new>Shrug</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                グループ・タイトル:

-        </f_translation>

-</string><string><a_file>panel_preferences_general.xml</a_file>

-<b_path>/general_panel/show_all_title_checkbox</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>肩をすくめる</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_smile</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Hide All Group Titles</e_new>

+<e_new>Smile</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>��ループ・タイトルをすべて非表示</f_translation>

-</string><string><a_file>panel_preferences_graphics1.xml</a_file>

-<b_path>/Display panel/QualityPerformanceSelection</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>微笑��</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_smoke_idle</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Smoke Idle</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_preferences_input.xml</a_file>

-<b_path>/Input panel/Camera Follow Distance:</b_path>

+<f_translation>たばこをくゆらす</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_smoke_inhale</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Camera Follow Distance:

-        </e_new>

+<e_new>Smoke Inhale</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                カメラ追従距離:

-        </f_translation>

-</string><string><a_file>panel_preferences_input.xml</a_file>

-<b_path>/Input panel/Camera Transition Time:</b_path>

+<f_translation>たばこを吸う</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_smoke_throw_down</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Camera Transition Time:

-        </e_new>

+<e_new>Smoke Throw Down</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                カメラ移動時間:

-        </f_translation>

-</string><string><a_file>panel_preferences_input.xml</a_file>

-<b_path>/Input panel/Camera Smoothing:</b_path>

+<f_translation>たばこを捨てる</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_surprise</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Camera Smoothing:

-        </e_new>

+<e_new>Surprise</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                カメラ・スムージング:

-        </f_translation>

-</string><string><a_file>panel_preferences_input.xml</a_file>

-<b_path>/Input panel/joystic_setup_button</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>驚く</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_sword_strike_r</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Joystick Setup</e_new>

+<e_new>Sword Strike</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>���������������ック設定</f_translation>

-</string><string><a_file>panel_preferences_popups.xml</a_file>

-<b_path>/popups/dont_show_label</b_path>

+<f_translation>剣���斬����������</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_angry_tantrum</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Do not show popups:

-        </e_new>

+<e_new>Tantrum</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                ポップアップを表示しない：

-        </f_translation>

-</string><string><a_file>panel_preferences_popups.xml</a_file>

-<b_path>/popups/show_label</b_path>

+<f_translation>じだんだを踏む</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_tongue_out</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Show popups:

-        </e_new>

+<e_new>TongueOut</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                ポップアップを表示：

-        </f_translation>

-</string><string><a_file>panel_speaker_controls.xml</a_file>

-<b_path>/active_speakers_panel/panels/moderation_mode_panel/moderation_mode/OpenVoice</b_path>

+<f_translation>舌を出す</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_hello</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                                        Open Voice (default)

-                                </e_new>

+<e_new>Wave</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                                        ボイスを開く（デフォルト）

-                                </f_translation>

-</string><string><a_file>panel_speaker_controls.xml</a_file>

-<b_path>/active_speakers_panel/panels/moderation_mode_panel/moderation_mode/ModeratedVoice</b_path>

+<f_translation>手を振る</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_whisper</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                                        Moderated Voice

-                                </e_new>

+<e_new>Whisper</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                                        モデレート済みボイス

-                                </f_translation>

-</string><string><a_file>panel_speaker_controls.xml</a_file>

-<b_path>/active_speakers_panel/panels/moderate_chat_panel/speakers_list/speaking_status</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>小声で話す</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_whistle</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Whistle</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_speaker_controls.xml</a_file>

-<b_path>/active_speakers_panel/panels/moderate_chat_panel/speaker_controls/profile_btn</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>口笛を吹く</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_wink</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Wink</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_status_bar.xml</a_file>

-<b_path>/status/menubar_search_bevel_bg</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>ウィンク</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_wink_hollywood</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Wink (Hollywood)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_voice_remote_expanded.xml</a_file>

-<b_path>/voice_remote/voice_channel_bg</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>ウィンク(ハリウッド)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_worry</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Worry</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_voice_remote_expanded.xml</a_file>

-<b_path>/voice_remote/voice_channel_icon</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>心配する</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_yes_happy</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Yes (Happy)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_voice_remote_expanded.xml</a_file>

-<b_path>/voice_remote/channel_label</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>笑顔で頷く</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_yes_head</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Yes</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

+<f_translation>頷く</f_translation>

 </string>

 </strings>

diff --git a/linden/indra/newview/skins/xui/ja/need_to_update.xml b/linden/indra/newview/skins/xui/ja/need_to_update.xml
index 2c3305f..c8763a5 100644
--- a/linden/indra/newview/skins/xui/ja/need_to_update.xml
+++ b/linden/indra/newview/skins/xui/ja/need_to_update.xml
@@ -2,340 +2,176 @@
 

 <strings>

 <string><a_file>alerts.xml</a_file>

-<b_path>//GrantModifyRights/message</b_path>

+<b_path>//ClothingLoading/message</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        Granting modify rights to another resident allows them to change 

-ANY objects you may have in-world. Be VERY careful when handing 

-out this permission.

-Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?

+                        Your clothing is still downloading.

+You can use the world normally, and other users

+will see you correctly.

                 </d_old>

 <e_new>

-                        Granting modify rights to another resident allows them to change,

-delete or take ANY objects you may have in-world. Be VERY careful

-when handing out this permission.

-Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?

+                        Your clothing is still downloading. 

+You can use [SECOND_LIFE] normally and other users will see you correctly.

                 </e_new>

 <f_translation>

-                        他の住人に変更権限を与えると、その人はあなたが所有している

-すべてのオブジェクトを変更、削除、または取得することができるようになります。この許可を与えるときは細心の注意を払ってください。

-[FIRST_NAME][LAST_NAME]に対して変更権限を与えますか？

+                        あなたの服を、ダウンロード中です。 

+通常どおりに[SECOND_LIFE]を使え、他のユーザーもあなたを正常に見ることができます。

                 </f_translation>

 <f_old_trans>

-                        他��住人に変更権限���与�����������そ��人���������������所有���������

-すべてのオブジェクトを変更できるようになります。 この許可を与えるときには細心の注意を払ってください。

-[FIRST_NAME] [LAST_NAME]に変更権限��与��ます���？

+                        あ����の服���������������������中�������

+通常どおりに世界を使え、他のユーザーもあなたを

+正常に見������ができ��す���

                 </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotBuyLandNoRegion/message</b_path>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/places_panel/searching_text</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        Unable to buy land:

-Cannot find the region this land is in.

-                </d_old>

-<e_new>

-                        Unable to buy land:

-                        Cannot find the region this land is in.

-                </e_new>

-<f_translation>

-                        土地を購入できません：

-                        この土地がある地域を見つけることができません。

-                </f_translation>

+                                Searching...

+                        </d_old>

+<e_new>Searching...</e_new>

+<f_translation>検索中...</f_translation>

 <f_old_trans>

-                        土地を購入できません：

-この土地がある地域が見つかりません。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ParcelCanPlayMedia/message</b_path>

+                                検索中...

+                        </f_old_trans>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/places_panel/not_found_text</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        This location can play streaming video. 

-Streaming video requires a 768 kbps or 

-faster Internet connection.

- 

-Play streaming video when available?

-(You can change this option later under 

-Preferences &gt; Audio &amp; Video.)

-                </d_old>

-<e_new>

-                        This location can play streaming media. 

-Streaming media requires a fast Internet connection.

- 

-Play streaming media when available?

-(You can change this option later under 

-Preferences &gt; Audio &amp; Video.)

-                </e_new>

-<f_translation>

-                        ここではストリーミング・メディア再生が可能です。 

-メディアのストリーミングには、高速なインターネット接続環境が必要です。

- 

-利用可能になったら再生しますか？

-(このオプションは、［環境設定］＞［オーディオ＆ビデオ］で後からでも変更できます)

-                </f_translation>

+                                None Found.

+                        </d_old>

+<e_new>None Found.</e_new>

+<f_translation>何も見つかりませんでした。</f_translation>

 <f_old_trans>

-                        ここではストリーミング・ビデオ再生が可能です。 

-ビデオの再生には768 kbpsより速い

-接続環境が必要です。

- 

-利用可能になったら再生しますか？

-（このオプションは、

-[環境設定]＞[音声とビデオ]を通じて後からでも変更できます)

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ConfirmClearBrowserCache/message</b_path>

+                                何も見つかりませんでした

+                        </f_old_trans>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/people_panel/find</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        Are you sure you want to clear your

-browser cache?

-                </d_old>

+                                Find:

+                        </d_old>

 <e_new>

-                        Are you sure you want to clear your browser cache?

-                </e_new>

+        Find:

+      </e_new>

 <f_translation>

-                        ��当にブラウザのキャッシュをクリ��しますか?

-                </f_translation>

+�����:

+      </f_translation>

 <f_old_trans>

-                        本当にブラウザのキャッシュを

-クリアしますか？

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpWaterNormalMap/message</b_path>

+                                検索：

+                        </f_old_trans>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/searching_text</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        Controls what normal map is layered across the water

-to determine reflections/refractions.

-                </d_old>

-<e_new>

-                        Controls what normal map is layered across the water to determine reflections/refractions.

-                </e_new>

-<f_translation>

-                        反射や屈折を決定するために水に重ねられるノーマル・マップを制御します。

-                </f_translation>

+                                Searching...

+                        </d_old>

+<e_new>Searching...</e_new>

+<f_translation>検索中...</f_translation>

 <f_old_trans>

-                        反射や屈折を決定するために水に重ねられるノーマル・マップを制御します。

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpWaterWave1/message</b_path>

+                                検索中...

+                        </f_old_trans>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/not_found_text</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                                None Found.

+                        </d_old>

+<e_new>None Found.</e_new>

+<f_translation>何も見つかりませんでした。</f_translation>

+<f_old_trans>

+                                何も見つかりませんでした

+                        </f_old_trans>

+</string><string><a_file>floater_script_debug.xml</a_file>

+<b_path>/script debug floater</b_path>

+<c_attribute>title</c_attribute>

+<d_old>Script Errors/Warning</d_old>

+<e_new>Script Warning/Error</e_new>

+<f_translation>スクリプト警告/エラー</f_translation>

+<f_old_trans>スクリプト・エラー／警告</f_old_trans>

+</string><string><a_file>floater_world_map.xml</a_file>

+<b_path>/worldmap/friend combo</b_path>

+<c_attribute>label</c_attribute>

+<d_old>My Friends</d_old>

+<e_new>Online Friends</e_new>

+<f_translation>オンラインのフレンド</f_translation>

+<f_old_trans>自分のフレンド</f_old_trans>

+</string><string><a_file>floater_world_map.xml</a_file>

+<b_path>/worldmap/friend combo/none_selected</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        Controls where and how fast the large scaled version of the normal

-map moves in the X and Y direction.

+                        My Friends

                 </d_old>

 <e_new>

-                        Controls where and how fast the large scaled version of the normal map moves in the X and Y direction.

+                        Online Friends

                 </e_new>

 <f_translation>

-                        拡大されたノーマル・マップが移動する方向（X 軸と Y 軸で表現）と速度を制御します。

+                        オンラインのフレンド

                 </f_translation>

 <f_old_trans>

-                        引き伸ばされたノーマル・マップがX と Y 軸でどの方向にそして

-どのくらいの速度で移動するかを制御します。

+                        自分のフレンド

                 </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpWaterWave2/message</b_path>

+</string><string><a_file>floater_world_map.xml</a_file>

+<b_path>/worldmap/landmark combo</b_path>

+<c_attribute>label</c_attribute>

+<d_old>My Landmarks</d_old>

+<e_new>Landmarks</e_new>

+<f_translation>ランドマーク</f_translation>

+<f_old_trans>自分のランドマーク</f_old_trans>

+</string><string><a_file>floater_world_map.xml</a_file>

+<b_path>/worldmap/landmark combo/none_selected</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        Controls where and how fast the the small scaled version of the

-normal map moves in the X and Y direction.

+                        My Landmarks

                 </d_old>

 <e_new>

-                        Controls where and how fast the the small scaled version of the normal map moves in the X and Y direction.

+                        Landmarks

                 </e_new>

 <f_translation>

-                        縮小されたノーマル・マップが移動する方向（X 軸と Y 軸で表現）と速度を制御します。

+                        ランドマーク

                 </f_translation>

 <f_old_trans>

-                        縮められたノーマル・マップがX と Y 軸でどの方向にそしてどのくらいの速度で移動するかを制御します。

+                        自分のランドマーク

                 </f_old_trans>

-</string><string><a_file>floater_buy_land.xml</a_file>

-<b_path>/buy land/land_use_reason</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                You hold 1,309 square meters of land.

-This parcel is 512 square meters of land.

-        </d_old>

-<e_new>

-                You hold 1,309 square meters of land. 

-This parcel is 512 square meters of land.

-        </e_new>

-<f_translation>

-                あなたは1,309平方メートルの土地を所有しています。 

-この区画は512平方メートルです。

-        </f_translation>

-<f_old_trans>

-                あなたには1,309平方メートルの土地があります。

-この区画は 512平方メートルです。

-        </f_old_trans>

-</string><string><a_file>floater_buy_land.xml</a_file>

-<b_path>/buy land/multiple_parcels_selected</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                Multiple different parcels selected.

-Try selecting a smaller area.

-        </d_old>

-<e_new>

-                Multiple different parcels selected. 

-Try selecting a smaller area.

-        </e_new>

-<f_translation>

-                複数の異なった区画を選択しました。 

-これより小さなエリアを選択してください。

-        </f_translation>

-<f_old_trans>

-                複数の区域が選択されています。

-選択領域を狭めてみてください。

-        </f_old_trans>

-</string><string><a_file>floater_buy_land.xml</a_file>

-<b_path>/buy land/not_owned_by_you</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                Land owned by another user is selected.

-Try selecting a smaller area.

-        </d_old>

-<e_new>

-                Land owned by another user is selected. 

-Try selecting a smaller area.

-        </e_new>

-<f_translation>

-                他の使用者に所有された土地が選択されています。 

-これより小さなエリアを選択してください。

-        </f_translation>

-<f_old_trans>

-                選択した土地は、他のユーザーが所有しています。

-選択領域を狭めてみてください。

-        </f_old_trans>

-</string><string><a_file>floater_buy_land.xml</a_file>

-<b_path>/buy land/for_first_time_group</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                This land is reserved for first time buyers.

-You cannot buy it for a group.

-        </d_old>

-<e_new>

-                This land is reserved for first time buyers. 

-You cannot buy it for a group.

-        </e_new>

-<f_translation>

-                本土地は初めて土地購入をする人のために確保されています。 

-グループのために購入することはできません。

-        </f_translation>

-<f_old_trans>

-                これは初めて土地を購入する人用の土地です。

-グループ用には購入できません。

-        </f_old_trans>

-</string><string><a_file>floater_buy_land.xml</a_file>

-<b_path>/buy land/for_first_time</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                This land is reserved for first time buyers.

-You already own land.

-        </d_old>

-<e_new>

-                This land is reserved for first time buyers. 

-You already own land.

-        </e_new>

-<f_translation>

-                本土地は初めて土地購入をする人のために確保されています。 

-あなたは、すでに土地を所有しています。

-        </f_translation>

-<f_old_trans>

-                これは初めて土地を購入する人用の土地です。

-あなたはすでに土地を持っています。

-        </f_old_trans>

-</string><string><a_file>floater_gesture.xml</a_file>

-<b_path>/gestures/help_label</b_path>

+</string><string><a_file>panel_avatar_classified.xml</a_file>

+<b_path>/Classified/classified_mature_check</b_path>

+<c_attribute>label</c_attribute>

+<d_old>Mature</d_old>

+<e_new></e_new>

+<f_translation></f_translation>

+<f_old_trans>成人</f_old_trans>

+</string><string><a_file>panel_group_notices.xml</a_file>

+<b_path>/notices_tab/lbl2</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                Click a gesture or press a key to play animations and sounds.

+                Notices are kept for 30 days. Click the notice below you wish to view.

+Click the &apos;Refresh&apos; button to check if new notices have been received.

         </d_old>

 <e_new>

-                Double-click a gesture to play animations and sounds.

+                Notices are kept for 14 days. Click the notice below you wish to view.

+Click the &apos;Refresh&apos; button to check if new notices have been received.

+Notice lists are limited to 200 notices per group on a daily basis.

         </e_new>

 <f_translation>

-                ジェスチャーをダブルクリックして、アニメーションとサウンドを再生。

+                通知は、14日間保存されます。閲覧したい通知をクリックしてください。

+新着の通知をチェックするには、[更新]ボタンをクリックします。

+ただし、各グループの通知リストは1日あたり200通に制限されます。

         </f_translation>

 <f_old_trans>

-                ジェスチャーをクリックするか、キーを押してアニメーションとサウンドを再生。

-        </f_old_trans>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick</b_path>

-<c_attribute>title</c_attribute>

-<d_old>Flycam Options</d_old>

-<e_new>Joystick Configuration</e_new>

-<f_translation>ジョイスティックの設定</f_translation>

-</string><string><a_file>floater_preview_notecard_keep_discard.xml</a_file>

-<b_path>/preview_notecard/no_object</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                Unable to find object containing this note.:

-        </d_old>

-<e_new>Unable to find object containing this note.:</e_new>

-<f_translation>このノートを含んだオブジェクトが見つかりません:</f_translation>

-<f_old_trans>

-                このノートを含んだオブジェクトが見つかりません:

+                通知は、14日間保存されます。 閲覧したい通知をクリックしてください。

+新着の通知をチェックするには、[更新]ボタンをクリックします。

         </f_old_trans>

-</string><string><a_file>panel_friends.xml</a_file>

-<b_path>/friends/friend_list/icon_edit_mine</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old>Friend can edit your objects</d_old>

-<e_new>Friend can edit, delete or take objects</e_new>

-<f_translation>フレンドは、オブジェクトを編集、削除、または取得することができます。</f_translation>

-<f_old_trans>フレンドは、あなたのオブジェクトを編集することができます。</f_old_trans>

-</string><string><a_file>panel_group_invite.xml</a_file>

-<b_path>/invite_panel/invitee_list</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old>Hold the Ctrl key and click resident names  to multi-select.</d_old>

-<e_new>Hold the Ctrl key and click resident names to multi-select.</e_new>

-<f_translation>複数の住人を選択するには、Ctrlキーを押しながら住人名をクリックします。</f_translation>

-<f_old_trans>複数の住人を選択するには、Ctrlキーを押しながら住人名をクリックします。</f_old_trans>

-</string><string><a_file>panel_group_invite.xml</a_file>

-<b_path>/invite_panel/role_name</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old>Choose from the list of Roles you  are allowed to assign members to.</d_old>

-<e_new>Choose from the list of Roles you are allowed to assign members to.</e_new>

-<f_translation>メンバーに割り当て可能な役割をリストから選択。</f_translation>

-<f_old_trans>Choose from the list of Roles you  are allowed to assign members to.</f_old_trans>

-</string><string><a_file>panel_group_invite.xml</a_file>

-<b_path>/invite_panel/loading</b_path>

+</string><string><a_file>panel_login.xml</a_file>

+<b_path>/panel_login/forgot_password_text</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                (loading...)

+                Forgot your password?

         </d_old>

-<e_new>(loading...)</e_new>

-<f_translation>(ローディング．．．)</f_translation>

-<f_old_trans>

-                (ローディング．．．)

-        </f_old_trans>

-</string><string><a_file>panel_preferences_chat.xml</a_file>

-<b_path>/chat/users</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Users</d_old>

-<e_new>Chat</e_new>

-<f_translation>チャット</f_translation>

-<f_old_trans>ﾕｰｻﾞｰ</f_old_trans>

-</string><string><a_file>panel_preferences_voice.xml</a_file>

-<b_path>/chat/device_settings_text</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                NOTE: Running the Device Settings or Voice Chat Setup will temporarily disconnect you from Voice Chat.

-        </d_old>

-<e_new>

-                NOTE: Running the Device Settings will temporarily disconnect you from Voice Chat.

+<e_new>Forgot your name or password?

         </e_new>

-<f_translation>

-                注意：「機器の設定」を実行すると、一時的にボイス・チャットから切断されます。

+<f_translation>名前またはパスワードをお忘れですか?

         </f_translation>

 <f_old_trans>

-                メモ： 「機器の設定」または「ボイス・チャットの設定」を実行すると、一時的にボイス・チャットから切断されます。

+                パスワードをお忘れですか?

         </f_old_trans>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/Redock Windows</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                Redock Windows

-        </d_old>

-<e_new>Redock Windows</e_new>

-<f_translation>ウィンドウを再置する</f_translation>

-<f_old_trans>ウィンドウを再置する</f_old_trans>

 </string>

 </strings>

diff --git a/linden/indra/newview/skins/xui/ja/notify.xml b/linden/indra/newview/skins/xui/ja/notify.xml
index d4c2661..1a10704 100644
--- a/linden/indra/newview/skins/xui/ja/notify.xml
+++ b/linden/indra/newview/skins/xui/ja/notify.xml
@@ -916,6 +916,21 @@ Mキーを押して移行します。
                         ミュート
                 </option>
         </notify>
+        <notify name="AutoUnmuteByIM">
+                <message name="message">
+                        [FIRST] [LAST]にインスタント・メッセージが送信され、ミュートが自動的に解除されました。
+                </message>
+        </notify>
+        <notify name="AutoUnmuteByMoney">
+                <message name="message">
+                        [FIRST] [LAST]にお金が与えられ、ミュートが自動的に解除されました。
+                </message>
+        </notify>
+        <notify name="AutoUnmuteByInventory">
+                <message name="message">
+                        [FIRST] [LAST]に持ち物が与えられ、ミュートが自動的に解除されました。
+                </message>
+        </notify>
         <notify name="VoiceInviteGroup">
                 <message name="message">
                         [NAME]が、グループ[GROUP]とのボイスチャットコールに参加しました。 
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 713fb01..c4a1328 100644
--- a/linden/indra/newview/skins/xui/ja/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_avatar_classified.xml
@@ -8,7 +8,17 @@
         <button label="テレポート" name="classified_teleport_btn" />
         <button label="地図" name="classified_map_btn" />
         <combo_box label="" name="classified_category_combo" />
-        <check_box label="成人" name="classified_mature_check" />
+        <check_box label="成人" name="classified_mature_check">
+                <combo_item name="select_mature">
+                        -成熟度を選択-
+                </combo_item>
+                <combo_item name="mature">
+                        成人向けコンテンツ
+                </combo_item>
+                <combo_item name="not_mature">
+                        非成人向けコンテンツ
+                </combo_item>
+        </check_box>
         <text name="classified_info_text"
              tool_tip="広告料を多く払うほど、広告の掲載順は上がります。">
                 広告掲載：未発行
diff --git a/linden/indra/newview/skins/xui/ja/panel_classified.xml b/linden/indra/newview/skins/xui/ja/panel_classified.xml
index 7d12719..22113f7 100644
--- a/linden/indra/newview/skins/xui/ja/panel_classified.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_classified.xml
@@ -8,7 +8,17 @@
         <button label="テレポート" name="classified_teleport_btn" />
         <button label="地図上に表示" name="classified_map_btn" />
         <button label="プロフィール" name="classified_profile_btn" />
-        <check_box label="成人" name="classified_mature_check" />
+        <check_box label="成人" name="classified_mature_check">
+                <combo_item name="select_mature">
+                        -成熟度を選択-
+                </combo_item>
+                <combo_item name="mature">
+                        成人向けコンテンツ
+                </combo_item>
+                <combo_item name="not_mature">
+                        非成人向けコンテンツ
+                </combo_item>
+        </check_box>
         <combo_box label="" name="classified_category_combo" />
         <button label="更新" name="classified_update_btn" />
         <string name="ad_placed_paid">
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 7c3b5bc..bed2bed 100644
--- a/linden/indra/newview/skins/xui/ja/panel_group_general.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_group_general.xml
@@ -79,6 +79,18 @@
                      tool_tip="「入会費」がチェックされている場合、新規会員は入会時にこの費用を支払う必要があります。" />
                 <check_box label="成人向けグループ" name="mature"
                      tool_tip="あなたのグループ情報が成人向けとみなされるかどうかを指定します。" />
+                <combo_box name="group_mature_check"
+                     tool_tip="あなたのグループ情報が成人向けとみなされるかどうかを指定します。">
+                        <combo_item name="select_mature">
+                                -成熟度を選択-
+                        </combo_item>
+                        <combo_item name="mature">
+                                成人向けコンテンツ
+                        </combo_item>
+                        <combo_item name="not_mature">
+                                非成人向けコンテンツ
+                        </combo_item>
+                </combo_box>
                 <panel name="title_container">
                         <text name="active_title_label">
                                 私のアクティブ・タイトル
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 f63c368..2bdc45f 100644
--- a/linden/indra/newview/skins/xui/ja/panel_group_notices.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_group_notices.xml
@@ -15,8 +15,9 @@
                 グループ通知アーカイブ
         </text>
         <text name="lbl2">
-                通知は、14日間保存されます。 閲覧したい通知をクリックしてください。
+                通知は、14日間保存されます。閲覧したい通知をクリックしてください。
 新着の通知をチェックするには、[更新]ボタンをクリックします。
+ただし、各グループの通知リストは1日あたり200通に制限されます。
         </text>
         <scroll_list name="notice_list">
                 <column label="" name="icon" />
diff --git a/linden/indra/newview/skins/xui/ja/panel_login.xml b/linden/indra/newview/skins/xui/ja/panel_login.xml
index df51507..f908a1f 100644
--- a/linden/indra/newview/skins/xui/ja/panel_login.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_login.xml
@@ -39,7 +39,7 @@
                 [Viewer Channel Name]
         </text>
         <text name="forgot_password_text">
-                パスワードをお忘れですか?
+                名前���たは���スワードをお忘れですか?
         </text>
         <text name="forgot_password_url">
                 http://secondlife.com/account/request.php
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml
index 19e443a..60de066 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml
@@ -14,9 +14,29 @@
         <text type="string" length="1" name="(width / height)">
                 （幅／高さ）
         </text>
-        <text_editor name="FullScreenInfo" width="480" bottom="-56" height="40">
+        <text_editor bottom="-56" height="40" name="FullScreenInfo" width="480">
                 チェックされていない場合は、ログインするとビューワがフルスクリーンで表示されます。
         </text_editor>
+        <text name="WindowSizeLabel">
+                ウィンドウ・サイズ:
+        </text>
+        <combo_box name="windowsize combo">
+                <combo_item name="640x480">
+                        640x480
+                </combo_item>
+                <combo_item name="800x600">
+                        800x600
+                </combo_item>
+                <combo_item name="720x480">
+                        720x480 (NTSC)
+                </combo_item>
+                <combo_item name="768x576">
+                        768x576 (PAL)
+                </combo_item>
+                <combo_item name="1024x768">
+                        1024x768
+                </combo_item>
+        </combo_box>
         <text name="DisplayResLabel">
                 表示解像度：
         </text>
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_web.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_web.xml
index 0ed6c57..72dd64d 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_preferences_web.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <panel label="ウェブ" name="web">

         <radio_group name="use_external_browser">

-                <radio_item name="external" tool_tip="ヘルプ、Webリンクなどのために、外部Webブラウザを使用します。フル画面で実行している場合には推奨できません。">

+                <radio_item name="external"

+                     tool_tip="ヘルプ、Webリンクなどのために、外部Webブラウザを使用します。フル画面で実行している場合には推奨できません。">

                         外部のウェブ・ブラウザー (Firefox, Safari, Internet Explorer) を使用

                 </radio_item>

-                <radio_item name="internal">

+                <radio_item name="internal"

+                     tool_tip="ヘルプやWebリンクに埋め込みWebブラウザを使用します。ブラウザはSecond Lifeの新しいウィンドウとして開きます。">

                         内蔵のウェブ・ブラウザーを使用

                 </radio_item>

         </radio_group>

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 6b0cfb4..0708c9c 100644
--- a/linden/indra/newview/skins/xui/ja/panel_region_general.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_region_general.xml
@@ -6,6 +6,12 @@
         <text name="region_text">
                 未知
         </text>
+        <text name="version_channel_text_lbl">
+                バージョン:
+        </text>
+        <text name="version_channel_text">
+                不明
+        </text>
         <check_box label="土地整備をブロック" name="block_terraform_check" />
         <button label="?" name="terraform_help" />
         <check_box label="飛行をブロック" name="block_fly_check" />
diff --git a/linden/indra/newview/skins/xui/ja/strings.xml b/linden/indra/newview/skins/xui/ja/strings.xml
new file mode 100644
index 0000000..700f6bd
--- /dev/null
+++ b/linden/indra/newview/skins/xui/ja/strings.xml
@@ -0,0 +1,390 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<strings name="">

+        <string name="LoginInProgress">

+                ログイン中です。[APP_NAME]の表示がフリーズする場合があります。  しばらくお待ちください。

+        </string>

+        <string name="LoginAuthenticating">

+                認証しています...

+        </string>

+        <string name="LoginMaintenance">

+                アカウント・メンテナンスを実行しています...

+        </string>

+        <string name="LoginAttempt">

+                前回のログインに失敗しました。 ログイン中です([NUMBER]回目)

+        </string>

+        <string name="LoginPrecaching">

+                ワールドをロードしています...

+        </string>

+        <string name="LoginInitializingBrowser">

+                埋め込みWebブラウザを初期化しています...

+        </string>

+        <string name="LoginVerifyingCache">

+                キャッシュ・ファイルを検証しています(所要時間は60～90秒)...

+        </string>

+        <string name="LoginProcessingResponse">

+                応答を処理しています...

+        </string>

+        <string name="LoginInitializingWorld">

+                ワールドを初期化しています...

+        </string>

+        <string name="LoginDecodingImages">

+                画像をデコードしています...

+        </string>

+        <string name="LoginInitializingQuicktime">

+                QuickTimeを初期化しています...

+        </string>

+        <string name="LoginQuicktimeNotFound">

+                QuickTimeが見つかりません。初期化に失敗しました。

+        </string>

+        <string name="LoginQuicktimeOK">

+                QuickTimeが正常に初期化されました。

+        </string>

+        <string name="LoginWaitingForRegionHandshake">

+                地域のハンドシェイクを待っています...

+        </string>

+        <string name="LoginConnectingToRegion">

+                地域に接続しています...

+        </string>

+        <string name="LoginDownloadingClothing">

+                服をダウンロードしています...

+        </string>

+        <string name="TooltipPerson">

+                人

+        </string>

+        <string name="TooltipNoName">

+                (名前なし)

+        </string>

+        <string name="TooltipOwner">

+                オーナー:

+        </string>

+        <string name="TooltipPublic">

+                公共

+        </string>

+        <string name="TooltipIsGroup">

+                (グループ)

+        </string>

+        <string name="TooltipFlagScript">

+                スクリプト

+        </string>

+        <string name="TooltipFlagPhysics">

+                物理作用

+        </string>

+        <string name="TooltipFlagTouch">

+                触る

+        </string>

+        <string name="TooltipFlagL$">

+                L$

+        </string>

+        <string name="TooltipFlagDropInventory">

+                持ち物をドロップする

+        </string>

+        <string name="TooltipFlagPhantom">

+                ファントム

+        </string>

+        <string name="TooltipFlagTemporary">

+                一時的

+        </string>

+        <string name="TooltipFlagRightClickMenu">

+                (右クリックでメニューを表示)

+        </string>

+        <string name="TooltipFreeToCopy">

+                コピー可能

+        </string>

+        <string name="TooltipForSaleL$">

+                売り出し中:L$[AMOUNT]

+        </string>

+        <string name="TooltipForSaleMsg">

+                売り出し中: [MESSAGE]

+        </string>

+        <string name="TooltipFlagGroupBuild">

+                グループ作成

+        </string>

+        <string name="TooltipFlagNoBuild">

+                作成禁止

+        </string>

+        <string name="TooltipFlagNoEdit">

+                グループ作成

+        </string>

+        <string name="TooltipFlagNotSafe">

+                危険

+        </string>

+        <string name="TooltipFlagNoFly">

+                飛行禁止

+        </string>

+        <string name="TooltipFlagGroupScripts">

+                グループ・スクリプト

+        </string>

+        <string name="TooltipFlagNoScripts">

+                スクリプトなし

+        </string>

+        <string name="TooltipLand">

+                土地:

+        </string>

+        <string name="RetrievingData">

+                検索中...

+        </string>

+        <string name="LoadingData">

+                ロード中...

+        </string>

+        <string name="AvatarNameNobody">

+                (無人)

+        </string>

+        <string name="AvatarNameWaiting">

+                (待機中)

+        </string>

+        <string name="AvatarNameHippos">

+                (カバ)

+        </string>

+        <string name="GroupNameNone">

+                (なし)

+        </string>

+        <string name="AssetErrorNone">

+                エラーなし

+        </string>

+        <string name="AssetErrorRequestFailed">

+                資産の要求: 失敗

+        </string>

+        <string name="AssetErrorNonexistentFile">

+                資産の要求: 存在しないファイル

+        </string>

+        <string name="AssetErrorNotInDatabase">

+                資産の要求: データベースでは見つからない資産

+        </string>

+        <string name="AssetErrorEOF">

+                ファイルの終わり

+        </string>

+        <string name="AssetErrorCannotOpenFile">

+                ファイルを開くことができません

+        </string>

+        <string name="AssetErrorFileNotFound">

+                ファイルが見つかりません

+        </string>

+        <string name="AssetErrorTCPTimeout">

+                ファイル転送タイムアウトです

+        </string>

+        <string name="AssetErrorCircuitGone">

+                接続が解除されました

+        </string>

+        <string name="AssetErrorUnknownStatus">

+                ステータスが不明です

+        </string>

+        <string name="AvatarEditingApparance">

+                (容姿の編集)

+        </string>

+        <string name="AvatarAway">

+                退席中

+        </string>

+        <string name="AvatarBusy">

+                取り込み中

+        </string>

+        <string name="AvatarMuted">

+                ミュート

+        </string>

+        <string name="anim_express_afraid">

+                怖れ

+        </string>

+        <string name="anim_express_anger">

+                怒り

+        </string>

+        <string name="anim_away">

+                退席中

+        </string>

+        <string name="anim_backflip">

+                後ろ宙返り

+        </string>

+        <string name="anim_express_laugh">

+                大笑い

+        </string>

+        <string name="anim_express_toothsmile">

+                満面の笑顔

+        </string>

+        <string name="anim_blowkiss">

+                投げキッス

+        </string>

+        <string name="anim_express_bored">

+                退屈

+        </string>

+        <string name="anim_bow">

+                おじぎ

+        </string>

+        <string name="anim_clap">

+                拍手

+        </string>

+        <string name="anim_courtbow">

+                深いおじぎ

+        </string>

+        <string name="anim_express_cry">

+                泣く

+        </string>

+        <string name="anim_dance1">

+                ダンス1

+        </string>

+        <string name="anim_dance2">

+                ダンス2

+        </string>

+        <string name="anim_dance3">

+                ダンス3

+        </string>

+        <string name="anim_dance4">

+                ダンス4

+        </string>

+        <string name="anim_dance5">

+                ダンス5

+        </string>

+        <string name="anim_dance6">

+                ダンス6

+        </string>

+        <string name="anim_dance7">

+                ダンス7

+        </string>

+        <string name="anim_dance8">

+                ダンス8

+        </string>

+        <string name="anim_express_disdain">

+                侮蔑

+        </string>

+        <string name="anim_drink">

+                酔っぱらう

+        </string>

+        <string name="anim_express_embarrased">

+                困惑

+        </string>

+        <string name="anim_angry_fingerwag">

+                指を振る

+        </string>

+        <string name="anim_fist_pump">

+                ガッツポーズ

+        </string>

+        <string name="anim_yoga_float">

+                ヨガ浮遊

+        </string>

+        <string name="anim_express_frown">

+                しかめっ面

+        </string>

+        <string name="anim_impatient">

+                いらいらする

+        </string>

+        <string name="anim_jumpforjoy">

+                飛び上がって喜ぶ

+        </string>

+        <string name="anim_kissmybutt">

+                挑発ポーズ

+        </string>

+        <string name="anim_express_kiss">

+                キス

+        </string>

+        <string name="anim_laugh_short">

+                笑う

+        </string>

+        <string name="anim_musclebeach">

+                力こぶを見せる

+        </string>

+        <string name="anim_no_unhappy">

+                不満げに否定する

+        </string>

+        <string name="anim_no_head">

+                否定する

+        </string>

+        <string name="anim_nyanya">

+                冷やかす

+        </string>

+        <string name="anim_punch_onetwo">

+                ワンツー・パンチ

+        </string>

+        <string name="anim_express_open_mouth">

+                口を開けて驚く

+        </string>

+        <string name="anim_peace">

+                ピース・サイン

+        </string>

+        <string name="anim_point_you">

+                他人を指差す

+        </string>

+        <string name="anim_point_me">

+                自分を指差す

+        </string>

+        <string name="anim_punch_l">

+                左パンチ

+        </string>

+        <string name="anim_punch_r">

+                右パンチ

+        </string>

+        <string name="anim_rps_countdown">

+                じゃんけんポーズ

+        </string>

+        <string name="anim_rps_paper">

+                パー

+        </string>

+        <string name="anim_rps_rock">

+                グー

+        </string>

+        <string name="anim_rps_scissors">

+                チョキ

+        </string>

+        <string name="anim_express_repulsed">

+                嫌悪感

+        </string>

+        <string name="anim_kick_roundhouse_r">

+                まわし蹴り

+        </string>

+        <string name="anim_express_sad">

+                悲しむ

+        </string>

+        <string name="anim_salute">

+                敬礼する

+        </string>

+        <string name="anim_shout">

+                叫ぶ

+        </string>

+        <string name="anim_express_shrug">

+                肩をすくめる

+        </string>

+        <string name="anim_express_smile">

+                微笑む

+        </string>

+        <string name="anim_smoke_idle">

+                たばこをくゆらす

+        </string>

+        <string name="anim_smoke_inhale">

+                たばこを吸う

+        </string>

+        <string name="anim_smoke_throw_down">

+                たばこを捨てる

+        </string>

+        <string name="anim_express_surprise">

+                驚く

+        </string>

+        <string name="anim_sword_strike_r">

+                剣で斬りつける

+        </string>

+        <string name="anim_angry_tantrum">

+                じだんだを踏む

+        </string>

+        <string name="anim_express_tongue_out">

+                舌を出す

+        </string>

+        <string name="anim_hello">

+                手を振る

+        </string>

+        <string name="anim_whisper">

+                小声で話す

+        </string>

+        <string name="anim_whistle">

+                口笛を吹く

+        </string>

+        <string name="anim_express_wink">

+                ウィンク

+        </string>

+        <string name="anim_wink_hollywood">

+                ウィンク(ハリウッド)

+        </string>

+        <string name="anim_express_worry">

+                心配する

+        </string>

+        <string name="anim_yes_happy">

+                笑顔で頷く

+        </string>

+        <string name="anim_yes_head">

+                頷く

+        </string>

+</strings>

diff --git a/linden/indra/newview/skins/xui/ko/alerts.xml b/linden/indra/newview/skins/xui/ko/alerts.xml
index c2a514c..914648c 100644
--- a/linden/indra/newview/skins/xui/ko/alerts.xml
+++ b/linden/indra/newview/skins/xui/ko/alerts.xml
@@ -750,6 +750,9 @@ L$0로 판매하는 경우, 팔 사람을 선택하십시오.
 최소 사양
 [_URL]을 방문하여 추가 정보를 확인 하시겠습니까?
                 </message>
+                <ignore name="ignore">
+                        지원되지 않는 하드웨어 무시
+                </ignore>
                 <option name="Yes">
                         예
                 </option>
@@ -782,6 +785,18 @@ L$0로 판매하는 경우, 팔 사람을 선택하십시오.
                         510
                 </message>
         </alert>
+        <alert name="UnknownGPU">
+                <message name="message">
+                        알 수 없는 그래픽 카드를 사용하고 있습니다.  
+이 문제는 린든랩에서 검증하지 못한  새로운 하드웨어가 사용되었기 때문일 수 
+있습니다.  대부분의 경우 세컨드라이프는 정상적으로 실행되지만 사용 중인 그래픽 설정을 
+적합한 설정으로 조정해야 할 수 있습니다.
+(편집 &gt; 환경 설정 &gt; 그래픽)
+                </message>
+                <ignore name="ignore">
+                        알 수 없는 그래픽 카드 무시
+                </ignore>
+        </alert>
         <alert name="DisplaySettingsNoShaders">
                 <message name="message">
                         그래픽 드라이버 초기화 중 [SECOND_LIFE]에 오류가 발생했습니다.
@@ -1422,6 +1437,34 @@ www.secondlife.com으로 돌아가 신규 계정을 만드시겠습니까?
                         사유지 목록에 추가하는 동안 문제가 발생했습니다.  하나 이상의 사유지 관리자 목록이 모두 찬 상태입니다.
                 </message>
         </alert>
+        <alert name="SetClassifiedMature">
+                <message name="message">
+                        이 광고에 성인용 컨텐츠가 포함되어 있습니까?
+                </message>
+                <option name="Mature">
+                        예
+                </option>
+                <option name="Not Mature">
+                        아니오
+                </option>
+                <option name="Cancel">
+                        취소
+                </option>
+        </alert>
+        <alert name="SetGroupMature">
+                <message name="message">
+                        이 그룹에 성인용 컨텐츠가 포함되어 있습니까?
+                </message>
+                <option name="Mature">
+                        예
+                </option>
+                <option name="Not Mature">
+                        아니오
+                </option>
+                <option name="Cancel">
+                        취소
+                </option>
+        </alert>
         <alert name="HelpRegionSearch" title="검색 보기 안 함">
                 <message name="message">
                         이 확인란을 선택하면 구획 소유주가 검색 구획 목록을 만들 수 없습니다.
@@ -2734,10 +2777,12 @@ www.secondlife.com으로 돌아가 신규 계정을 만드시겠습니까?
         </alert>
         <alert name="ClothingLoading">
                 <message name="message">
-                        의상을 다운로드하는 중입니다.
-일반적으로 세컨드라이프를 사용할 수 있으며 다른 사용자에게
-귀하의 모습이 제대로 표시될 것입니다.
+                        의복을 다운로드하고 있습니다. 
+[SECOND_LIFE]를 사용할 수 있으며 다른 사용자에게 귀하의 모습이 정상적으로 표시될 것입니다.
                 </message>
+                <ignore name="ignore">
+                        의복 다운로드 시간이 오래 걸리는 경우
+                </ignore>
         </alert>
         <alert name="FirstRun">
                 <message name="message">
@@ -4681,25 +4726,25 @@ http://secondlife.com/community/support.php
         </alert>
         <alert name="GraphicsPreferencesHelp">
                 <message name="message">
-                        이 창은 창 크기와 클라이언트 그래픽의 해상도 및 품질을 제어합니다.  그래픽 환경 설정 인터페이스를 통해 낮음, 중간, 높음, 매우 높음 등 4개의 그래픽 레벨 중에서 원하는 설정을 선택할 수 있습니다. 사용자 지정 확인란을 선택하고 다음의 설정을 조작하여 이러한 그래픽을 원하는 대로 설정할 수 있습니다.
+                        세컨드라이프 클라이언트의 그래픽 해상도 및 품질을 제어합니다.  낮음, 중간, 높음, 매우 높음  4단계의 설정을  선택할 수 있습니다. 또한 사용자 크기 확인란을 선택 후 설정을 세부 조작할 수 있습니다.
 
-쉐이더: ���러 가지 픽셀 ���이더 유형을 활성화하거나 비활성화합니다. 
+쉐이더: 쉐이더 유형을 활성화하거나 비활성화합니다. 
 
-반사 디테일: 물에 반사�� �� 있는 오브젝트 유형을 설정합니다.
+반사 디테일: 물에 반사되는 오브젝트 유형을 설정합니다.
 
-아바타 렌더링: 클라���언트가 ���바타를 렌더링하는 방식��� 영향��� ���는 ���션을 설정합니다.
+아바타 렌더링: 아바타를 렌더링하는 방식�� 옵션을 설정합니다.
 
-렌더링 거리 제한: 장면에서 현재 시점��� 오브젝트가 렌더링되는 거리를 조절합니다.
+렌더링 거리 제한: 현재 시점���서 부터 오브젝트가 렌더링되는 거리를 조절합니다.
 
 최대 파티클 수: 화면에서 한 번에 볼 수 있는 최대 파티클 수를 설정합니다.
 
 빛 처리 품질: 빛이 렌더링되는 해상도를 설정합니다. 
 
-메쉬 디테일: 오브젝트를 렌더링하는 디테일을 설정합니다.
+메쉬 디테일: 특정 오브젝트를 렌더링하는 디테일 또는 삼각형 개수를 설정합니다. 값이 클수록 렌더링이 더 오래 걸리지만 오브젝트의 모양이 더 자세하게 표현됩니다.
 
-조명 세부 사항: 렌더링할 조명 유형을 선택합니다.
+조명 세부 사항: 조명의 유형을 선택합니다.
 
-지형 세부 사항: 보려는 지형의 디테일을 설정합니다. 
+지형 세부 사항: 지형 텍���처��� 디테일을 설정합니다.
                 </message>
         </alert>
         <alert name="WLSavePresetAlert">
@@ -5141,4 +5186,9 @@ Second Life 웹사이트를 방문하여 이 정보를 설정하시겠습니까?
                         아니오
                 </option>
         </alert>
+        <alert name="MissingString">
+                <message name="message">
+                        strings.xml에 [STRING_NAME] 문자열이 없습니다.
+                </message>
+        </alert>
 </alerts>
diff --git a/linden/indra/newview/skins/xui/ko/floater_directory.xml b/linden/indra/newview/skins/xui/ko/floater_directory.xml
index aaa7c07..a9b41d8 100644
--- a/linden/indra/newview/skins/xui/ko/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_directory.xml
@@ -229,6 +229,22 @@
                                 <column label="교통" name="dwell" />
                         </scroll_list>
                 </panel>
+                <panel label="쇼케이스" name="showcase_panel">
+                        <string name="searching_text">
+                                검색
+                        </string>
+                        <string name="not_found_text">
+                                발견되지 않음.
+                        </string>
+                        <button label="뒤로" name="back_btn" />
+                        <button label="앞으로" name="forward_btn" />
+                        <string name="loading_text">
+                                로딩 중
+                        </string>
+                        <string name="done_text">
+                                완료
+                        </string>
+                </panel>
                 <panel label="토지 매물" name="land_sales_panel">
                         <string name="searching_text">
                                 검색
@@ -284,7 +300,7 @@
                                 검색
                         </string>
                         <string name="not_found_text">
-                                발��되��� ������
+                                ����� 결과�� ������니다.
                         </string>
                         <button label="&lt; 이전" label_selected="&lt; 이전" name="&lt; Prev" />
                         <button label="다음 &gt;" label_selected="다음 &gt;" name="Next &gt;" />
@@ -365,7 +381,7 @@
                                 검색
                         </string>
                         <string name="not_found_text">
-                                발��되��� ������
+                                ����� 결과�� ������니다.
                         </string>
                         <button label="&lt; 이전" label_selected="&lt; 이전" name="&lt; Prev" />
                         <button label="다음 &gt;" label_selected="다음 &gt;" name="Next &gt;" />
@@ -381,6 +397,17 @@
                                 <column label="회원" name="members" />
                                 <column label="" name="score" />
                         </scroll_list>
+                        <button label="뒤로" name="back_btn" />
+                        <button label="앞으로" name="forward_btn" />
+                        <line_editor label="검색" name="search_editor" tool_tip="세컨드라이프 검색" />
+                        <button label="검색" name="search_btn" />
+                        <check_box label="성인용 컨텐츠 포함" name="mature_check" />
+                        <string name="loading_text">
+                                로딩 중
+                        </string>
+                        <string name="done_text">
+                                완료
+                        </string>
                 </panel>
                 <panel label="전체(구)" name="find_all_old_panel">
                         <string name="searching_text">
diff --git a/linden/indra/newview/skins/xui/ko/floater_im.xml b/linden/indra/newview/skins/xui/ko/floater_im.xml
index 6fae990..64fb77d 100644
--- a/linden/indra/newview/skins/xui/ko/floater_im.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_im.xml
@@ -6,6 +6,9 @@
         <text name="offline_message">
                 [FIRST] [LAST]님은 오프라인입니다.
         </text>
+        <string name="muted_message">
+                [FIRST] [LAST]님이 음소거되었습니다.
+        </string>
         <text name="generic_request_error">
                 오류 보고 작성을 요청했으므로 나중에 다시 시도하십시오.
         </text>
diff --git a/linden/indra/newview/skins/xui/ko/floater_script_debug.xml b/linden/indra/newview/skins/xui/ko/floater_script_debug.xml
index d4b5d3f..44b3e5f 100644
--- a/linden/indra/newview/skins/xui/ko/floater_script_debug.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_script_debug.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater name="script debug floater" title="스크립트 오류/경고">
+<multi_floater name="script debug floater" title="스크립트 경고/오류">
         <tab_container name="Preview Tabs">
                 <floater label="스크립트" name="all_scripts" title="[모든 스크립트]" />
         </tab_container>
diff --git a/linden/indra/newview/skins/xui/ko/floater_world_map.xml b/linden/indra/newview/skins/xui/ko/floater_world_map.xml
index abe0e3f..e8d09c9 100644
--- a/linden/indra/newview/skins/xui/ko/floater_world_map.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_world_map.xml
@@ -50,15 +50,16 @@
                 이벤트(성인)
         </text>
         <check_box label=" " name="event_mature_chk" />
-        <combo_box label="내 친구들" name="friend combo" tool_tip="Friend to Show on Map">
+        <combo_box label="온라인 친구 보기" name="friend combo"
+             tool_tip="Friend to Show on Map">
                 <combo_item name="none_selected">
-                        ��� 친구���
+                        온���인 친구 ���기
                 </combo_item>
         </combo_box>
-        <combo_box label="��� ���드마크" name="landmark combo"
+        <combo_box label="랜드마크 보기" name="landmark combo"
              tool_tip="Landmark to Show on Map">
                 <combo_item name="none_selected">
-                        ��� ���드마크
+                        랜드마크 보기
                 </combo_item>
         </combo_box>
         <line_editor label="지역명으로 검색" name="location" tool_tip="지역 이름 입력" />
diff --git a/linden/indra/newview/skins/xui/ko/need_to_long.xml b/linden/indra/newview/skins/xui/ko/need_to_long.xml
index 01b8974..f1fe853 100644
--- a/linden/indra/newview/skins/xui/ko/need_to_long.xml
+++ b/linden/indra/newview/skins/xui/ko/need_to_long.xml
@@ -2,161 +2,94 @@
 

 <strings>

 <string><a_file>alerts.xml</a_file>

-<b_path>//HelpRegionObjectBonus/message</b_path>

+<b_path>//GraphicsPreferencesHelp/message</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        The Object Bonus is a multiplier for primitives allowed on any given

-parcel. The range allowed is 1 to 10. Set at &apos;1&apos;, each 512m2 parcel

-is allowed 117 objects. Set at &apos;2&apos;, each 512m2 parcel is

-allowed 234, or twice as many, and so on. The max number of objects

-allowed per region remains 15,000 no matter what the

-Object Bonus is. once set, be aware that lowering the Object Bonus may cause

-objects to be returned or deleted. 

- 

-Default: 1.0

-                </d_old>

-<e_new>

-                        The Object Bonus is a multiplier for primitives allowed on any given

-parcel. The range allowed is 1 to 10. Set at &apos;1&apos;, each 512m2 parcel

-is allowed 117 objects. Set at &apos;2&apos;, each 512m2 parcel is

-allowed 234, or twice as many, and so on. The max number of objects

-allowed per region remains 15,000 no matter what the

-Object Bonus is. Once set, be aware that lowering the Object Bonus may cause objects to be returned or deleted. 

- 

-Default: 1.0

-                </e_new>

-<f_translation>

-                        오브젝트 보너스는 특정 구획에 허락된 프림에 대해 배로

-증가합니다. 허용 범위는 1에서 10입니다. &apos;1&apos;로 설정했을 때 각 512m2 구획에

-117 개 오브젝트가 허용됩니다. &apos;2&apos;로 설정하면 각 512m2 구획에 허용되는

-오브젝트는 두 배인 234개로 됩니다. 지역당 허용되는

-최대 오브젝트 수는 오브젝트 보너스에 상관없이 15,000 개

-입니다. 일단 설정한 후 오브젝트 보너스를 낮추게 되면 오브젝트가반환되거나 삭제될 수 있는점을 알아 두십시오. 

- 

-기본 설정: 1.0

-                </f_translation>

-<f_old_trans>

-                        오브젝트 보너스는 특정 구획에 허락된 프림에 대해 배로

-증가합니다. 허용 범위는 1에서 10입니다. &apos;1&apos;로 설정했을 때 각 512m2 구획에

-허용되는 오브젝트는 117개입니다. &apos;2&apos;로 설정하면 각 512m2 구획에 허용되는

-오브젝트가 두 배인 234개로 됩니다. 지역당 허용되는

-오브젝트의 최대 개수는 오브젝트 보너스에 대해 설정된 값과 상관없이

-15,000개입니다. 이 값을 설정한 후에는, 값 변경으로 인해

-현재 구획 내의 오브젝트가 반환되거나 삭제될 것이 확실하기 전까지는

-이 값을 낮추면 안됩니다.

- 

-기본 설정: 1.0

-                </f_old_trans>

-</string><string><a_file>floater_about.xml</a_file>

-<b_path>/floater_about/credits_editor</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Tofu, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks,  Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall and many others.

+                        This panel controls window size and resolution and the quality of the client&apos;s graphics.  The graphics preferences interface allows you to choose between four graphics levels: Low, Mid, High, and Ultra. One may customize their graphics settings by checking the Custom checkbox and manipulating the following settings:

+

+Shaders: Enable or disable various types of pixel shaders. 

+

+Reflection Detail: Sets the types of objects that water can reflect.

+

+Avatar Rendering: Sets options that affect how the client renders avatars.

+

+Draw Distance: Affects how far out from your viewpoint objects will be rendered in the scene.

 

-Thank you to the following residents for helping to ensure that this is the best version yet: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf

+Max Particle Count: Sets the maximum number of particles you are able to see on your screen at once.

 

-APR Copyright (C) 2000-2004 The Apache Software Foundation

-cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)

-expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.

-FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).

-GL Copyright (C) 1999-2004 Brian Paul.

-Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.

-jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)

-jpeglib Copyright (C) 1991-1998, Thomas G. Lane.

-ogg/vorbis Copyright (C) 2001, Xiphophorus

-OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.

-SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga

-SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

-xmlrpc-epi Copyright (C) 2000 Epinions, Inc.

-zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.

+Post Process Quality: Sets the resolution with which Glow is rendered. 

 

-All rights reserved.  See licenses.txt for details.

+Mesh Detail: Sets the amout of detail used in rendering certain objects.

 

-Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)

+Lighting Detail: Selects what types of lights you would like to render.

 

+Terrain Detail: Sets the amount of terrain detail you would like to see. 

 

-Happiness is a warm puppy. -- Charles M. Schulz

-        </d_old>

+Sky Detail: Sets the amount of tesselation of the sky dome.  A higher value takes longer to render, but makes the sun look more rounded.

+                </d_old>

 <e_new>

-  Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Tofu, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks,  Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall and many others.

+                        This panel controls window size and resolution and the quality of the client&apos;s graphics.  The Preferences &gt; Graphics interface allows you to choose between four graphics levels: Low, Mid, High, and Ultra. You may also customize your graphics settings by checking the Custom checkbox and manipulating the following settings:

+

+Shaders: Enable or disable various types of pixel shaders. 

+

+Reflection Detail: Sets the types of objects that water can reflect.

+

+Avatar Rendering: Sets options that affect how the client renders avatars.

 

-  Thank you to the following residents for helping to ensure that this is the best version yet: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf

+Draw Distance: Affects how far out from your viewpoint objects will be rendered in the scene.

 

-  3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion

-  APR Copyright (C) 2000-2004 The Apache Software Foundation

-  cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)

-  expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.

-  FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).

-  GL Copyright (C) 1999-2004 Brian Paul.

-  Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.

-  jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)

-  jpeglib Copyright (C) 1991-1998, Thomas G. Lane.

-  ogg/vorbis Copyright (C) 2001, Xiphophorus

-  OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.

-  SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga

-  SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

-  xmlrpc-epi Copyright (C) 2000 Epinions, Inc.

-  zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.

+Max Particle Count: Sets the maximum number of particles you are able to see on your screen at once.

 

-  All rights reserved.  See licenses.txt for details.

+Post Process Quality: Sets the resolution with which Glow is rendered. 

 

-  Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)

+Mesh Detail: Sets the amount of detail or number of triangles used in rendering certain objects. A higher value takes longer to render, but makes these objects appear with more detail.

 

+Lighting Detail: Selects what types of lights you would like to render.

 

-  Happiness is a warm puppy. -- Charles M. Schulz</e_new>

+Terrain Detail: Sets the amount of detail you would like to see for the terrain texture. 

+                </e_new>

+<f_old_trans></f_old_trans>

 <f_translation>

-  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, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks,  Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall, 그 외에 많은 분들이 수고해 주셨습니다.

+                        세컨드라이프 클라이언트의 그래픽 해상도 및 품질을 제어합니다.  낮음, 중간, 높음, 매우 높음  4단계의 설정을  선택할 수 있습니다. 또한 사용자 크기 확인란을 선택 후 설정을 세부 조작할 수 있습니다.

+

+쉐이더: 쉐이더 유형을 활성화하거나 비활성화합니다. 

+

+반사 디테일: 물에 반사되는 오브젝트 유형을 설정합니다.

 

-  현재 버전이 최상의 버전이 될 수 있도록 도와주신 게이머 여러분께 감사드립니다: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf

+아바타 렌더링: 아바타를 렌더링하는 방식의 옵션을 설정합니다.

 

-  3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion

-  APR Copyright (C) 2000-2004 The Apache Software Foundation

-  cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)

-  expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.

-  FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).

-  GL Copyright (C) 1999-2004 Brian Paul.

-  Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.

-  jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)

-  jpeglib Copyright (C) 1991-1998, Thomas G. Lane.

-  ogg/vorbis Copyright (C) 2001, Xiphophorus

-  OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.

-  SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga

-  SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

-  xmlrpc-epi Copyright (C) 2000 Epinions, Inc.

-  zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.

+렌더링 거리 제한: 현재 시점에서 부터 오브젝트가 렌더링되는 거리를 조절합니다.

 

-  ���작�� ��유.  �����한 ��������� licenses.txt를 ����������������.

+������ 파티�� 수: 화면����� 한 ������ 볼 ��� 있는 최�� 파티클 수를 ��������������.

 

-  ���성 채��� ��������� ����: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)

+빛 ���리 ������: ������ 렌�����되�� 해상도를 설정합니다. 

 

+메쉬 디테일: 특정 오브젝트를 렌더링하는 디테일 또는 삼각형 개수를 설정합니다. 값이 클수록 렌더링이 더 오래 걸리지만 오브젝트의 모양이 더 자세하게 표현됩니다.

 

-  행복이란 포근한 강아지 한마리다. -- Charles M. Schulz</f_translation>

+조명 세부 사항: 조명의 유형을 선택합니다.

+

+지형 세부 사항: 지형 텍스처의 디테일을 설정합니다. 

+                </f_translation>

 <f_old_trans>

-                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, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks,  Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall, 그 외에 많은 분들이 수고해 주셨습니다.

+                        이 창은 창 크기와 클라이언트 그래픽의 해상도 및 품질을 제어합니다.  그래픽 환경 설정 인터페이스를 통해 낮음, 중간, 높음, 매우 높음 등 4개의 그래픽 레벨 중에서 원하는 설정을 선택할 수 있습니다. 사용자 지정 확인란을 선택하고 다음의 설정을 조작하여 이러한 그래픽을 원하는 대로 설정할 수 있습니다.

+

+쉐이더: 여러 가지 픽셀 쉐이더 유형을 활성화하거나 비활성화합니다. 

 

-현재 버전이 최상의 버전이 될 수 있도록 도와주신 게이머 여러분께 감사드립니다: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf

+반사 디테일: 물에 반사될 수 있는 오브젝트 유형을 설정합니다.

 

-APR Copyright (C) 2000-2004 The Apache Software Foundation

-cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)

-expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.

-FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).

-GL Copyright (C) 1999-2004 Brian Paul.

-Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.

-jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)

-jpeglib Copyright (C) 1991-1998, Thomas G. Lane.

-ogg/vorbis Copyright (C) 2001, Xiphophorus

-OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.

-SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga

-SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

-xmlrpc-epi Copyright (C) 2000 Epinions, Inc.

-zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.

+아바타 렌더링: 클라이언트가 아바타를 렌더링하는 방식에 영향을 주는 옵션을 설정합니다.

 

-���작�� ������.  자����� 내���은 licenses.txt를 ����������������.

+���더링 거��� ��한: ��면���� ���재 ��점의 ���브���트�� ���더링되는 거리��� 조절��������.

 

-������ ������ �������� �����: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)

+������ 파티클 ���: 화면������ ��� 번��� ��� ��� ������ 최대 파티클 수를 설정합니다.

 

+빛 처리 품질: 빛이 렌더링되는 해상도를 설정합니다. 

 

-행복이란 포근한 강아지 한마리다. -- Charles M. Schulz

-        </f_old_trans>

+메쉬 디테일: 오브젝트를 렌더링하는 디테일을 설정합니다.

+

+조명 세부 사항: 렌더링할 조명 유형을 선택합니다.

+

+지형 세부 사항: 보려는 지형의 디테일을 설정합니다. 

+                </f_old_trans>

 </string>

 </strings>

diff --git a/linden/indra/newview/skins/xui/ko/need_to_translate.xml b/linden/indra/newview/skins/xui/ko/need_to_translate.xml
index 64496cf..c179201 100644
--- a/linden/indra/newview/skins/xui/ko/need_to_translate.xml
+++ b/linden/indra/newview/skins/xui/ko/need_to_translate.xml
@@ -2,2246 +2,1429 @@
 

 <strings>

 <string><a_file>alerts.xml</a_file>

-<b_path>//TutorialNotFound/message</b_path>

+<b_path>//UnsupportedHardware/ignore</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        No tutorial is currently available.

+                        Ignore unsupported hardware

                 </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        ������ ���토���얼을 사용�� �� ��������다.

+                        지원����� ����� 하드������ ������

                 </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//TutorialNotFound/OK</b_path>

+<b_path>//UnknownGPU/message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        OK

+Your system contains a graphics card that is unknown to us at this time.  

+This is often the case with new hardware we haven&apos;t had a chance to 

+test.  Second Life will most likely run properly, but you may need to 

+adjust your graphics settings to something more appropriate.

+(Edit &gt; Preferences &gt; Graphics).

                 </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        확인

+알 수 없는 그래픽 카드를 사용하고 있습니다.  

+이 문제는 린든랩에서 검증하지 못한  새로운 하드웨어가 사용되었기 때문일 수 

+있습니다.  대부분의 경우 세컨드라이프는 정상적으로 실행되지만 사용 중인 그래픽 설정을 

+적합한 설정으로 조정해야 할 수 있습니다.

+(편집 &gt; 환경 설정 &gt; 그래픽)

                 </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//FreezeAvatarFullname/message</b_path>

+<b_path>//UnknownGPU/ignore</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Freeze [AVATAR_NAME]?

-He or she will temporarily be unable to move,

-chat, or interact with the world.

+                        Ignore unknown graphics card

                 </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        [AVATAR_NAME]을(를) 정지시키겠습니까?

-이렇게 하면 일시적으로 움직이지 못하게 되고,

-채팅이나 상호작용을 할 수 없습니다.

+                        알 수 없는 그래픽 카드 무시

                 </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//FreezeAvatarFullname/Freeze</b_path>

+<b_path>//ClothingLoading/ignore</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Freeze

+                        When clothing is taking a long time to download

                 </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        ������

+                        ���복 다���로드 시간이 오래 걸리는 경우

                 </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//FreezeAvatarFullname/Unfreeze</b_path>

+<b_path>//SetClassifiedMature/message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Unfreeze

-                </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                        정지 해제

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//FreezeAvatarFullname/Cancel</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>

-                        Cancel

-                </e_new>

+Does this classified contain Mature content?

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        ������

-                </f_translation>

+이 광고에 성인용 컨텐츠가 포함되어 ������니��?

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//EjectAvatarFullname/message</b_path>

+<b_path>//SetClassifiedMature/Mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Eject [AVATAR_NAME] from your land?

-                </e_new>

+      Yes

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        [AVATAR_NAME]���(를) 본인�� 토지에서 강제로 퇴장시키겠습��까?

-                </f_translation>

+      예

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//EjectAvatarFullname/Eject</b_path>

+<b_path>//SetClassifiedMature/Not Mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Eject

-                </e_new>

+      No

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        ��퇴

-                </f_translation>

+      ���니오

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//EjectAvatarFullname/EjectandBan</b_path>

+<b_path>//SetClassifiedMature/Cancel</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Eject and Ban

-                </e_new>

+      Cancel

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        강퇴 및 ���단

-                </f_translation>

+      ���소

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//EjectAvatarFullname/Cancel</b_path>

+<b_path>//SetGroupMature/message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Cancel

-                </e_new>

+Does this group contain Mature content?

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        ������

-                </f_translation>

+이 그룹에 성인용 컨텐츠가 포함되어 ������니��?

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//SeachFilteredOnShortWords/message</b_path>

+<b_path>//SetGroupMature/Mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-Your search query was modified and the 

-words that were too short were removed.

-

-Searched for: [FINALQUERY]

-                </e_new>

+      Yes

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-귀하의 검색 질문이 수정되었으며 

-너무 짧은 검색어는 삭제되었습니다.

-

-검색 대상: [FINALQUERY]

-                </f_translation>

+      예

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//SeachFilteredOnShortWordsEmpty/message</b_path>

+<b_path>//SetGroupMature/Not Mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-Your search terms were too short

-so no search was performed.

-                </e_new>

+      No

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-검색어가 너무 짧아

-검색할 수 없습니다.

-                </f_translation>

+      아니오

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotCloseFloaterBuyLand/message</b_path>

+<b_path>//SetGroupMature/Cancel</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        You cannot close the Buy Land window until Second Life

-estimates the price of this transaction.

-                </e_new>

+      Cancel

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        세컨드라이프에서 이 거래 비용을 산정할 때까지

-토지 구매 창을 닫을 수 없습니다.

-                </f_translation>

+      취소

+    </f_translation>

 </string><string><a_file>alerts.xml</a_file>

-<b_path>//MaxAgentOnRegionBatch/message</b_path>

+<b_path>//MissingString/message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                        Failure while attempting to add [NUM_ADDED] agents:

-Exceeds the [MAX_AGENTS] [LIST_TYPE] limit by [NUM_EXCESS].

+                        The string [STRING_NAME] is missing from strings.xml

                 </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                        [NUM_ADDED] 에이전트를 추가하는 데 실패했습니다:

-[NUM_EXCESS]에 지정된 [MAX_AGENTS] [LIST_TYPE] 제한이 초과하였습니다.

+                        strings.xml에 [STRING_NAME] 문자열이 없습니다.

                 </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WebLaunchExternalTarget/message</b_path>

-<c_attribute></c_attribute>

+</string><string><a_file>floater_active_speakers.xml</a_file>

+<b_path>/active_speakers/active_speakers_panel/speakers_list/speaking_status</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>

-                        Open your system Web browser to view this content?

-                </e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        컨텐츠를 보려면 시스템 웹 브라우저를 여십시오.

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WebLaunchExternalTarget/ignore</b_path>

-<c_attribute></c_attribute>

+<f_translation></f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/showcase_panel</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>

-                        When opening your system browser to view a Web page

-                </e_new>

+<e_new>Showcase</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        시스템 브라우저를 열어 웹 페이지를 확인할 경우

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WebLaunchExternalTarget/Open</b_path>

+<f_translation>쇼케이스</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/showcase_panel/searching_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        OK

-                </e_new>

+<e_new>Searching...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        확인

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//WebLaunchExternalTarget/Cancel</b_path>

+<f_translation>검색</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/showcase_panel/not_found_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Cancel

-                </e_new>

+<e_new>None Found.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        취소

-                </f_translation>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ProblemAddingEstateGeneric/message</b_path>

-<c_attribute></c_attribute>

+<f_translation>발견되지 않음.</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/showcase_panel/back_btn</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>

-                        Problems adding to this estate list.  One or more estates may have a full list.

-                </e_new>

+<e_new>Back</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        사유지 목록에 추가하는 동안 문제가 발생했습니다.  하나 이상의 사유지 관리자 목록이 모두 찬 상태입니다.

-                </f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_objects_panel/owner list/type</b_path>

+<f_translation>뒤로</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/showcase_panel/forward_btn</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Type</e_new>

+<e_new>Forward</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>�����</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_objects_panel/owner list/name</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>��으로</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/showcase_panel/loading_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Name</e_new>

+<e_new>Loading...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>이���</f_translation>

-</string><string><a_file>floater_about_land.xml</a_file>

-<b_path>/floaterland/landtab/land_objects_panel/owner list/count</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>���딩 중</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/showcase_panel/done_text</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Count</e_new>

+<e_new>Done</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>개���</f_translation>

-</string><string><a_file>floater_active_speakers.xml</a_file>

-<b_path>/active_speakers/active_speakers_panel/speakers_list/speaking_status</b_path>

+<f_translation>���료</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/back_btn</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Back</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_avatar_textures.xml</a_file>

-<b_path>/avatar_texture_debug/baked_label</b_path>

-<c_attribute></c_attribute>

+<f_translation>뒤로</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/forward_btn</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>

-                Baked Textures

-        </e_new>

+<e_new>Forward</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                저장된 텍스처

-        </f_translation>

-</string><string><a_file>floater_avatar_textures.xml</a_file>

-<b_path>/avatar_texture_debug/composite_label</b_path>

-<c_attribute></c_attribute>

+<f_translation>앞으로</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/search_editor</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>

-                Composite Textures

-        </e_new>

+<e_new>Search</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                복합 텍스처

-        </f_translation>

-</string><string><a_file>floater_buy_currency.xml</a_file>

-<b_path>/buy currency/getting_data</b_path>

-<c_attribute></c_attribute>

+<f_translation>검색</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/search_editor</b_path>

+<c_attribute>tool_tip</c_attribute>

 <d_old></d_old>

-<e_new>

-                Getting data...

-        </e_new>

+<e_new>Search Second Life</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                데이터를 가져오는 중...

-        </f_translation>

-</string><string><a_file>floater_camera.xml</a_file>

-<b_path>/move floater</b_path>

-<c_attribute>title</c_attribute>

+<f_translation>세컨드라이프 검색</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/search_btn</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Search</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_camera.xml</a_file>

-<b_path>/move floater/rotate_tooltip</b_path>

-<c_attribute></c_attribute>

+<f_translation>검색</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/mature_check</b_path>

+<c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>Rotate Camera Around Focus</e_new>

+<e_new>Include Mature content</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>���점 주��로 ���메��� �����</f_translation>

-</string><string><a_file>floater_camera.xml</a_file>

-<b_path>/move floater/zoom_tooltip</b_path>

+<f_translation>����용 컨������ 포함</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/loading_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Zoom Camera Towards Focus</e_new>

+<e_new>Loading...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>초점을 향해 카������ 확대/���소</f_translation>

-</string><string><a_file>floater_camera.xml</a_file>

-<b_path>/move floater/move_tooltip</b_path>

+<f_translation>������ ���</f_translation>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/done_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Move Camera Up and Down, Left and Right</e_new>

+<e_new>Done</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>위/아래, 왼쪽/오른쪽으로 카메라 이동</f_translation>

-</string><string><a_file>floater_chatterbox.xml</a_file>

-<b_path>/floater_chatterbox</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Communicate</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>통신</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/IM_logging_string</b_path>

+<f_translation>완료</f_translation>

+</string><string><a_file>floater_im.xml</a_file>

+<b_path>/im_floater/muted_message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                -- Instant message logging enabled --

+                [FIRST] [LAST] is muted.

         </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                -- ��������� 로��� ������ --

+                [FIRST] [LAST]����� 음소���되������니다.

         </f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/IM_end_log_string</b_path>

+</string><string><a_file>notify.xml</a_file>

+<b_path>//AutoUnmuteByIM/message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                -- End of Log --

-        </e_new>

+                        [FIRST] [LAST] was sent an instant message and has been automatically unmuted.

+                </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                -- 로그 끝 --

-        </f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/Gesture</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Gestures</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>제스처</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/Gesture/Gestures</b_path>

+                        [FIRST] [LAST]님에게 메시지가 전송되었으며 자동으로 음소거가 해제되었습니다.

+                </f_translation>

+</string><string><a_file>notify.xml</a_file>

+<b_path>//AutoUnmuteByMoney/message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                                        Gestures

-                                </e_new>

+                        [FIRST] [LAST] was given money and has been automatically unmuted.

+                </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                                        제스처

-                                </f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/show mutes</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Show Muted Text</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>차단된 텍스트 표시하기</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/toggle_active_speakers_btn</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>&lt; &lt;</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>&lt; &lt;</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/toggle_active_speakers_btn</b_path>

-<c_attribute>label_selected</c_attribute>

-<d_old></d_old>

-<e_new>&gt; &gt;</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>&gt; &gt;</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/toggle_active_speakers_btn</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>Click here to show list of active participants in this IM session.</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>채팅 참가자 목록 보기 </f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/chat_panel/Chat Editor</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Click here to chat.</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>채팅하려면 여기를 클릭하십시오.</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/chat_panel/Say</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Say</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>말하기</f_translation>

-</string><string><a_file>floater_chat_history.xml</a_file>

-<b_path>/chat floater/panels/im_contents_panel/chat_panel/Say</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>(Enter)</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>(입력)</f_translation>

-</string><string><a_file>floater_critical.xml</a_file>

-<b_path>/modal container/tos_title</b_path>

+                        [FIRST] [LAST]님에게 금액이 전송되었으며 자동으로 음소거가 해제되었습니다.

+                </f_translation>

+</string><string><a_file>notify.xml</a_file>

+<b_path>//AutoUnmuteByInventory/message</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-    Critical Message

-  </e_new>

+                        [FIRST] [LAST] was offered inventory and has been automatically unmuted.

+                </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-    중요 메시지

-  </f_translation>

-</string><string><a_file>floater_customize.xml</a_file>

-<b_path>/floater customize/customize tab container/body_parts_placeholder</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Body Parts</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>신체 부위</f_translation>

-</string><string><a_file>floater_customize.xml</a_file>

-<b_path>/floater customize/customize tab container/clothes_placeholder</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Clothes</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>의상</f_translation>

-</string><string><a_file>floater_day_cycle_options.xml</a_file>

-<b_path>/Day Cycle Floater/Day Cycle Tabs/Day Cycle/WLTimeSlider</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_day_cycle_options.xml</a_file>

-<b_path>/Day Cycle Floater/Day Cycle Tabs/Day Cycle/WLDayCycleKeys</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_device_settings.xml</a_file>

-<b_path>/floater_device_settings</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Voice Chat Device Settings</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>음성 채팅 장치 설정</f_translation>

-</string><string><a_file>floater_directory.xml</a_file>

-<b_path>/directory/Directory Tabs/find_all_old_panel/results/icon</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_env_settings.xml</a_file>

-<b_path>/Environment Editor Floater/EnvTimeSlider</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_env_settings.xml</a_file>

-<b_path>/Environment Editor Floater/EnvCloudSlider</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_env_settings.xml</a_file>

-<b_path>/Environment Editor Floater/EnvWaterFogSlider</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_groups.xml</a_file>

-<b_path>/groups/group list/name</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_hardware_settings.xml</a_file>

-<b_path>/Hardware Settings Floater/Antialiasing:</b_path>

+                        [FIRST] [LAST]님에게 인벤토리가 전송되었으며 자동으로 음소거가 해제되었습니다.

+                </f_translation>

+</string><string><a_file>panel_avatar_classified.xml</a_file>

+<b_path>/Classified/classified_mature_check/select_mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-    Antialiasing:

-  </e_new>

+      - Select Mature -

+    </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-    앤티앨리어싱:

-  </f_translation>

-</string><string><a_file>floater_hardware_settings.xml</a_file>

-<b_path>/Hardware Settings Floater/fsaa</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Antialiasing</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>앤티앨리어싱</f_translation>

-</string><string><a_file>floater_hardware_settings.xml</a_file>

-<b_path>/Hardware Settings Floater/fsaa/FSAADisabled</b_path>

+      - 성인용 컨텐츠 선택 -

+    </f_translation>

+</string><string><a_file>panel_avatar_classified.xml</a_file>

+<b_path>/Classified/classified_mature_check/mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-      Disabled

+      Mature Content

     </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-      비활성������

+      성인용 컨���츠

     </f_translation>

-</string><string><a_file>floater_hardware_settings.xml</a_file>

-<b_path>/Hardware Settings Floater/fsaa/2x</b_path>

+</string><string><a_file>panel_avatar_classified.xml</a_file>

+<b_path>/Classified/classified_mature_check/not_mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-      2x

+      Not Mature Content

     </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-      2x

+      성인용 컨텐츠 아님

     </f_translation>

-</string><string><a_file>floater_hardware_settings.xml</a_file>

-<b_path>/Hardware Settings Floater/fsaa/4x</b_path>

+</string><string><a_file>panel_classified.xml</a_file>

+<b_path>/Classified/classified_mature_check/select_mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-      4x

+      - Select Mature -

     </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-      4x

+      - 성인용 컨텐츠 선택 -

     </f_translation>

-</string><string><a_file>floater_hardware_settings.xml</a_file>

-<b_path>/Hardware Settings Floater/fsaa/8x</b_path>

+</string><string><a_file>panel_classified.xml</a_file>

+<b_path>/Classified/classified_mature_check/mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-      8x

+      Mature Content

     </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-      8x

+      성인용 컨텐츠

     </f_translation>

-</string><string><a_file>floater_hardware_settings.xml</a_file>

-<b_path>/Hardware Settings Floater/fsaa/16x</b_path>

+</string><string><a_file>panel_classified.xml</a_file>

+<b_path>/Classified/classified_mature_check/not_mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-      16x

+      Not Mature Content

     </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-      16x

+      성인용 컨텐츠 아님

     </f_translation>

-</string><string><a_file>floater_hud.xml</a_file>

-<b_path>/floater_hud</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Tutorial</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>튜토리얼</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Joystick Configuration</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>조이스틱 설정</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickAxis1</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>X Axis Mapping</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>X축 매핑</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickAxis2</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Y Axis Mapping</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Y축 매핑</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickAxis0</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Z Axis Mapping</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Z축 매핑</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickAxis4</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Pitch Mapping</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>피치 매핑</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickAxis5</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Yaw Mapping</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>요 매핑</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickAxis3</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Roll Mapping</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>롤 매핑</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickAxis6</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Zoom Mapping</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>확대/축소 매핑</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/ZoomDirect</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>Direct Zoom</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>직접 확대/축소</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/Cursor3D</b_path>

+</string><string><a_file>panel_groups.xml</a_file>

+<b_path>/groups/group list/name</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

-<e_new>3D Cursor</e_new>

+<e_new></e_new>

 <f_old_trans></f_old_trans>

-<f_translation>3D 커서</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/AutoLeveling</b_path>

-<c_attribute>label</c_attribute>

+<f_translation></f_translation>

+</string><string><a_file>panel_group_general.xml</a_file>

+<b_path>/general_tab/preferences_container/group_mature_check</b_path>

+<c_attribute>tool_tip</c_attribute>

 <d_old></d_old>

-<e_new>Auto Level</e_new>

+<e_new>Sets whether your group information is considered mature.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>����� ������ ���정</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/Control Modes:</b_path>

+<f_translation>그��� ������를 ���인용으��� 간���할��� 여부를 설���합니다.</f_translation>

+</string><string><a_file>panel_group_general.xml</a_file>

+<b_path>/general_tab/preferences_container/group_mature_check/select_mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                Control Modes:

-        </e_new>

+                        - Select Mature -

+                        </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                조절 모드:

-        </f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/XScale</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>X Scale</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>X 크기</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/YScale</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>Y Scale</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Y 크기</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/ZScale</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>Z Scale</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Z 크기</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/PitchScale</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>Pitch Scale</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>피치 크기</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/YawScale</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>Yaw Scale</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>요 크기</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/RollScale</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>Roll Scale</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>롤 크기</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/XDeadZone</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>X Dead Zone</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>X 사각지대</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/YDeadZone</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>Y Dead Zone</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Y 사각지대</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/ZDeadZone</b_path>

+                        - 성인용 컨텐츠 선택 -

+                        </f_translation>

+</string><string><a_file>panel_group_general.xml</a_file>

+<b_path>/general_tab/preferences_container/group_mature_check/mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Z Dead Zone</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>Z 사각지대</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/PitchDeadZone</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>Pitch Dead Zone</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>피치 사각지대</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/YawDeadZone</b_path>

-<c_attribute></c_attribute>

-<d_old></d_old>

-<e_new>Yaw Dead Zone</e_new>

+<e_new>

+                        Mature Content

+                        </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>요 사각지대</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/RollDeadZone</b_path>

+<f_translation>

+                        성인용 컨텐츠

+                        </f_translation>

+</string><string><a_file>panel_group_general.xml</a_file>

+<b_path>/general_tab/preferences_container/group_mature_check/not_mature</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Roll Dead Zone</e_new>

+<e_new>

+                        Not Mature Content

+                        </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>롤 사각지대</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/Feathering</b_path>

+<f_translation>

+                        성인용 컨텐츠 아님

+                        </f_translation>

+</string><string><a_file>panel_preferences_graphics1.xml</a_file>

+<b_path>/Display panel/WindowSizeLabel</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Feathering</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>부드러움 효과</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/AvatarFeathering</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/BuildFeathering</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/FlycamFeathering</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

+<e_new>

+                Window Size:

+        </e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/ZoomScale2</b_path>

+<f_translation>

+                창 크기:

+        </f_translation>

+</string><string><a_file>panel_preferences_graphics1.xml</a_file>

+<b_path>/Display panel/windowsize combo/640x480</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Zoom Scale</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>확대/축소 크기</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/FlycamAxisScale6</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

+<e_new>

+                        640x480

+                </e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/ZoomDeadZone</b_path>

+<f_translation>

+                        640x480

+                </f_translation>

+</string><string><a_file>panel_preferences_graphics1.xml</a_file>

+<b_path>/Display panel/windowsize combo/800x600</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Zoom Dead Zone</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>확대/축소 사각지대</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/FlycamAxisDeadZone6</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/SpaceNavigatorDefaults</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new>SpaceNavigator Defaults</e_new>

+<e_new>

+                        800x600 

+                </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>SpaceNavigator 기본값</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/JoystickMonitor</b_path>

+<f_translation>

+                        800x600 

+                </f_translation>

+</string><string><a_file>panel_preferences_graphics1.xml</a_file>

+<b_path>/Display panel/windowsize combo/720x480</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Joystick Monitor</e_new>

+<e_new>

+                        720x480 (NTSC)

+                </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>조이스틱 검사</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/Axis</b_path>

+<f_translation>

+                        720x480(NTSC)

+                </f_translation>

+</string><string><a_file>panel_preferences_graphics1.xml</a_file>

+<b_path>/Display panel/windowsize combo/768x576</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Axis [NUM]</e_new>

+<e_new>

+                        768x576 (PAL)

+                </e_new>

 <f_old_trans></f_old_trans>

-<f_translation>축 [NUM]</f_translation>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick/NoDevice</b_path>

+<f_translation>

+                        768x576(PAL)

+                </f_translation>

+</string><string><a_file>panel_preferences_graphics1.xml</a_file>

+<b_path>/Display panel/windowsize combo/1024x768</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>no device detected</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>검색된 장치가 없습니다.</f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiColorFilterPanel/wmiColorFilterBrightness</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiColorFilterPanel/wmiColorFilterSaturation</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiColorFilterPanel/wmiColorFilterContrast</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiNightVisionPanel/wmiNightVisionBrightMult</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiNightVisionPanel/wmiNightVisionNoiseSize</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiNightVisionPanel/wmiNightVisionNoiseStrength</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiBloomPanel/wmiBloomExtract</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

-<f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiBloomPanel/wmiBloomSize</b_path>

-<c_attribute>label</c_attribute>

-<d_old></d_old>

-<e_new></e_new>

+<e_new>

+                        1024x768

+                </e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>floater_post_process.xml</a_file>

-<b_path>/Post-Process Floater/Post-Process Tabs/wmiBloomPanel/wmiBloomStrength</b_path>

+<f_translation>

+                        1024x768

+                </f_translation>

+</string><string><a_file>panel_preferences_graphics1.xml</a_file>

+<b_path>/Display panel/QualityPerformanceSelection</b_path>

 <c_attribute>label</c_attribute>

 <d_old></d_old>

 <e_new></e_new>

 <f_old_trans></f_old_trans>

 <f_translation></f_translation>

-</string><string><a_file>floater_preview_classified.xml</a_file>

-<b_path>/classified_preview</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Classified Information</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>광고 정보</f_translation>

-</string><string><a_file>floater_preview_event.xml</a_file>

-<b_path>/event_preview</b_path>

-<c_attribute>title</c_attribute>

+</string><string><a_file>panel_preferences_web.xml</a_file>

+<b_path>/web/use_external_browser/internal</b_path>

+<c_attribute>tool_tip</c_attribute>

 <d_old></d_old>

-<e_new>Event Information</e_new>

+<e_new>Use the built-in web browser for help, web links, etc. This browser opens as a new window inside Second Life.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>��������� �����</f_translation>

-</string><string><a_file>floater_preview_gesture.xml</a_file>

-<b_path>/gesture_preview/library_label</b_path>

+<f_translation>도������, 웹 링��� 등은 ��컨드라이프 ��� 브라우������ ��립니다.</f_translation>

+</string><string><a_file>panel_region_general.xml</a_file>

+<b_path>/General/version_channel_text_lbl</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                Library:

+                Version: 

         </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                ������브러리:

+                ������: 

         </f_translation>

-</string><string><a_file>floater_preview_gesture.xml</a_file>

-<b_path>/gesture_preview/steps_label</b_path>

+</string><string><a_file>panel_region_general.xml</a_file>

+<b_path>/General/version_channel_text</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

 <e_new>

-                Steps:

+                unknown

         </e_new>

 <f_old_trans></f_old_trans>

 <f_translation>

-                단계:

+                알 수 없음

         </f_translation>

-</string><string><a_file>floater_preview_gesture.xml</a_file>

-<b_path>/gesture_preview/animation_trigger_type/start</b_path>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginInProgress</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Start

-                </e_new>

+<e_new>Logging in. [APP_NAME] may appear frozen.  Please wait.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        시작

-                </f_translation>

-</string><string><a_file>floater_preview_gesture.xml</a_file>

-<b_path>/gesture_preview/animation_trigger_type/stop</b_path>

+<f_translation>로그인 중. [APP_NAME]님은 정지된 상태로 나타날 수 있습니다.  잠시만 기다리십시오.</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginAuthenticating</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Stop

-                </e_new>

+<e_new>Authenticating</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        중지

-                </f_translation>

-</string><string><a_file>floater_preview_notecard_keep_discard.xml</a_file>

-<b_path>/preview_notecard/not_allowed</b_path>

+<f_translation>인증</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginMaintenance</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>You are not allowed to view this note.</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>사용자는 이 노트를 볼 수 없습니다.</f_translation>

-</string><string><a_file>floater_preview_url.xml</a_file>

-<b_path>/url_preview</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Place Information</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>장소 정보</f_translation>

-</string><string><a_file>floater_region_info.xml</a_file>

-<b_path>/regioninfo</b_path>

-<c_attribute>title</c_attribute>

-<d_old></d_old>

-<e_new>Region/Estate</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>지역/사유지</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolCube</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>Cube</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>정육면체</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolPrism</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>Prism</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>삼각기둥</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolPyramid</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>Pyramid</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>삼각뿔</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolTetrahedron</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>Tetrahedron</e_new>

+<e_new>Performing account maintenance...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>사면체</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolCylinder</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>Cylinder</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>원통</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolHemiCylinder</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>Hemicylinder</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>반원통</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolCone</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>Cone</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>원뿔</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolHemiCone</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>Hemicone</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>반원뿔</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolSphere</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>Sphere</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>구</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolHemiSphere</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old></d_old>

-<e_new>Hemisphere</e_new>

-<f_old_trans></f_old_trans>

-<f_translation>반구</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolTorus</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>계정 확인 중</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginAttempt</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Torus</e_new>

+<e_new>Previous login attempt failed. Logging in, attempt [NUMBER]</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>������</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolTube</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>���전 로그인 시도가 실���했습니다. [NUMBER]번째 로그인 시도 중</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginPrecaching</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Tube</e_new>

+<e_new>Loading world...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>관</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolRing</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>로딩 중</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginInitializingBrowser</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Ring</e_new>

+<e_new>Initializing embedded web browser...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>�����</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolTree</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>웹 ���라����� 초기화 중</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginVerifyingCache</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Tree</e_new>

+<e_new>Verifying cache files (can take 60-90 seconds)...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>나��</f_translation>

-</string><string><a_file>floater_tools.xml</a_file>

-<b_path>/toolbox floater/ToolGrass</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>캐시 파일 확인 중(60-90��� 소요)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginProcessingResponse</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Grass</e_new>

+<e_new>Processing Response...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>������</f_translation>

-</string><string><a_file>menu_viewer.xml</a_file>

-<b_path>/Main Menu/View/Joystick Flycam</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>������ 처리 중</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginInitializingWorld</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Joystick Flycam</e_new>

+<e_new>Initializing World...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>�����스��� Flycam</f_translation>

-</string><string><a_file>menu_viewer.xml</a_file>

-<b_path>/Main Menu/Help/Tutorial</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>��기��� 중</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginDecodingImages</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Tutorial</e_new>

+<e_new>Decoding images...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>튜토������</f_translation>

-</string><string><a_file>menu_viewer.xml</a_file>

-<b_path>/Main Menu/Help/separator7</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>이���디 디���딩 중</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginInitializingQuicktime</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>-----------</e_new>

+<e_new>Initializing QuickTime...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>-----------</f_translation>

-</string><string><a_file>menu_viewer.xml</a_file>

-<b_path>/Main Menu/Help/Bug Reporting/separator9</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>QuickTime 초기화 중...</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginQuicktimeNotFound</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>-----------</e_new>

+<e_new>QuickTime not found - unable to initialize.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>-----------</f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/web/</b_path>

+<f_translation>QuickTime을 찾을 수 없으므로 초기화할 수 없습니다.</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginQuicktimeOK</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Web Content

-                </e_new>

+<e_new>QuickTime initialized successfully.</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        웹 컨텐츠

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/web/</b_path>

+<f_translation>QuickTime이 성공적으로 초기화되었습니다.</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginWaitingForRegionHandshake</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        This location has Web content

-                </e_new>

+<e_new>Waiting for region handshake...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        이 위치에는 웹 컨텐츠가 포함되어 있습니다.

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/web/</b_path>

+<f_translation>지역 대기 중</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginConnectingToRegion</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Show Web content

-                </e_new>

+<e_new>Connecting to region...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        웹 컨텐츠 표시

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/movie/</b_path>

+<f_translation>지역에 연결하는 중</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoginDownloadingClothing</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie

-                </e_new>

+<e_new>Downloading clothing...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        동영상

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/movie/</b_path>

+<f_translation>의복 다운로드 중</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipPerson</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        There is a movie to play here

-                </e_new>

+<e_new>Person</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        여기서 동영상을 재생할 수 있습니다.

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/movie/</b_path>

+<f_translation>아바타</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipNoName</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Play movie

-                </e_new>

+<e_new>(no name)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        동영상 재생

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/none/</b_path>

+<f_translation>(이름 없음)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipOwner</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        No Content

-                </e_new>

+<e_new>Owner:</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        컨텐츠 없음

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/none/</b_path>

+<f_translation>소유자:</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipPublic</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        No media here

-                </e_new>

+<e_new>Public</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        미디어 없음

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/image/</b_path>

+<f_translation>공개</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipIsGroup</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image

-                </e_new>

+<e_new>(Group)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        이미지

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/image/</b_path>

+<f_translation>(그룹)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagScript</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        There is an image at this location

-                </e_new>

+<e_new>Script</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        이 위치에 이미지가 있습니다.

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/image/</b_path>

+<f_translation>스크립트</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagPhysics</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        View this location&apos;s image

-                </e_new>

+<e_new>Physics</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        이 위치의 이미지 보기

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/audio/</b_path>

+<f_translation>물리 엔진</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagTouch</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Audio

-                </e_new>

+<e_new>Touch</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        오디오

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/audio/</b_path>

+<f_translation>만지기</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagL$</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        There is audio at this location

-                </e_new>

+<e_new>L$</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        이 위치에 오디오가 있습니다.

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/audio/</b_path>

+<f_translation>L$</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagDropInventory</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        View this location&apos;s audio

-                </e_new>

+<e_new>Drop Inventory</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        이 위치의 오디오 보기

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/rtsp/</b_path>

+<f_translation>인벤토리 드롭</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagPhantom</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Real Time Streaming

-                </e_new>

+<e_new>Phantom</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        실시간 스트리밍

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/blank/</b_path>

+<f_translation>팬텀</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagTemporary</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        - None -

-                </e_new>

+<e_new>Temporary</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        - 없음 -

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;none/none&quot;/</b_path>

+<f_translation>임시</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagRightClickMenu</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        - None -

-                </e_new>

+<e_new>(Right-click for menu)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        - 없음 -

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;audio/*&quot;/</b_path>

+<f_translation>(오른쪽 클릭 메뉴)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFreeToCopy</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Audio

-                </e_new>

+<e_new>Free to copy</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        오디오

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/*&quot;/</b_path>

+<f_translation>무료 복사</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipForSaleL$</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Video

-                </e_new>

+<e_new>For Sale: L$[AMOUNT]</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        비디오

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;image/*&quot;/</b_path>

+<f_translation>판매: L$ [AMOUNT]</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipForSaleMsg</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image

-                </e_new>

+<e_new>For Sale: [MESSAGE]</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        이미지

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/vnd.secondlife.qt.legacy&quot;/</b_path>

+<f_translation>판매: [MESSAGE]</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagGroupBuild</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie (QuickTime)

-                </e_new>

+<e_new>Group Build</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        동영상(QuickTime)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/javascript&quot;/</b_path>

+<f_translation>그룹 만들기</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagNoBuild</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Javascript

-                </e_new>

+<e_new>No Build</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Javascript

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/ogg&quot;/</b_path>

+<f_translation>건축 금지</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagNoEdit</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Ogg Audio/Video

-                </e_new>

+<e_new>Group Build</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Ogg 오디오/비디오

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/pdf&quot;/</b_path>

+<f_translation>그룹 만들기</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagNotSafe</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        PDF Document

-                </e_new>

+<e_new>Not Safe</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        PDF 문서

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/postscript&quot;/</b_path>

+<f_translation>안전하지 않음</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagNoFly</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Postscript Document

-                </e_new>

+<e_new>No Fly</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        포스트스크립트 문서

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/rtf&quot;/</b_path>

+<f_translation>비행 금지</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagGroupScripts</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Rich Text (RTF)

-                </e_new>

+<e_new>Group Scripts</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        서식있는 텍스트(RTF)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/xhtml+xml&quot;/</b_path>

+<f_translation>그룹 스크립트</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipFlagNoScripts</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Web Page (XHTML)

-                </e_new>

+<e_new>No Scripts</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        웹 페이지(XHTML)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/x-director&quot;/</b_path>

+<f_translation>스크립트 금지</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//TooltipLand</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Macromedia Director

-                </e_new>

+<e_new>Land:</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        Macromedia Director

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;application/x-shockwave-flash&quot;/</b_path>

+<f_translation>토지:</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//RetrievingData</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Flash

-                </e_new>

+<e_new>Retrieving...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        플래시

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;audio/mid&quot;/</b_path>

+<f_translation>가져오는 중</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//LoadingData</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Audio (MIDI)

-                </e_new>

+<e_new>Loading...</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        오디오(MIDI)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;audio/mpeg&quot;/</b_path>

+<f_translation>로딩 중</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AvatarNameNobody</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Audio (MP3)

-                </e_new>

+<e_new>(nobody)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        오디오(MP3)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;audio/x-aiff&quot;/</b_path>

+<f_translation>(없음)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AvatarNameWaiting</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Audio (AIFF)

-                </e_new>

+<e_new>(waiting)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        오디오(AIFF)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;audio/x-wav&quot;/</b_path>

+<f_translation>(대기 중)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AvatarNameHippos</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Audio (WAV)

-                </e_new>

+<e_new>(hippos)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        오디오(WAV)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;image/bmp&quot;/</b_path>

+<f_translation>(하마)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//GroupNameNone</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image (BMP)

-                </e_new>

+<e_new>(none)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        이미지(BMP)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;image/gif&quot;/</b_path>

+<f_translation>(없음)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorNone</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image (GIF)

-                </e_new>

+<e_new>No error</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        이미지(GIF)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;image/jpeg&quot;/</b_path>

+<f_translation>오류 없음</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorRequestFailed</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image (JPEG)

-                </e_new>

+<e_new>Asset request: failed</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        이미지(JPEG)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;image/png&quot;/</b_path>

+<f_translation>자산 요청: 실패</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorNonexistentFile</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image (PNG)

-                </e_new>

+<e_new>Asset request: non-existent file</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        이미지(PNG)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;image/svg+xml&quot;/</b_path>

+<f_translation>자산 요청: 파일이 존재하지 않습니다.</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorNotInDatabase</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image (SVG)

-                </e_new>

+<e_new>Asset request: asset not found in database</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        이미지(SVG)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;image/tiff&quot;/</b_path>

+<f_translation>자산 요청: 데이터베이스에 자산이 없습니다.</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorEOF</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Image (TIFF)

-                </e_new>

+<e_new>End of file</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        이미지(TIFF)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;text/html&quot;/</b_path>

+<f_translation>파일 끝</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorCannotOpenFile</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Web Page

-                </e_new>

+<e_new>Cannot open file</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        웹 페이지

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;text/plain&quot;/</b_path>

+<f_translation>파일을 열 수 없습니다.</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorFileNotFound</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Text

-                </e_new>

+<e_new>File not found</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        텍스트

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;text/xml&quot;/</b_path>

+<f_translation>파일을 찾을 수 없습니다.</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorTCPTimeout</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        XML

-                </e_new>

+<e_new>File transfer timeout</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        XML

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/mpeg&quot;/</b_path>

+<f_translation>파일 전송 시간초과</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorCircuitGone</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie (MPEG)

-                </e_new>

+<e_new>Circuit gone</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        동영상(MPEG)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/mp4&quot;/</b_path>

+<f_translation>연결이 끊겼습니다.</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AssetErrorUnknownStatus</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie (MP4)

-                </e_new>

+<e_new>Unknown status</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        동영상(MP4)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/quicktime&quot;/</b_path>

+<f_translation>알 수 없는 상태</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AvatarEditingApparance</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie (QuickTime)

-                </e_new>

+<e_new>(Editing Appearance)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        동영상(QuickTime)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/x-ms-asf&quot;/</b_path>

+<f_translation>(내 모습 편집)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AvatarAway</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie (Windows Media ASF)

-                </e_new>

+<e_new>Away</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        동영상(Windows Media ASF)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/x-ms-wmv&quot;/</b_path>

+<f_translation>자리비움</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AvatarBusy</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie (Windows Media WMV)

-                </e_new>

+<e_new>Busy</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        동영상(Windows Media WMV)

-                </f_translation>

-</string><string><a_file>mime_types.xml</a_file>

-<b_path>/default/&quot;video/x-msvideo&quot;/</b_path>

+<f_translation>다른 용무 중</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//AvatarMuted</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Movie (AVI)

-                </e_new>

+<e_new>Muted</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        동영상(AVI)

-                </f_translation>

-</string><string><a_file>notify.xml</a_file>

-<b_path>//RezItemNoPermissions/message</b_path>

+<f_translation>음소거</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_afraid</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Insufficient permissions to rez object.

-                </e_new>

+<e_new>Afraid</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        rez 오브젝트에 대한 권한이 부족합니다.

-                </f_translation>

-</string><string><a_file>panel_audio.xml</a_file>

-<b_path>/Media panel/mute_audio</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>두려움</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_anger</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Angry</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_audio.xml</a_file>

-<b_path>/Media panel/mute_music</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>화남</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_away</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Away</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_audio.xml</a_file>

-<b_path>/Media panel/mute_media</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>자리비움</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_backflip</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Backflip</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_audio.xml</a_file>

-<b_path>/Media panel/mute_voice</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>뒤공중제비</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_laugh</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Belly Laugh</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_audio.xml</a_file>

-<b_path>/Media panel/mute_sfx</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>포복 절도</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_toothsmile</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>BigSmile</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_audio.xml</a_file>

-<b_path>/Media panel/mute_wind</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>함박 웃음</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_blowkiss</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Blow Kiss</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_audio.xml</a_file>

-<b_path>/Media panel/mute_ui</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>키스를 날리는 모습</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_bored</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Bored</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_groups.xml</a_file>

-<b_path>/groups/group list/name</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>지루함</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_bow</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Bow</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_group_invite.xml</a_file>

-<b_path>/invite_panel/help_text</b_path>

+<f_translation>인사</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_clap</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                You can select multiple residents to 

-invite to your group. Click &apos;Open 

-Person Chooser&apos; to start.

-        </e_new>

+<e_new>Clap</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                여러 주민을 선택하여 

-그룹에 초대할 수 있습니다. '주민 

-선택기 열기'를 클릭하여 시작합니다.

-        </f_translation>

-</string><string><a_file>panel_group_invite.xml</a_file>

-<b_path>/invite_panel/role_text</b_path>

+<f_translation>박수</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_courtbow</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Choose what Role to assign them to:

-        </e_new>

+<e_new>Court Bow</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                할당할 역할을 선택하십시오:

-        </f_translation>

-</string><string><a_file>panel_group_invite.xml</a_file>

-<b_path>/invite_panel/confirm_invite_owner_str</b_path>

+<f_translation>알현</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_cry</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Are you sure you want to invite new owner(s)? This action is permanent!

-        </e_new>

+<e_new>Cry</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                새 소유자를 초대하시겠습니까? 이 기능은 영구적으로 적용됩니다!

-        </f_translation>

-</string><string><a_file>panel_master_volume.xml</a_file>

-<b_path>/master_volume/mute_master</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>울기</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance1</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Dance 1</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/play_label</b_path>

+<f_translation>댄스 1</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance2</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Play

-        </e_new>

+<e_new>Dance 2</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                재생

-        </f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/stop_label</b_path>

+<f_translation>댄스 2</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance3</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Stop

-        </e_new>

+<e_new>Dance 3</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                중지

-        </f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/pause_label</b_path>

+<f_translation>댄스 3</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance4</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Pause

-        </e_new>

+<e_new>Dance 4</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                일시 정지

-        </f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/default_tooltip_label</b_path>

+<f_translation>댄스 4</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance5</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                No Media Specified

-        </e_new>

+<e_new>Dance 5</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                지정된 미디어가 없습니다.

-        </f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/media_hidden_label</b_path>

+<f_translation>댄스 5</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance6</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                (URL hidden by parcel owner)

-        </e_new>

+<e_new>Dance 6</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                (구획 소유자에 의해 URL이 숨겨져 있습니다.)

-        </f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/media_icon_tooltip_web</b_path>

+<f_translation>댄스 6</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance7</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                This location displays content from the World Wide Web. Click the Play button to display Web content.

-        </e_new>

-<f_old_trans></f_old_trans>

-<f_translation>

-                이 위치에서는 WWW의 컨텐츠가 표시됩니다. 웹 컨텐츠를 표시하려면 재생 버튼을 클릭하십시오.

-        </f_translation>

+<e_new>Dance 7</e_new>

 <f_old_trans></f_old_trans>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/media_icon_tooltip_movie</b_path>

+<f_translation>댄스 7</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_dance8</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                This location displays Video content. Click the Play button to play the video.

-        </e_new>

+<e_new>Dance 8</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                이 위치에서는 비디오 컨텐츠가 표시됩니다. 비디오를 재생하려면 재생 버튼을 클릭하십시오.

-        </f_translation>

-</string><string><a_file>panel_media_remote_expanded.xml</a_file>

-<b_path>/media_remote/media_play_tooltip</b_path>

+<f_translation>댄스 8</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_disdain</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Display Web content at this location.

-        </e_new>

+<e_new>Disdain</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                이 위치에서 웹 컨텐츠를 재생합니다.

-        </f_translation>

-</string><string><a_file>panel_place.xml</a_file>

-<b_path>/Place/name_label</b_path>

+<f_translation>경멸</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_drink</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Name:

-        </e_new>

+<e_new>Drink</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                이름:

-        </f_translation>

-</string><string><a_file>panel_place.xml</a_file>

-<b_path>/Place/description_label</b_path>

+<f_translation>술 취함</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_embarrased</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Description:

-        </e_new>

+<e_new>Embarrassed</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                설명:

-        </f_translation>

-</string><string><a_file>panel_place.xml</a_file>

-<b_path>/Place/information_label</b_path>

+<f_translation>당황함</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_angry_fingerwag</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Information:

-        </e_new>

+<e_new>Finger Wag</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                정보:

-        </f_translation>

-</string><string><a_file>panel_place.xml</a_file>

-<b_path>/Place/location_label</b_path>

+<f_translation>손가락 흔들기</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_fist_pump</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Location:

-        </e_new>

+<e_new>Fist Pump</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                위치:

-        </f_translation>

-</string><string><a_file>panel_place_small.xml</a_file>

-<b_path>/Place/name_label</b_path>

+<f_translation>주먹 휘두르기</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_yoga_float</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Name:

-        </e_new>

+<e_new>Floating Yoga</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                이름:

-        </f_translation>

-</string><string><a_file>panel_place_small.xml</a_file>

-<b_path>/Place/description_label</b_path>

+<f_translation>공중부양</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_frown</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Description:

-        </e_new>

+<e_new>Frown</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                설명:

-        </f_translation>

-</string><string><a_file>panel_place_small.xml</a_file>

-<b_path>/Place/information_label</b_path>

+<f_translation>표정 찡그림</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_impatient</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Information:

-        </e_new>

+<e_new>Impatient</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                정보:

-        </f_translation>

-</string><string><a_file>panel_place_small.xml</a_file>

-<b_path>/Place/location_label</b_path>

+<f_translation>조급함</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_jumpforjoy</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Location:

-        </e_new>

+<e_new>Jump For Joy</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                위치:

-        </f_translation>

-</string><string><a_file>panel_preferences_chat.xml</a_file>

-<b_path>/chat/im</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>기쁨에 펄쩍 뜀</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_kissmybutt</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>IM</e_new>

+<e_new>Kiss My Butt</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>��������</f_translation>

-</string><string><a_file>panel_preferences_general.xml</a_file>

-<b_path>/general_panel/fade_out_combobox/Never</b_path>

+<f_translation>��� 엉�������� 키스</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_kiss</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Never

-                </e_new>

+<e_new>Kiss</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        안함

-                </f_translation>

-</string><string><a_file>panel_preferences_general.xml</a_file>

-<b_path>/general_panel/fade_out_combobox/Show Temporarily</b_path>

+<f_translation>키스</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_laugh_short</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Show Temporarily

-                </e_new>

+<e_new>Laugh</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        임시로 표시

-                </f_translation>

-</string><string><a_file>panel_preferences_general.xml</a_file>

-<b_path>/general_panel/fade_out_combobox/Always</b_path>

+<f_translation>웃음</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_musclebeach</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                        Always

-                </e_new>

+<e_new>Muscle Beach</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                        항상

-                </f_translation>

-</string><string><a_file>panel_preferences_general.xml</a_file>

-<b_path>/general_panel/group_titles_textbox</b_path>

+<f_translation>근육 비치</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_no_unhappy</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Group Titles:

-        </e_new>

+<e_new>No (Unhappy)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                그룹 타이틀:

-        </f_translation>

-</string><string><a_file>panel_preferences_general.xml</a_file>

-<b_path>/general_panel/show_all_title_checkbox</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>강한 부정</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_no_head</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Hide All Group Titles</e_new>

+<e_new>No</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>���든 그룹 �����틀 숨기기</f_translation>

-</string><string><a_file>panel_preferences_graphics1.xml</a_file>

-<b_path>/Display panel/QualityPerformanceSelection</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>������</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_nyanya</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Nya-nya-nya</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_preferences_input.xml</a_file>

-<b_path>/Input panel/Camera Follow Distance:</b_path>

+<f_translation>냐-냐-냐</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_punch_onetwo</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Camera Follow Distance:

-        </e_new>

+<e_new>One-Two Punch</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                카메라 이동 거리:

-        </f_translation>

-</string><string><a_file>panel_preferences_input.xml</a_file>

-<b_path>/Input panel/Camera Transition Time:</b_path>

+<f_translation>원투 펀치</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_open_mouth</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Camera Transition Time:

-        </e_new>

+<e_new>Open Mouth</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                카메라 전환 시간:

-        </f_translation>

-</string><string><a_file>panel_preferences_input.xml</a_file>

-<b_path>/Input panel/Camera Smoothing:</b_path>

+<f_translation>입을 크게 벌린 모습</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_peace</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Camera Smoothing:

-        </e_new>

+<e_new>Peace</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                카메라 스무딩:

-        </f_translation>

-</string><string><a_file>panel_preferences_input.xml</a_file>

-<b_path>/Input panel/joystic_setup_button</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>평화</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_point_you</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Joystick Setup</e_new>

+<e_new>Point at Other</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>조이스��� ������</f_translation>

-</string><string><a_file>panel_preferences_popups.xml</a_file>

-<b_path>/popups/dont_show_label</b_path>

+<f_translation>���른 ���람��� 가리킴</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_point_me</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Do not show popups:

-        </e_new>

+<e_new>Point at Self</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                팝업 차단:

-        </f_translation>

-</string><string><a_file>panel_preferences_popups.xml</a_file>

-<b_path>/popups/show_label</b_path>

+<f_translation>자신을 가리킴</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_punch_l</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                Show popups:

-        </e_new>

+<e_new>Punch Left</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                허용된 팝업:

-        </f_translation>

-</string><string><a_file>panel_speaker_controls.xml</a_file>

-<b_path>/active_speakers_panel/panels/moderation_mode_panel/moderation_mode/OpenVoice</b_path>

+<f_translation>좌측 펀치</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_punch_r</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                                        Open Voice (default)

-                                </e_new>

+<e_new>Punch Right</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                                        음성 사용(기본 설정)

-                                </f_translation>

-</string><string><a_file>panel_speaker_controls.xml</a_file>

-<b_path>/active_speakers_panel/panels/moderation_mode_panel/moderation_mode/ModeratedVoice</b_path>

+<f_translation>우측 펀치</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_rps_countdown</b_path>

 <c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>

-                                        Moderated Voice

-                                </e_new>

+<e_new>RPS count</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>

-                                        음성 제어

-                                </f_translation>

-</string><string><a_file>panel_speaker_controls.xml</a_file>

-<b_path>/active_speakers_panel/panels/moderate_chat_panel/speakers_list/speaking_status</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>가위-바위-보</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_rps_paper</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>RPS paper</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_speaker_controls.xml</a_file>

-<b_path>/active_speakers_panel/panels/moderate_chat_panel/speaker_controls/profile_btn</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>가위-바위-보에 보자기</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_rps_rock</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>RPS rock</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_status_bar.xml</a_file>

-<b_path>/status/menubar_search_bevel_bg</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>가위-바위-보에 바위</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_rps_scissors</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>RPS scissors</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/toolbar_stack/chat_btn</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>가위-바위-보에 가위</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_repulsed</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Repulsed</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/toolbar_stack/chat_btn</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>거절됨</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_kick_roundhouse_r</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Show Chat Bar. (Enter)</e_new>

+<e_new>Roundhouse Kick</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>채팅 �����줄 표시 (입력)</f_translation>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/toolbar_stack/communicate_btn</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>�����기</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_sad</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Communicate</e_new>

+<e_new>Sad</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>통���</f_translation>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/toolbar_stack/communicate_btn</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>���픔</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_salute</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Communicate with your Friends and Groups.</e_new>

+<e_new>Salute</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>친��� ��� 그룹과 통신합니다.</f_translation>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/toolbar_stack/fly_btn</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>������</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_shout</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Fly</e_new>

+<e_new>Shout</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>���행</f_translation>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/toolbar_stack/fly_btn</b_path>

-<c_attribute>label_selected</c_attribute>

+<f_translation>외���기</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_shrug</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Stop Flying</e_new>

+<e_new>Shrug</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>비��� ������</f_translation>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/toolbar_stack/fly_btn</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>���깨 ������하기</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_smile</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Start flying. Use E/C or PgUp/PgDn to fly up and down.</e_new>

+<e_new>Smile</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>���행 ���작. 위, 아래로 비행하려면 E/C 또는 PgUp/PgDn을 사용하십시오.</f_translation>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/toolbar_stack/snapshot_btn</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>������</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_smoke_idle</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Snapshot</e_new>

+<e_new>Smoke Idle</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>��������</f_translation>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/toolbar_stack/snapshot_btn</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>담배를 ���고 있��� ������</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_smoke_inhale</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Save a screen shot to disk or inventory.</e_new>

+<e_new>Smoke Inhale</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>���스크 ������ ������토리��� 스크���샷 ���장.</f_translation>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/toolbar_stack/directory_btn</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>��������� 빨������������ 모���</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_smoke_throw_down</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Search</e_new>

+<e_new>Smoke Throw Down</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>검���</f_translation>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/toolbar_stack/directory_btn</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>담배 던���기</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_surprise</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Search for places, events, people, and more.</e_new>

+<e_new>Surprise</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>장소, 이���트, 사람, 더 자세히 등을 검색할 수 있습니다.</f_translation>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/toolbar_stack/build_btn</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>���람</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_sword_strike_r</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Build</e_new>

+<e_new>Sword Strike</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>���들기</f_translation>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/toolbar_stack/build_btn</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>검 ���기 </f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_angry_tantrum</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Create new objects.</e_new>

+<e_new>Tantrum</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>��� ���브��트를 만듭니다.</f_translation>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/toolbar_stack/map_btn</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>������</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_tongue_out</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Map</e_new>

+<e_new>TongueOut</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>지���</f_translation>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/toolbar_stack/map_btn</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>���롱</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_hello</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Map of the world. (Ctrl-M)</e_new>

+<e_new>Wave</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>����� 지도 (Ctrl-M)</f_translation>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/toolbar_stack/radar_btn</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>��� ����기</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_whisper</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Mini-Map</e_new>

+<e_new>Whisper</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>미니�����</f_translation>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/toolbar_stack/radar_btn</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>���삭��</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_whistle</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Map of the area around you. (Ctrl-Shift-M)</e_new>

+<e_new>Whistle</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>내 주변 ���역의 지��� (Ctrl-Shitf-M)</f_translation>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/toolbar_stack/inventory_btn</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>��파���</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_wink</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Inventory</e_new>

+<e_new>Wink</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>���벤�����</f_translation>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/toolbar_stack/inventory_btn</b_path>

-<c_attribute>tool_tip</c_attribute>

+<f_translation>������</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_wink_hollywood</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new>Your items. (Ctrl-I)</e_new>

+<e_new>Wink (Hollywood)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation>�������. (Ctrl-I)</f_translation>

-</string><string><a_file>panel_voice_remote_expanded.xml</a_file>

-<b_path>/voice_remote/voice_channel_bg</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>���크(���리�����)</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_express_worry</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Worry</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_voice_remote_expanded.xml</a_file>

-<b_path>/voice_remote/voice_channel_icon</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>걱정</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_yes_happy</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Yes (Happy)</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

-</string><string><a_file>panel_voice_remote_expanded.xml</a_file>

-<b_path>/voice_remote/channel_label</b_path>

-<c_attribute>label</c_attribute>

+<f_translation>강항 동의</f_translation>

+</string><string><a_file>strings.xml</a_file>

+<b_path>//anim_yes_head</b_path>

+<c_attribute></c_attribute>

 <d_old></d_old>

-<e_new></e_new>

+<e_new>Yes</e_new>

 <f_old_trans></f_old_trans>

-<f_translation></f_translation>

+<f_translation>동의</f_translation>

 </string>

 </strings>

diff --git a/linden/indra/newview/skins/xui/ko/need_to_update.xml b/linden/indra/newview/skins/xui/ko/need_to_update.xml
index 7fd004d..9d8b773 100644
--- a/linden/indra/newview/skins/xui/ko/need_to_update.xml
+++ b/linden/indra/newview/skins/xui/ko/need_to_update.xml
@@ -2,346 +2,176 @@
 

 <strings>

 <string><a_file>alerts.xml</a_file>

-<b_path>//GrantModifyRights/message</b_path>

+<b_path>//ClothingLoading/message</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        Granting modify rights to another resident allows them to change 

-ANY objects you may have in-world. Be VERY careful when handing 

-out this permission.

-Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?

+                        Your clothing is still downloading.

+You can use the world normally, and other users

+will see you correctly.

                 </d_old>

 <e_new>

-                        Granting modify rights to another resident allows them to change,

-delete or take ANY objects you may have in-world. Be VERY careful

-when handing out this permission.

-Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?

+                        Your clothing is still downloading. 

+You can use [SECOND_LIFE] normally and other users will see you correctly.

                 </e_new>

 <f_translation>

-                        제3의 주민에게 수정 권한을 부여함으로써, 제3의 주민은 사용자가 인월드에서 가지고 있는 오브젝트 모두를

-변경, 삭제 또는 가져올 수 있습니다. 본 허가권의 취급 시 각별히

-주의하십시오.

-[FIRST_NAME] [LAST_NAME]에게 수정할 수 있는 권리를 부여하시겠습니까?

+                        의복을 다운로드하고 있습니다. 

+[SECOND_LIFE]를 사용할 수 있으며 다른 사용자에게 귀하의 모습이 정상적으로 표시될 것입니다.

                 </f_translation>

 <f_old_trans>

-                        제3의 주민에게 수정 권한을 부여함으로써, 제3의 주민은 본인이 가지고 있는 오브젝트 모두를 

-변경할 수 있습니다. 본 허가권의 취급 시 주의 

-하십시오.

-[FIRST_NAME] [LAST_NAME]님에게 수정 권한을 부여 하시겠습니까?

+                        의상을 다운로드하는 중입니다.

+일반적으로 세컨드라이프를 사용할 수 있으며 다른 사용자에게

+귀하의 모습이 제대로 표시될 것입니다.

                 </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//CannotBuyLandNoRegion/message</b_path>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/places_panel/searching_text</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        Unable to buy land:

-Cannot find the region this land is in.

-                </d_old>

-<e_new>

-                        Unable to buy land:

-                        Cannot find the region this land is in.

-                </e_new>

-<f_translation>

-                        토지를 구매하지 못했습니다:

-                        이 토지가 소속된 지역을 찾을 수 없습니다.

-                </f_translation>

+                                Searching...

+                        </d_old>

+<e_new>Searching...</e_new>

+<f_translation>검색</f_translation>

 <f_old_trans>

-                        토지를 구매하지 못했습니다:

-이 토지가 소속된 지역을 찾을 수 없습니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ParcelCanPlayMedia/message</b_path>

+                                검색

+                        </f_old_trans>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/places_panel/not_found_text</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        This location can play streaming video. 

-Streaming video requires a 768 kbps or 

-faster Internet connection.

- 

-Play streaming video when available?

-(You can change this option later under 

-Preferences &gt; Audio &amp; Video.)

-                </d_old>

-<e_new>

-                        This location can play streaming media. 

-Streaming media requires a fast Internet connection.

- 

-Play streaming media when available?

-(You can change this option later under 

-Preferences &gt; Audio &amp; Video.)

-                </e_new>

-<f_translation>

-                        이 지역에서는 스트리밍 미디어를 재생할 수 있습니다. 

-스트리밍 미디어를 재생하려면 고속 인터넷 연결이 필요합니다.

- 

-가능한 경우 스트리밍 미디어를 재생하시겠습니까?

-('환경 설정 &gt; 사운드/비디오'에서 

-이 옵션을 변경할 수 있습니다.)

-                </f_translation>

+                                None Found.

+                        </d_old>

+<e_new>None Found.</e_new>

+<f_translation>검색 결과가 없습니다.</f_translation>

 <f_old_trans>

-                        이 지역에서는 스트리밍 비디오를 재생할 수 있습니다. 

-스트리밍 비디오를 재생하려면 768 kbps 이상의 

-인터넷 연결이 필요합니다.

- 

-가능한 경우 스트리밍 비디오를 재생하시겠습니까?

-(나중에 &apos;환경 설정 &gt; 사운드/비디오&apos;에서 

-이 옵션을 변경할 수 있습니다.)

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//ConfirmClearBrowserCache/message</b_path>

+                                발견되지 않음

+                        </f_old_trans>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/people_panel/find</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        Are you sure you want to clear your

-browser cache?

-                </d_old>

+                                Find:

+                        </d_old>

 <e_new>

-                        Are you sure you want to clear your browser cache?

-                </e_new>

+        Find:

+      </e_new>

 <f_translation>

-                        브라���저의 캐시를 전부 삭제하시���습니까?

-                </f_translation>

+        �����:

+      </f_translation>

 <f_old_trans>

-                        브라우저의 캐쉬를 전부 삭제 하������습니까?

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpWaterNormalMap/message</b_path>

+                                ������:

+                        </f_old_trans>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/searching_text</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        Controls what normal map is layered across the water

-to determine reflections/refractions.

-                </d_old>

-<e_new>

-                        Controls what normal map is layered across the water to determine reflections/refractions.

-                </e_new>

-<f_translation>

-                        수면에 겹쳐지는 일반 맵을 조절하여 반사/굴절률을 결정합니다.

-                </f_translation>

+                                Searching...

+                        </d_old>

+<e_new>Searching...</e_new>

+<f_translation>검색</f_translation>

 <f_old_trans>

-                        수면에 겹쳐지는 일반 맵을 조절하여

-반사/굴절률을 결정합니다.

-                </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpWaterWave1/message</b_path>

+                                검색

+                        </f_old_trans>

+</string><string><a_file>floater_directory.xml</a_file>

+<b_path>/directory/Directory Tabs/groups_panel/not_found_text</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        Controls where and how fast the large scaled version of the normal

-map moves in the X and Y direction.

+                                None Found.

+                        </d_old>

+<e_new>None Found.</e_new>

+<f_translation>검색 결과가 없습니다.</f_translation>

+<f_old_trans>

+                                발견되지 않음

+                        </f_old_trans>

+</string><string><a_file>floater_script_debug.xml</a_file>

+<b_path>/script debug floater</b_path>

+<c_attribute>title</c_attribute>

+<d_old>Script Errors/Warning</d_old>

+<e_new>Script Warning/Error</e_new>

+<f_translation>스크립트 경고/오류</f_translation>

+<f_old_trans>스크립트 오류/경고</f_old_trans>

+</string><string><a_file>floater_world_map.xml</a_file>

+<b_path>/worldmap/friend combo</b_path>

+<c_attribute>label</c_attribute>

+<d_old>My Friends</d_old>

+<e_new>Online Friends</e_new>

+<f_translation>온라인 친구 보기</f_translation>

+<f_old_trans>내 친구들</f_old_trans>

+</string><string><a_file>floater_world_map.xml</a_file>

+<b_path>/worldmap/friend combo/none_selected</b_path>

+<c_attribute></c_attribute>

+<d_old>

+                        My Friends

                 </d_old>

 <e_new>

-                        Controls where and how fast the large scaled version of the normal map moves in the X and Y direction.

+                        Online Friends

                 </e_new>

 <f_translation>

-                        일반 맵의 확장된 버전이 X 및 Y 방향으로 이동할 때의 위치와 속도를 조절합니다.

+                        온라인 친구 보기

                 </f_translation>

 <f_old_trans>

-                        일반 맵의 확장된 버전이 X 및 Y 방향으로 이동할 때의 위치와

-속도를 조절합니다.

+                        내 친구들

                 </f_old_trans>

-</string><string><a_file>alerts.xml</a_file>

-<b_path>//HelpWaterWave2/message</b_path>

+</string><string><a_file>floater_world_map.xml</a_file>

+<b_path>/worldmap/landmark combo</b_path>

+<c_attribute>label</c_attribute>

+<d_old>My Landmarks</d_old>

+<e_new>Landmarks</e_new>

+<f_translation>랜드마크 보기</f_translation>

+<f_old_trans>내 랜드마크</f_old_trans>

+</string><string><a_file>floater_world_map.xml</a_file>

+<b_path>/worldmap/landmark combo/none_selected</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                        Controls where and how fast the the small scaled version of the

-normal map moves in the X and Y direction.

+                        My Landmarks

                 </d_old>

 <e_new>

-                        Controls where and how fast the the small scaled version of the normal map moves in the X and Y direction.

+                        Landmarks

                 </e_new>

 <f_translation>

-                        일반 맵의 축소된 버전이 X 및 Y 방향으로 이동할 때의 위치와 속도를 조절합니다.

+                        랜드마크 보기

                 </f_translation>

 <f_old_trans>

-                        일반 맵의 축소된 버전이 X 및 Y 방향으로 이동할 때의 위치와

-속도를 조절합니다.

+                        내 랜드마크

                 </f_old_trans>

-</string><string><a_file>floater_buy_land.xml</a_file>

-<b_path>/buy land/land_use_reason</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                You hold 1,309 square meters of land.

-This parcel is 512 square meters of land.

-        </d_old>

-<e_new>

-                You hold 1,309 square meters of land. 

-This parcel is 512 square meters of land.

-        </e_new>

-<f_translation>

-                귀하는 현재 1,309 제곱 미터의 토지를 소유하고 있습니다. 

-이 구획은 512 제곱 미터입니다.

-        </f_translation>

-<f_old_trans>

-                귀하는 현재 1,309 제곱 미터의 토지를 소유하고 있습니다.

-이 구획은 512 제곱 미터입니다.

-        </f_old_trans>

-</string><string><a_file>floater_buy_land.xml</a_file>

-<b_path>/buy land/multiple_parcels_selected</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                Multiple different parcels selected.

-Try selecting a smaller area.

-        </d_old>

-<e_new>

-                Multiple different parcels selected. 

-Try selecting a smaller area.

-        </e_new>

-<f_translation>

-                여러 개의 각기 다른 구획이 선택되었습니다. 

-더 작은 영역을 선택해 주십시오.

-        </f_translation>

-<f_old_trans>

-                여러개의 각기 다른 구획이 선택되었습니다.

-더 작은 영역을 선택해 주십시오.

-        </f_old_trans>

-</string><string><a_file>floater_buy_land.xml</a_file>

-<b_path>/buy land/not_owned_by_you</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                Land owned by another user is selected.

-Try selecting a smaller area.

-        </d_old>

-<e_new>

-                Land owned by another user is selected. 

-Try selecting a smaller area.

-        </e_new>

-<f_translation>

-                다른 사용자 소유의 토지가 선택되었습니다. 

-더 작은 영역을 선택해 주십시오.

-        </f_translation>

-<f_old_trans>

-                다른 사용자 소유의 토지가 선택되었습니다.

-더 작은 영역을 선택해 주십시오.

-        </f_old_trans>

-</string><string><a_file>floater_buy_land.xml</a_file>

-<b_path>/buy land/for_first_time_group</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                This land is reserved for first time buyers.

-You cannot buy it for a group.

-        </d_old>

-<e_new>

-                This land is reserved for first time buyers. 

-You cannot buy it for a group.

-        </e_new>

-<f_translation>

-                이 토지는 최초 구매자를 위해 예약되었습니다. 

-그룹용으로 구입할 수 없습니다.

-        </f_translation>

-<f_old_trans>

-                이 토지는 최초 구매자를 위해 예약되었습니다.

-그룹용으로 구입할 수 없습니다.

-        </f_old_trans>

-</string><string><a_file>floater_buy_land.xml</a_file>

-<b_path>/buy land/for_first_time</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                This land is reserved for first time buyers.

-You already own land.

-        </d_old>

-<e_new>

-                This land is reserved for first time buyers. 

-You already own land.

-        </e_new>

-<f_translation>

-                이 토지는 최초 구매자를 위해 예약되었습니다. 

-귀하는 이미 토지를 소유하고 있습니다.

-        </f_translation>

-<f_old_trans>

-                이 토지는 최초 구매자를 위해 예약되었습니다.

-귀하는 이미 토지를 소유하고 있습니다.

-        </f_old_trans>

-</string><string><a_file>floater_gesture.xml</a_file>

-<b_path>/gestures/help_label</b_path>

+</string><string><a_file>panel_avatar_classified.xml</a_file>

+<b_path>/Classified/classified_mature_check</b_path>

+<c_attribute>label</c_attribute>

+<d_old>Mature</d_old>

+<e_new></e_new>

+<f_translation></f_translation>

+<f_old_trans>성인용</f_old_trans>

+</string><string><a_file>panel_group_notices.xml</a_file>

+<b_path>/notices_tab/lbl2</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                Click a gesture or press a key to play animations and sounds.

+                Notices are kept for 30 days. Click the notice below you wish to view.

+Click the &apos;Refresh&apos; button to check if new notices have been received.

         </d_old>

 <e_new>

-                Double-click a gesture to play animations and sounds.

+                Notices are kept for 14 days. Click the notice below you wish to view.

+Click the &apos;Refresh&apos; button to check if new notices have been received.

+Notice lists are limited to 200 notices per group on a daily basis.

         </e_new>

 <f_translation>

-                제스처를 더블클릭하여 애니메이션과 사운드를 재생합니다.

+                공지는 14일 동안 보관됩니다. 보려는 공지를 다음에서 클릭하십시오.

+새로운 공지를 수령한 경우 &apos;새로고침&apos; 버튼을 클릭하십시오.

+공지 목록은 매일 그룹당 200개로 제한됩니다.

         </f_translation>

 <f_old_trans>

-                이름을 더블클릭 또는 키를 눌러 제스처를 재생합니다.

-        </f_old_trans>

-</string><string><a_file>floater_joystick.xml</a_file>

-<b_path>/Joystick</b_path>

-<c_attribute>title</c_attribute>

-<d_old>Flycam Options</d_old>

-<e_new>Joystick Configuration</e_new>

-<f_translation>조이스틱 설정</f_translation>

-</string><string><a_file>floater_preview_notecard_keep_discard.xml</a_file>

-<b_path>/preview_notecard/no_object</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                Unable to find object containing this note.:

-        </d_old>

-<e_new>Unable to find object containing this note.:</e_new>

-<f_translation>이 노트를 포함하는 오브젝트를 찾을 수 없음:</f_translation>

-<f_old_trans>

-                이 노트를 포함하는 오브젝트를 찾을 수 없음:

+                공지는 14일 동안 보관됩니다. 보려는 공지를 다음에서 클릭하십시오.

+새로운 공지를 수령한 경우 &apos;새로고침&apos; 버튼을 클릭하십시오.

         </f_old_trans>

-</string><string><a_file>panel_friends.xml</a_file>

-<b_path>/friends/friend_list/icon_edit_mine</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old>Friend can edit your objects</d_old>

-<e_new>Friend can edit, delete or take objects</e_new>

-<f_translation>친구가 내 오브젝트를 편집, 삭제 또는 가져갈 수 있도록 설정</f_translation>

-<f_old_trans>친구가 내 오브젝트를 편집할 수 있도록 설정</f_old_trans>

-</string><string><a_file>panel_group_invite.xml</a_file>

-<b_path>/invite_panel/invitee_list</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old>Hold the Ctrl key and click resident names  to multi-select.</d_old>

-<e_new>Hold the Ctrl key and click resident names to multi-select.</e_new>

-<f_translation>Ctrl 키를 누르고 주민 이름을 클릭하여 여러 명을 선택합니다.</f_translation>

-<f_old_trans>여러 명을 선택하기 위해서는 Ctrl 키를 누르고 이름을 클릭하면 됩니다.</f_old_trans>

-</string><string><a_file>panel_group_invite.xml</a_file>

-<b_path>/invite_panel/role_name</b_path>

-<c_attribute>tool_tip</c_attribute>

-<d_old>Choose from the list of Roles you  are allowed to assign members to.</d_old>

-<e_new>Choose from the list of Roles you are allowed to assign members to.</e_new>

-<f_translation>회원을 할당할 수 있게 허가된 역할 목록에서 선택합니다.</f_translation>

-<f_old_trans>회원을 할당할 수 있게 허가된 역할 목록에서 선택합니다.</f_old_trans>

-</string><string><a_file>panel_group_invite.xml</a_file>

-<b_path>/invite_panel/loading</b_path>

+</string><string><a_file>panel_login.xml</a_file>

+<b_path>/panel_login/forgot_password_text</b_path>

 <c_attribute></c_attribute>

 <d_old>

-                (loading...)

+                Forgot your password?

         </d_old>

-<e_new>(loading...)</e_new>

-<f_translation>(로딩 중...)</f_translation>

-<f_old_trans>

-                (로딩 중¡¦}

-        </f_old_trans>

-</string><string><a_file>panel_preferences_chat.xml</a_file>

-<b_path>/chat/users</b_path>

-<c_attribute>label</c_attribute>

-<d_old>Users</d_old>

-<e_new>Chat</e_new>

-<f_translation>채팅</f_translation>

-<f_old_trans>사용자</f_old_trans>

-</string><string><a_file>panel_preferences_voice.xml</a_file>

-<b_path>/chat/device_settings_text</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                NOTE: Running the Device Settings or Voice Chat Setup will temporarily disconnect you from Voice Chat.

-        </d_old>

-<e_new>

-                NOTE: Running the Device Settings will temporarily disconnect you from Voice Chat.

+<e_new>Forgot your name or password?

         </e_new>

-<f_translation>

-                참고: 장치 설정을 실행하면 일시적으로 음성 채팅 연결이 끊길 수 있습니다.

+<f_translation>세컨드라이프 이름 또는 비밀번호를 분실하셨습니까?

         </f_translation>

 <f_old_trans>

-                참고: 장치 설정 또는 음성 채팅 설정을 실행하면 일시적으로 음성 채팅 연결이 끊길 수 있습니다.

-        </f_old_trans>

-</string><string><a_file>panel_toolbar.xml</a_file>

-<b_path>/toolbar/Redock Windows</b_path>

-<c_attribute></c_attribute>

-<d_old>

-                Redock Windows

-        </d_old>

-<e_new>Redock Windows</e_new>

-<f_translation>창 합치기</f_translation>

-<f_old_trans>

-                창 합치기

+                암호를 잊으셨습니까?

         </f_old_trans>

 </string>

 </strings>

diff --git a/linden/indra/newview/skins/xui/ko/notify.xml b/linden/indra/newview/skins/xui/ko/notify.xml
index 1085240..3f92fb1 100644
--- a/linden/indra/newview/skins/xui/ko/notify.xml
+++ b/linden/indra/newview/skins/xui/ko/notify.xml
@@ -918,6 +918,21 @@ sculpted prim은 그 형태를 지정하는 특별한 텍스처를 요구합니�
                         음소거
                 </option>
         </notify>
+        <notify name="AutoUnmuteByIM">
+                <message name="message">
+                        [FIRST] [LAST]님에게 메시지가 전송되었으며 자동으로 음소거가 해제되었습니다.
+                </message>
+        </notify>
+        <notify name="AutoUnmuteByMoney">
+                <message name="message">
+                        [FIRST] [LAST]님에게 금액이 전송되었으며 자동으로 음소거가 해제되었습니다.
+                </message>
+        </notify>
+        <notify name="AutoUnmuteByInventory">
+                <message name="message">
+                        [FIRST] [LAST]님에게 인벤토리가 전송되었으며 자동으로 음소거가 해제되었습니다.
+                </message>
+        </notify>
         <notify name="VoiceInviteGroup">
                 <message name="message">
                         [NAME] 님이 [GROUP] 그룹과의 음성 채팅에 참여하고 있습니다. 
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 37c972c..a751b48 100644
--- a/linden/indra/newview/skins/xui/ko/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_avatar_classified.xml
@@ -8,7 +8,17 @@
         <button label="텔리포트" name="classified_teleport_btn" />
         <button label="지도" name="classified_map_btn" />
         <combo_box label="" name="classified_category_combo" />
-        <check_box label="성인용" name="classified_mature_check" />
+        <check_box label="성인용" name="classified_mature_check">
+                <combo_item name="select_mature">
+                        - 성인용 컨텐츠 선택 -
+                </combo_item>
+                <combo_item name="mature">
+                        성인용 컨텐츠
+                </combo_item>
+                <combo_item name="not_mature">
+                        성인용 컨텐츠 아님
+                </combo_item>
+        </check_box>
         <text name="classified_info_text"
              tool_tip="광고에 대한 지불액이 높을수록 목록의 상위에 표시됩니다.">
                 게재 광고: 게시예정
diff --git a/linden/indra/newview/skins/xui/ko/panel_classified.xml b/linden/indra/newview/skins/xui/ko/panel_classified.xml
index 4cb52fb..9d1f80c 100644
--- a/linden/indra/newview/skins/xui/ko/panel_classified.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_classified.xml
@@ -8,7 +8,17 @@
         <button label="텔리포트" name="classified_teleport_btn" />
         <button label="지도에 표시" name="classified_map_btn" />
         <button label="프로필" name="classified_profile_btn" />
-        <check_box label="성인용" name="classified_mature_check" />
+        <check_box label="성인용" name="classified_mature_check">
+                <combo_item name="select_mature">
+                        - 성인용 컨텐츠 선택 -
+                </combo_item>
+                <combo_item name="mature">
+                        성인용 컨텐츠
+                </combo_item>
+                <combo_item name="not_mature">
+                        성인용 컨텐츠 아님
+                </combo_item>
+        </check_box>
         <combo_box label="" name="classified_category_combo" />
         <button label="업데이트" name="classified_update_btn" />
         <string name="ad_placed_paid">
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 b78f85d..a2c1024 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group_general.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_group_general.xml
@@ -77,6 +77,18 @@
                      tool_tip="신청 수수료를 선택한 경우 그룹에 참여하려면 새로운 회원은 이 수수료를 지불해야 합니다." />
                 <check_box label="성인 그룹" name="mature"
                      tool_tip="그룹 정보를 성인 전용으로 간주할지를 여부를 설정합니다." />
+                <combo_box name="group_mature_check"
+                     tool_tip="그룹 정보를 성인용으로 간주할지 여부를 설정합니다.">
+                        <combo_item name="select_mature">
+                                - 성인용 컨텐츠 선택 -
+                        </combo_item>
+                        <combo_item name="mature">
+                                성인용 컨텐츠
+                        </combo_item>
+                        <combo_item name="not_mature">
+                                성인용 컨텐츠 아님
+                        </combo_item>
+                </combo_box>
                 <panel name="title_container">
                         <text name="active_title_label">
                                 보여질 타이틀
diff --git a/linden/indra/newview/skins/xui/ko/panel_group_notices.xml b/linden/indra/newview/skins/xui/ko/panel_group_notices.xml
index c49fe9b..e71bdb0 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group_notices.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_group_notices.xml
@@ -18,6 +18,7 @@
         <text name="lbl2">
                 공지는 14일 동안 보관됩니다. 보려는 공지를 다음에서 클릭하십시오.
 새로운 공지를 수령한 경우 &apos;새로고침&apos; 버튼을 클릭하십시오.
+공지 목록은 매일 그룹당 200개로 제한됩니다.
         </text>
         <scroll_list name="notice_list">
                 <column label="" name="icon" />
diff --git a/linden/indra/newview/skins/xui/ko/panel_login.xml b/linden/indra/newview/skins/xui/ko/panel_login.xml
index 1c66ef2..d0afa24 100644
--- a/linden/indra/newview/skins/xui/ko/panel_login.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_login.xml
@@ -38,7 +38,7 @@
                 [Viewer Channel Name]
         </text>
         <text name="forgot_password_text">
-                ���호를 ���������습니까?
+                ���컨드라이��� 이름 또는 비밀번호를 분���하셨습니까?
         </text>
         <text name="forgot_password_url">
                 http://secondlife.com/account/request.php
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics1.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_graphics1.xml
index 4fa81ef..e986982 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_preferences_graphics1.xml
@@ -17,6 +17,26 @@
         <text_editor name="FullScreenInfo" width="480">
                 선택을 해제하면 로그인 시 전체 화면으로 표시됩니다.
         </text_editor>
+        <text name="WindowSizeLabel">
+                창 크기:
+        </text>
+        <combo_box name="windowsize combo">
+                <combo_item name="640x480">
+                        640x480
+                </combo_item>
+                <combo_item name="800x600">
+                        800x600
+                </combo_item>
+                <combo_item name="720x480">
+                        720x480(NTSC)
+                </combo_item>
+                <combo_item name="768x576">
+                        768x576(PAL)
+                </combo_item>
+                <combo_item name="1024x768">
+                        1024x768
+                </combo_item>
+        </combo_box>
         <text name="DisplayResLabel">
                 디스플레이 해상도:
         </text>
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_web.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_web.xml
index 6018ecf..3966877 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_preferences_web.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <panel label="웹" name="web">

         <radio_group name="use_external_browser">

-                <radio_item name="external" tool_tip="도움말, 웹링크 등은 외부 웹브라우저를 사용하십시오. 전체 화면 모드에서는 권장하지 않습니다.">

+                <radio_item name="external"

+                     tool_tip="도움말, 웹링크 등은 외부 웹브라우저를 사용하십시오. 전체 화면 모드에서는 권장하지 않습니다.">

                         외부 웹 브라우저 사용(Firefox, Safari, Internet Explorer)

                 </radio_item>

-                <radio_item name="internal">

+                <radio_item name="internal"

+                     tool_tip="도움말, 웹 링크 등은 세컨드라이프 웹 브라우저로 열립니다.">

                         내부 웹 브라우저 사용

                 </radio_item>

         </radio_group>

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 66ba650..5366b7e 100644
--- a/linden/indra/newview/skins/xui/ko/panel_region_general.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_region_general.xml
@@ -6,6 +6,12 @@
         <text name="region_text">
                 알 수 없음
         </text>
+        <text name="version_channel_text_lbl">
+                버전:
+        </text>
+        <text name="version_channel_text">
+                알 수 없음
+        </text>
         <check_box label="지형 변경 금지" name="block_terraform_check" />
         <button label="?" name="terraform_help" />
         <check_box label="비행 금지" name="block_fly_check" />
diff --git a/linden/indra/newview/skins/xui/ko/strings.xml b/linden/indra/newview/skins/xui/ko/strings.xml
new file mode 100644
index 0000000..a7ccb58
--- /dev/null
+++ b/linden/indra/newview/skins/xui/ko/strings.xml
@@ -0,0 +1,390 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<strings name="">

+        <string name="LoginInProgress">

+                로그인 중. [APP_NAME]님은 정지된 상태로 나타날 수 있습니다.  잠시만 기다리십시오.

+        </string>

+        <string name="LoginAuthenticating">

+                인증

+        </string>

+        <string name="LoginMaintenance">

+                계정 확인 중

+        </string>

+        <string name="LoginAttempt">

+                이전 로그인 시도가 실패했습니다. [NUMBER]번째 로그인 시도 중

+        </string>

+        <string name="LoginPrecaching">

+                로딩 중

+        </string>

+        <string name="LoginInitializingBrowser">

+                웹 브라우저 초기화 중

+        </string>

+        <string name="LoginVerifyingCache">

+                캐시 파일 확인 중(60-90초 소요)

+        </string>

+        <string name="LoginProcessingResponse">

+                응답 처리 중

+        </string>

+        <string name="LoginInitializingWorld">

+                초기화 중

+        </string>

+        <string name="LoginDecodingImages">

+                이미디 디코딩 중

+        </string>

+        <string name="LoginInitializingQuicktime">

+                QuickTime 초기화 중...

+        </string>

+        <string name="LoginQuicktimeNotFound">

+                QuickTime을 찾을 수 없으므로 초기화할 수 없습니다.

+        </string>

+        <string name="LoginQuicktimeOK">

+                QuickTime이 성공적으로 초기화되었습니다.

+        </string>

+        <string name="LoginWaitingForRegionHandshake">

+                지역 대기 중

+        </string>

+        <string name="LoginConnectingToRegion">

+                지역에 연결하는 중

+        </string>

+        <string name="LoginDownloadingClothing">

+                의복 다운로드 중

+        </string>

+        <string name="TooltipPerson">

+                아바타

+        </string>

+        <string name="TooltipNoName">

+                (이름 없음)

+        </string>

+        <string name="TooltipOwner">

+                소유자:

+        </string>

+        <string name="TooltipPublic">

+                공개

+        </string>

+        <string name="TooltipIsGroup">

+                (그룹)

+        </string>

+        <string name="TooltipFlagScript">

+                스크립트

+        </string>

+        <string name="TooltipFlagPhysics">

+                물리 엔진

+        </string>

+        <string name="TooltipFlagTouch">

+                만지기

+        </string>

+        <string name="TooltipFlagL$">

+                L$

+        </string>

+        <string name="TooltipFlagDropInventory">

+                인벤토리 드롭

+        </string>

+        <string name="TooltipFlagPhantom">

+                팬텀

+        </string>

+        <string name="TooltipFlagTemporary">

+                임시

+        </string>

+        <string name="TooltipFlagRightClickMenu">

+                (오른쪽 클릭 메뉴)

+        </string>

+        <string name="TooltipFreeToCopy">

+                무료 복사

+        </string>

+        <string name="TooltipForSaleL$">

+                판매: L$ [AMOUNT]

+        </string>

+        <string name="TooltipForSaleMsg">

+                판매: [MESSAGE]

+        </string>

+        <string name="TooltipFlagGroupBuild">

+                그룹 만들기

+        </string>

+        <string name="TooltipFlagNoBuild">

+                건축 금지

+        </string>

+        <string name="TooltipFlagNoEdit">

+                그룹 만들기

+        </string>

+        <string name="TooltipFlagNotSafe">

+                안전하지 않음

+        </string>

+        <string name="TooltipFlagNoFly">

+                비행 금지

+        </string>

+        <string name="TooltipFlagGroupScripts">

+                그룹 스크립트

+        </string>

+        <string name="TooltipFlagNoScripts">

+                스크립트 금지

+        </string>

+        <string name="TooltipLand">

+                토지:

+        </string>

+        <string name="RetrievingData">

+                가져오는 중

+        </string>

+        <string name="LoadingData">

+                로딩 중

+        </string>

+        <string name="AvatarNameNobody">

+                (없음)

+        </string>

+        <string name="AvatarNameWaiting">

+                (대기 중)

+        </string>

+        <string name="AvatarNameHippos">

+                (하마)

+        </string>

+        <string name="GroupNameNone">

+                (없음)

+        </string>

+        <string name="AssetErrorNone">

+                오류 없음

+        </string>

+        <string name="AssetErrorRequestFailed">

+                자산 요청: 실패

+        </string>

+        <string name="AssetErrorNonexistentFile">

+                자산 요청: 파일이 존재하지 않습니다.

+        </string>

+        <string name="AssetErrorNotInDatabase">

+                자산 요청: 데이터베이스에 자산이 없습니다.

+        </string>

+        <string name="AssetErrorEOF">

+                파일 끝

+        </string>

+        <string name="AssetErrorCannotOpenFile">

+                파일을 열 수 없습니다.

+        </string>

+        <string name="AssetErrorFileNotFound">

+                파일을 찾을 수 없습니다.

+        </string>

+        <string name="AssetErrorTCPTimeout">

+                파일 전송 시간초과

+        </string>

+        <string name="AssetErrorCircuitGone">

+                연결이 끊겼습니다.

+        </string>

+        <string name="AssetErrorUnknownStatus">

+                알 수 없는 상태

+        </string>

+        <string name="AvatarEditingApparance">

+                (내 모습 편집)

+        </string>

+        <string name="AvatarAway">

+                자리비움

+        </string>

+        <string name="AvatarBusy">

+                다른 용무 중

+        </string>

+        <string name="AvatarMuted">

+                음소거

+        </string>

+        <string name="anim_express_afraid">

+                두려움

+        </string>

+        <string name="anim_express_anger">

+                화남

+        </string>

+        <string name="anim_away">

+                자리비움

+        </string>

+        <string name="anim_backflip">

+                뒤공중제비

+        </string>

+        <string name="anim_express_laugh">

+                포복 절도

+        </string>

+        <string name="anim_express_toothsmile">

+                함박 웃음

+        </string>

+        <string name="anim_blowkiss">

+                키스를 날리는 모습

+        </string>

+        <string name="anim_express_bored">

+                지루함

+        </string>

+        <string name="anim_bow">

+                인사

+        </string>

+        <string name="anim_clap">

+                박수

+        </string>

+        <string name="anim_courtbow">

+                알현

+        </string>

+        <string name="anim_express_cry">

+                울기

+        </string>

+        <string name="anim_dance1">

+                댄스 1

+        </string>

+        <string name="anim_dance2">

+                댄스 2

+        </string>

+        <string name="anim_dance3">

+                댄스 3

+        </string>

+        <string name="anim_dance4">

+                댄스 4

+        </string>

+        <string name="anim_dance5">

+                댄스 5

+        </string>

+        <string name="anim_dance6">

+                댄스 6

+        </string>

+        <string name="anim_dance7">

+                댄스 7

+        </string>

+        <string name="anim_dance8">

+                댄스 8

+        </string>

+        <string name="anim_express_disdain">

+                경멸

+        </string>

+        <string name="anim_drink">

+                술 취함

+        </string>

+        <string name="anim_express_embarrased">

+                당황함

+        </string>

+        <string name="anim_angry_fingerwag">

+                손가락 흔들기

+        </string>

+        <string name="anim_fist_pump">

+                주먹 휘두르기

+        </string>

+        <string name="anim_yoga_float">

+                공중부양

+        </string>

+        <string name="anim_express_frown">

+                표정 찡그림

+        </string>

+        <string name="anim_impatient">

+                조급함

+        </string>

+        <string name="anim_jumpforjoy">

+                기쁨에 펄쩍 뜀

+        </string>

+        <string name="anim_kissmybutt">

+                내 엉덩이에 키스

+        </string>

+        <string name="anim_express_kiss">

+                키스

+        </string>

+        <string name="anim_laugh_short">

+                웃음

+        </string>

+        <string name="anim_musclebeach">

+                근육 비치

+        </string>

+        <string name="anim_no_unhappy">

+                강한 부정

+        </string>

+        <string name="anim_no_head">

+                부정

+        </string>

+        <string name="anim_nyanya">

+                냐-냐-냐

+        </string>

+        <string name="anim_punch_onetwo">

+                원투 펀치

+        </string>

+        <string name="anim_express_open_mouth">

+                입을 크게 벌린 모습

+        </string>

+        <string name="anim_peace">

+                평화

+        </string>

+        <string name="anim_point_you">

+                다른 사람을 가리킴

+        </string>

+        <string name="anim_point_me">

+                자신을 가리킴

+        </string>

+        <string name="anim_punch_l">

+                좌측 펀치

+        </string>

+        <string name="anim_punch_r">

+                우측 펀치

+        </string>

+        <string name="anim_rps_countdown">

+                가위-바위-보

+        </string>

+        <string name="anim_rps_paper">

+                가위-바위-보에 보자기

+        </string>

+        <string name="anim_rps_rock">

+                가위-바위-보에 바위

+        </string>

+        <string name="anim_rps_scissors">

+                가위-바위-보에 가위

+        </string>

+        <string name="anim_express_repulsed">

+                거절됨

+        </string>

+        <string name="anim_kick_roundhouse_r">

+                발차기

+        </string>

+        <string name="anim_express_sad">

+                슬픔

+        </string>

+        <string name="anim_salute">

+                경례

+        </string>

+        <string name="anim_shout">

+                외치기

+        </string>

+        <string name="anim_express_shrug">

+                어깨 으쓱하기

+        </string>

+        <string name="anim_express_smile">

+                미소

+        </string>

+        <string name="anim_smoke_idle">

+                담배를 쥐고 있는 모습

+        </string>

+        <string name="anim_smoke_inhale">

+                담배를 빨아들이는 모습

+        </string>

+        <string name="anim_smoke_throw_down">

+                담배 던지기

+        </string>

+        <string name="anim_express_surprise">

+                놀람

+        </string>

+        <string name="anim_sword_strike_r">

+                검 베기

+        </string>

+        <string name="anim_angry_tantrum">

+                짜증

+        </string>

+        <string name="anim_express_tongue_out">

+                메롱

+        </string>

+        <string name="anim_hello">

+                손 흔들기

+        </string>

+        <string name="anim_whisper">

+                속삭임

+        </string>

+        <string name="anim_whistle">

+                휘파람

+        </string>

+        <string name="anim_express_wink">

+                윙크

+        </string>

+        <string name="anim_wink_hollywood">

+                윙크(할리우드)

+        </string>

+        <string name="anim_express_worry">

+                걱정

+        </string>

+        <string name="anim_yes_happy">

+                강항 동의

+        </string>

+        <string name="anim_yes_head">

+                동의

+        </string>

+</strings>

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 9751936..1286c68 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -508,6 +508,7 @@ class Linux_i686Manifest(LinuxManifest):
                         self.path("libdb-4.2.so")
                         self.path("libcrypto.so.0.9.7")
                         self.path("libssl.so.0.9.7")
+                        self.path("libexpat.so.1")
 #                        self.path("libstdc++.so.6")
                         self.path("libuuid.so", "libuuid.so.1")
                         self.path("libSDL-1.2.so.0")