QAR-1142 merging 1.22 RC0-RC4 changes.

svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
author: Mark Palange <palange@lindenlab.com> 2008-12-23 19:39:58 +0000
committer: Mark Palange <palange@lindenlab.com> 2008-12-23 19:39:58 +0000
commit: fb793870fe95f1951d7c30ea6068e187b9dededd (patch)
tree: 6d11632353ff4fb07133625ec5031b135b1e2882 /indra
parent: d182b9fb82b9c63f41d81bc80dbbfe627475facf (diff)
433 files changed, 17411 insertions, 6507 deletions
diff --git a/indra/develop.py b/indra/develop.py
index a1eeff0e01..64a0ecfbd8 100755
--- a/indra/develop.py
+++ b/indra/develop.py
@@ -593,7 +593,7 @@ class WindowsSetup(PlatformSetup):
 class CygwinSetup(WindowsSetup):
     def __init__(self):
         super(CygwinSetup, self).__init__()
-        self.generator = 'vc71'
+        self.generator = 'vc80'
 
     def cmake_commandline(self, src_dir, build_dir, opts, simple):
         dos_dir = commands.getoutput("cygpath -w %s" % src_dir)
diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py
index 467517756a..a00d242e49 100644
--- a/indra/lib/python/indra/util/llmanifest.py
+++ b/indra/lib/python/indra/util/llmanifest.py
@@ -584,7 +584,7 @@ class LLManifest(object):
 
     def wildcard_regex(self, src_glob, dst_glob):
         src_re = re.escape(src_glob)
-        src_re = src_re.replace('\*', '([-a-zA-Z0-9._ ]+)')
+        src_re = src_re.replace('\*', '([-a-zA-Z0-9._ ]*)')
         dst_temp = dst_glob
         i = 1
         while dst_temp.count("*") > 0:
@@ -621,6 +621,7 @@ class LLManifest(object):
             count = 0
             if self.wildcard_pattern.search(src):
                 for s,d in self.expand_globs(src, dst):
+                    assert(s != d)
                     count += self.process_file(s, d)
             else:
                 # if we're specifying a single path (not a glob),
diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt
index d03487b01b..6f6754ed7a 100644
--- a/indra/linux_crash_logger/CMakeLists.txt
+++ b/indra/linux_crash_logger/CMakeLists.txt
@@ -57,10 +57,9 @@ target_link_libraries(linux-crash-logger
 add_custom_command(
     OUTPUT linux-crash-logger-stripped
     COMMAND strip
-    ARGS --strip-debug -o linux-crash-logger-stripped
-         linux-crash-logger
+    ARGS --strip-debug -o linux-crash-logger-stripped linux-crash-logger
     DEPENDS linux-crash-logger
     )
 
-add_custom_target(linux-crash-logger-stripped ALL
+add_custom_target(linux-crash-logger-strip-target ALL
                   DEPENDS linux-crash-logger-stripped)
diff --git a/indra/llcharacter/lleditingmotion.cpp b/indra/llcharacter/lleditingmotion.cpp
index 301a6e74c9..4421671854 100644
--- a/indra/llcharacter/lleditingmotion.cpp
+++ b/indra/llcharacter/lleditingmotion.cpp
@@ -190,7 +190,7 @@ BOOL LLEditingMotion::onUpdate(F32 time, U8* joint_mask)
 	{
 		LLVector3 tmp = mCharacter->getCharacterPosition() ;
 		llerrs << "Non finite focus point in editing motion. focus point: " << focus_pt << " and character position: " <<
-			tmp << " and pointAtPt: " << pointAtPt << llendl;
+			tmp << " and pointAtPt: " << *pointAtPt << llendl;
 	}
 
 	// propagate joint positions to kinematic chain
@@ -226,7 +226,7 @@ BOOL LLEditingMotion::onUpdate(F32 time, U8* joint_mask)
 	if (!target.isFinite())
 	{
 		llerrs << "Non finite target in editing motion with target distance of " << target_dist << 
-			" and focus point " << focus_pt << " and pointAtPt: " << pointAtPt << llendl;
+			" and focus point " << focus_pt << " and pointAtPt: " << *pointAtPt << llendl;
 	}
 	
 	mTarget.setPosition( target + mParentJoint.getPosition());
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index b3d3122397..a54785134c 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -1170,6 +1170,10 @@ namespace LLError
 		return s.shouldLogCallCounter;
 	}
 
+#if LL_WINDOWS
+		// VC80 was optimizing the error away.
+		#pragma optimize("", off)
+#endif
 	void crashAndLoop(const std::string& message)
 	{
 		// Now, we go kaboom!
@@ -1182,6 +1186,9 @@ namespace LLError
 			// Loop forever, in case the crash didn't work?
 		}
 	}
+#if LL_WINDOWS
+		#pragma optimize("", on)
+#endif
 
 	std::string utcTime()
 	{
diff --git a/indra/llcommon/llerrorcontrol.h b/indra/llcommon/llerrorcontrol.h
index 528704d064..bab4af33e6 100644
--- a/indra/llcommon/llerrorcontrol.h
+++ b/indra/llcommon/llerrorcontrol.h
@@ -82,9 +82,9 @@ namespace LLError
 		Control functions.
 	*/
 
-	typedef void (*FatalFunction)(const std::string& message);
+	typedef void(*FatalFunction)(const std::string& message);
 	void crashAndLoop(const std::string& message);
-		// Default fatal funtion: divides by zero and loops forever
+		// Default fatal funtion: access null pointer and loops forever
 
 	void setFatalFunction(FatalFunction);
 		// The fatal function will be called when an message of LEVEL_ERROR
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index 27d69c453d..814daa9029 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -34,8 +34,8 @@
 
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 22;
-const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 100000;
+const S32 LL_VERSION_PATCH = 4;
+const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Second Life Release";
 
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index 7f3c736669..5993e557f0 100755
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -123,6 +123,33 @@ void trimSLLog(std::string& sllog)
 	}
 }
 
+std::string getStartupStateFromLog(std::string& sllog)
+{
+	std::string startup_state = "STATE_FIRST";
+	std::string startup_token = "Startup state changing from ";
+
+	int index = sllog.rfind(startup_token);
+	if (index < 0 || index + startup_token.length() > sllog.length()) {
+		return startup_state;
+	}
+
+	// find new line
+	char cur_char = sllog[index + startup_token.length()];
+	std::string::size_type newline_loc = index + startup_token.length();
+	while(cur_char != '\n' && newline_loc < sllog.length())
+	{
+		newline_loc++;
+		cur_char = sllog[newline_loc];
+	}
+	
+	// get substring and find location of " to "
+	std::string state_line = sllog.substr(index, newline_loc - index);
+	std::string::size_type state_index = state_line.find(" to ");
+	startup_state = state_line.substr(state_index + 4, state_line.length() - state_index - 4);
+
+	return startup_state;
+}
+
 void LLCrashLogger::gatherFiles()
 {
 
@@ -154,6 +181,9 @@ void LLCrashLogger::gatherFiles()
 	if (debug_log_file.is_open())
 	{		
 		LLSDSerialize::fromXML(mDebugLog, debug_log_file);
+
+		mCrashInPreviousExec = mDebugLog["CrashNotHandled"].asBoolean();
+
 		mFileMap["SecondLifeLog"] = mDebugLog["SLLog"].asString();
 		mFileMap["SettingsXml"] = mDebugLog["SettingsFilename"].asString();
 		if(mDebugLog.has("CAFilename"))
@@ -176,6 +206,16 @@ void LLCrashLogger::gatherFiles()
 		mFileMap["SettingsXml"] = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,"settings.xml");
 	}
 
+	if(mCrashInPreviousExec)
+	{
+		// Replace the log file ext with .old, since the 
+		// instance that launched this process has overwritten
+		// SecondLife.log
+		std::string log_filename = mFileMap["SecondLifeLog"];
+		log_filename.replace(log_filename.size() - 4, 4, ".old");
+		mFileMap["SecondLifeLog"] = log_filename;
+	}
+
 	gatherPlatformSpecificFiles();
 
 	//Use the debug log to reconstruct the URL to send the crash report to
@@ -219,6 +259,10 @@ void LLCrashLogger::gatherFiles()
 		std::string crash_info = s.str();
 		if(itr->first == "SecondLifeLog")
 		{
+			if(!mCrashInfo["DebugLog"].has("StartupState"))
+			{
+				mCrashInfo["DebugLog"]["StartupState"] = getStartupStateFromLog(crash_info);
+			}
 			trimSLLog(crash_info);
 		}
 
@@ -229,12 +273,6 @@ void LLCrashLogger::gatherFiles()
 LLSD LLCrashLogger::constructPostData()
 {
 	LLSD ret;
-
-	if(mCrashInPreviousExec)
-	{
-		mCrashInfo["CrashInPreviousExecution"] = "Y";
-	}
-
 	return mCrashInfo;
 }
 
@@ -338,25 +376,6 @@ bool LLCrashLogger::init()
 	llinfos << "Loading crash behavior setting" << llendl;
 	mCrashBehavior = loadCrashBehaviorSetting();
 
-	//Run through command line options
-	if(getOption("previous").isDefined())
-	{
-		llinfos << "Previous execution did not remove SecondLife.exec_marker" << llendl;
-		mCrashInPreviousExec = TRUE;
-	}
-
-	if(getOption("dialog").isDefined())
-	{
-		llinfos << "Show the user dialog" << llendl;
-		mCrashBehavior = CRASH_BEHAVIOR_ASK;
-	}
-	
-	LLSD name = getOption("name");
-	if(name.isDefined())
-	{	
-		mProductName = name.asString();
-	}
-
 	// If user doesn't want to send, bail out
 	if (mCrashBehavior == CRASH_BEHAVIOR_NEVER_SEND)
 	{
diff --git a/indra/llimage/llimagejpeg.cpp b/indra/llimage/llimagejpeg.cpp
index aab19aa261..5f1c8275b4 100644
--- a/indra/llimage/llimagejpeg.cpp
+++ b/indra/llimage/llimagejpeg.cpp
@@ -465,7 +465,8 @@ void LLImageJPEG::errorOutputMessage( j_common_ptr cinfo )
 	char buffer[JMSG_LENGTH_MAX];	/* Flawfinder: ignore */
 	(*cinfo->err->format_message) (cinfo, buffer);
 
-	((LLImageJPEG*) cinfo->client_data)->setLastError( buffer );
+	std::string error = buffer ;
+	LLImage::setLastError(error);
 
 	BOOL is_decode = (cinfo->is_decompressor != 0);
 	llwarns << "LLImageJPEG " << (is_decode ? "decode " : "encode ") << " failed: " << buffer << llendl;
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index ba0cfa6ff5..8cdb43db46 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -1759,13 +1759,24 @@ BOOL LLVolume::generate()
 
 	if (regenPath || regenProf ) 
 	{
-		sNumMeshPoints -= mMesh.size();
-		mMesh.resize(mProfilep->mProfile.size() * mPathp->mPath.size());
-		sNumMeshPoints += mMesh.size();
-
 		S32 sizeS = mPathp->mPath.size();
 		S32 sizeT = mProfilep->mProfile.size();
 
+		//debug info
+		if((U32)(sizeS * sizeT) > (1u << 20))
+		{
+			llinfos << "regenPath: " << (S32)regenPath << " regenProf: " << (S32)regenProf << llendl ;
+			llinfos << "sizeS: " << sizeS << " sizeT: " << sizeT << llendl ;
+			llinfos << "path_detail : " << path_detail << " split: " << split << " profile_detail: " << profile_detail << llendl ;
+			llinfos << mParams << llendl ;
+
+			llerrs << "LLVolume corrupted!" << llendl ;
+		}
+
+		sNumMeshPoints -= mMesh.size();
+		mMesh.resize(sizeT * sizeS);
+		sNumMeshPoints += mMesh.size();		
+
 		//generate vertex positions
 
 		// Run along the path.
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index fa763bf2f8..aced88f1a2 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -263,7 +263,6 @@ LLGLManager::LLGLManager() :
 	mHasMultitexture(FALSE),
 	mNumTextureUnits(1),
 	mHasMipMapGeneration(FALSE),
-	mHasPalettedTextures(FALSE),
 	mHasCompressedTextures(FALSE),
 	mHasFramebufferObject(FALSE),
 
@@ -566,7 +565,6 @@ void LLGLManager::initExtensions()
 	mHasFramebufferObject = FALSE;
 # endif
 	mHasMipMapGeneration = FALSE;
-	mHasPalettedTextures = FALSE;
 	mHasSeparateSpecularColor = FALSE;
 	mHasAnisotropic = FALSE;
 	mHasCubeMap = FALSE;
@@ -578,7 +576,6 @@ void LLGLManager::initExtensions()
 #else // LL_MESA_HEADLESS
 	mHasMultitexture = glh_init_extensions("GL_ARB_multitexture");
 	mHasMipMapGeneration = glh_init_extensions("GL_SGIS_generate_mipmap");
-	mHasPalettedTextures = glh_init_extension("GL_EXT_paletted_texture");
 	mHasSeparateSpecularColor = glh_init_extensions("GL_EXT_separate_specular_color");
 	mHasAnisotropic = glh_init_extensions("GL_EXT_texture_filter_anisotropic");
 	glh_init_extensions("GL_ARB_texture_cube_map");
@@ -610,7 +607,6 @@ void LLGLManager::initExtensions()
 		mHasVertexBufferObject = FALSE;
 		mHasFramebufferObject = FALSE;
 		mHasMipMapGeneration = FALSE;
-		mHasPalettedTextures = FALSE;
 		mHasSeparateSpecularColor = FALSE;
 		mHasAnisotropic = FALSE;
 		mHasCubeMap = FALSE;
@@ -628,7 +624,6 @@ void LLGLManager::initExtensions()
 		// bug reports.  This should be the default until we get a
 		// proper blacklist/whitelist on Linux.
 		mHasMipMapGeneration = FALSE;
-		mHasPalettedTextures = FALSE;
 		mHasAnisotropic = FALSE;
 		//mHasCubeMap = FALSE; // apparently fatal on Intel 915 & similar
 		//mHasOcclusionQuery = FALSE; // source of many ATI system hangs
@@ -648,7 +643,6 @@ void LLGLManager::initExtensions()
 		if (strchr(blacklist,'b')) mHasCompressedTextures = FALSE;
 		if (strchr(blacklist,'c')) mHasVertexBufferObject = FALSE;
 		if (strchr(blacklist,'d')) mHasMipMapGeneration = FALSE;//S
-		if (strchr(blacklist,'e')) mHasPalettedTextures = FALSE;//S
 // 		if (strchr(blacklist,'f')) mHasNVVertexArrayRange = FALSE;//S
 // 		if (strchr(blacklist,'g')) mHasNVFence = FALSE;//S
 		if (strchr(blacklist,'h')) mHasSeparateSpecularColor = FALSE;
@@ -663,13 +657,6 @@ void LLGLManager::initExtensions()
 		if (strchr(blacklist,'q')) mHasFramebufferObject = FALSE;//S
 	}
 #endif // LL_LINUX
-
-#if LL_DARWIN || LL_LINUX
-	// MBW -- 12/4/2003 -- Using paletted textures causes a bunch of avatar rendering problems on the Mac.
-	// Not sure if this is due to driver problems or incorrect use of the extension, but I'm disabling it for now.
-	// Tofu - 2006-10-03 -- Same problem on Linux.
-	mHasPalettedTextures = false;
-#endif
 	
 	if (!mHasMultitexture)
 	{
@@ -683,10 +670,6 @@ void LLGLManager::initExtensions()
 	{
 		LL_INFOS("RenderInit") << "Couldn't initialize GL_ARB_texture_env_combine" << LL_ENDL;
 	}
-	if (!mHasPalettedTextures)
-	{
-		LL_INFOS("RenderInit") << "Couldn't initialize GL_EXT_paletted_texture" << LL_ENDL;
-	}
 	if (!mHasSeparateSpecularColor)
 	{
 		LL_INFOS("RenderInit") << "Couldn't initialize separate specular color" << LL_ENDL;
@@ -788,13 +771,7 @@ void LLGLManager::initExtensions()
 		mGLMaxIndexRange = 0;
 	}
 #endif // !LL_LINUX
-#if LL_LINUX
-	// On Linux we need to get glColorTableEXT dynamically.
-	if (mHasPalettedTextures)
-	{
-		glColorTableEXT = (PFNGLCOLORTABLEEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glColorTableEXT");
-	}
-#endif // LL_LINUX
+
 	if (mHasOcclusionQuery)
 	{
 		glGenQueriesARB = (PFNGLGENQUERIESARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGenQueriesARB");
@@ -1442,16 +1419,6 @@ void set_binormals(const S32 index, const U32 stride,const LLVector3 *binormals)
 #endif
 }
 
-
-void set_palette(U8 *palette_data)
-{
-	if (gGLManager.mHasPalettedTextures)
-	{
-		glColorTableEXT(GL_TEXTURE_2D, GL_RGBA8, 256, GL_RGBA, GL_UNSIGNED_BYTE, palette_data);
-	}
-}
-
-
 void parse_gl_version( S32* major, S32* minor, S32* release, std::string* vendor_specific )
 {
 	// GL_VERSION returns a null-terminated string with the format: 
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h
index bab5e5245f..96a03e63ac 100644
--- a/indra/llrender/llgl.h
+++ b/indra/llrender/llgl.h
@@ -74,7 +74,6 @@ public:
 	BOOL mHasMultitexture;
 	S32	 mNumTextureUnits;
 	BOOL mHasMipMapGeneration;
-	BOOL mHasPalettedTextures;
 	BOOL mHasCompressedTextures;
 	BOOL mHasFramebufferObject;
 
@@ -370,7 +369,6 @@ void disable_cloth_weights(const S32 index);
 void set_vertex_weights(const S32 index, const U32 stride, const F32 *weights);
 void set_vertex_clothing_weights(const S32 index, const U32 stride, const LLVector4 *weights);
 void set_binormals(const S32 index, const U32 stride, const LLVector3 *binormals);
-void set_palette(U8* palette_data);
 void parse_gl_version( S32* major, S32* minor, S32* release, std::string* vendor_specific );
 
 extern BOOL gClothRipple;
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index 2ef2bae1ab..9efadbd030 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -154,7 +154,7 @@ void LLImageGL::destroyGL(BOOL save_state)
 		LLImageGL* glimage = *iter;
 		if (glimage->mTexName && glimage->mComponents)
 		{
-			if (save_state)
+			if (save_state && glimage->isInitialized())
 			{
 				glimage->mSaveData = new LLImageRaw;
 				glimage->readBackRaw(glimage->mCurrentDiscardLevel, glimage->mSaveData, false);
@@ -748,7 +748,7 @@ BOOL LLImageGL::setSubImage(const LLImageRaw* imageraw, S32 x_pos, S32 y_pos, S3
 // Copy sub image from frame buffer
 BOOL LLImageGL::setSubImageFromFrameBuffer(S32 fb_x, S32 fb_y, S32 x_pos, S32 y_pos, S32 width, S32 height)
 {
-	if (gGL.getTexUnit(0)->bind(this))
+	if (gGL.getTexUnit(0)->bind(this, true))
 	{
 		glCopyTexSubImage2D(GL_TEXTURE_2D, 0, fb_x, fb_y, x_pos, y_pos, width, height);
 		mInitialized = true;
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index 969bfe608e..76762a1967 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -175,7 +175,7 @@ void LLTexUnit::disable(void)
 	}
 }
 
-bool LLTexUnit::bind(const LLImageGL* texture)
+bool LLTexUnit::bind(const LLImageGL* texture, bool forceBind)
 {
 	if (mIndex < 0) return false;
 
@@ -183,25 +183,27 @@ bool LLTexUnit::bind(const LLImageGL* texture)
 
 	if (texture == NULL)
 	{
-		return texture->bindError(mIndex);
+		llwarns << "NULL LLTexUnit::bind texture" << llendl;
+		return false;
 	}
 
-	if (!texture->isInitialized())
+	if (!texture->isInitialized() && !forceBind)
 	{
 		return texture->bindDefaultImage(mIndex);
 	}
 
-	// Disabled caching of binding state.
-	if (texture != NULL)
+	if (!texture->getTexName()) //if texture does not exist
 	{
-		activate();
-		enable(texture->getTarget());
-		mCurrTexture = texture->getTexName();
-		glBindTexture(sGLTextureType[texture->getTarget()], mCurrTexture);
-		texture->updateBindStats();
-		return true;
+		return texture->bindDefaultImage(mIndex);
 	}
-	return false;
+
+	// Disabled caching of binding state.
+	activate();
+	enable(texture->getTarget());
+	mCurrTexture = texture->getTexName();
+	glBindTexture(sGLTextureType[texture->getTarget()], mCurrTexture);
+	texture->updateBindStats();
+	return true;
 }
 
 bool LLTexUnit::bind(LLCubeMap* cubeMap)
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index e604bbb84c..a9eca70744 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -135,12 +135,17 @@ public:
 	// Disables the current texture unit
 	void disable(void);	
 	
-	// Binds the LLImageGL to this texture unit (automatically enables the unit for the LLImageGL's texture type)
-	bool bind(const LLImageGL* texture);
-	// Binds a cubemap to this texture unit (automatically enables the texture unit for cubemaps)
+	// Binds the LLImageGL to this texture unit 
+	// (automatically enables the unit for the LLImageGL's texture type)
+	bool bind(const LLImageGL* texture, bool forceBind = false);
+
+	// Binds a cubemap to this texture unit 
+	// (automatically enables the texture unit for cubemaps)
 	bool bind(LLCubeMap* cubeMap);
+
 	// Binds a render target to this texture unit (automatically enables the texture unit for the RT's texture type)
 	bool bind(LLRenderTarget * renderTarget, bool bindDepth = false);
+
 	// Manually binds a texture to the texture unit (automatically enables the tex unit for the given texture type)
 	bool bindManual(eTextureType type, U32 texture);
 	
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index ffdca84001..22260b52cf 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -544,6 +544,7 @@ void LLFloater::close(bool app_quitting)
 		if (getHost())
 		{
 			((LLMultiFloater*)getHost())->removeFloater(this);
+			gFloaterView->addChild(this);
 		}
 
 		if (getSoundFlags() != SILENT
@@ -1318,8 +1319,8 @@ void LLFloater::onClickEdit(void *userdata)
 	self->mEditing = self->mEditing ? FALSE : TRUE;
 }
 
-// static
-void LLFloater::closeFocusedFloater()
+// static 
+LLFloater* LLFloater::getClosableFloaterFromFocus()
 {
 	LLFloater* focused_floater = NULL;
 
@@ -1336,10 +1337,32 @@ void LLFloater::closeFocusedFloater()
 	if (iter == sFloaterMap.end())
 	{
 		// nothing found, return
-		return;
+		return NULL;
+	}
+
+	// The focused floater may not be closable,
+	// Find and close a parental floater that is closeable, if any.
+	for(LLFloater* floater_to_close = focused_floater; 
+		NULL != floater_to_close; 
+		floater_to_close = gFloaterView->getParentFloater(floater_to_close))
+	{
+		if(floater_to_close->isCloseable())
+		{
+			return floater_to_close;
+		}
 	}
 
-	focused_floater->close();
+	return NULL;
+}
+
+// static
+void LLFloater::closeFocusedFloater()
+{
+	LLFloater* floater_to_close = LLFloater::getClosableFloaterFromFocus();
+	if(floater_to_close)
+	{
+		floater_to_close->close();
+	}
 
 	// if nothing took focus after closing focused floater
 	// give it to next floater (to allow closing multiple windows via keyboard in rapid succession)
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 415419748f..b66eba8810 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -206,6 +206,11 @@ public:
 
 	LLHandle<LLFloater> getHandle() const { return mHandle; }
 
+	// Return a closeable floater, if any, given the current focus.
+	static LLFloater* getClosableFloaterFromFocus(); 
+
+	// Close the floater returned by getClosableFloaterFromFocus() and 
+	// handle refocusing.
 	static void		closeFocusedFloater();
 
 	static void		onClickClose(void *userdata);
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index f2562a015d..3b6ee33d38 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -471,9 +471,9 @@ void LLTextEditor::updateLineStartList(S32 startpos)
 	}
 
 	// if scrolled to bottom, stay at bottom
-	// unless user is editing text
+	// unless user is selecting text
 	// do this after updating page size
-	if (mScrolledToBottom && mTrackBottom && !hasFocus())
+	if (mScrolledToBottom && mTrackBottom && !hasMouseCapture())
 	{
 		endOfDoc();
 	}
@@ -4257,11 +4257,9 @@ S32 LLTextEditor::findHTMLToken(const std::string &line, S32 pos, BOOL reverse)
 	std::string openers=" \t\n('\"[{<>";
 	std::string closers=" \t\n)'\"]}><;";
 
-	S32 index = 0;
-	
 	if (reverse)
 	{
-		for (index=pos; index >= 0; index--)
+		for (int index=pos; index >= 0; index--)
 		{
 			char c = line[index];
 			S32 m2 = openers.find(c);
@@ -4270,11 +4268,12 @@ S32 LLTextEditor::findHTMLToken(const std::string &line, S32 pos, BOOL reverse)
 				return index+1;
 			}
 		}
+		return 0; // index is -1, don't want to return that. 
 	} 
 	else
 	{
 		
-		for (index=pos; index<(S32)line.length(); index++)
+		for (int index=pos; index<(S32)line.length(); index++)
 		{
 			char c = line[index];
 			S32 m2 = closers.find(c);
@@ -4283,9 +4282,8 @@ S32 LLTextEditor::findHTMLToken(const std::string &line, S32 pos, BOOL reverse)
 				return index;
 			}
 		} 
+		return line.length();
 	}		
-	
-	return index;
 }
 
 BOOL LLTextEditor::findHTML(const std::string &line, S32 *begin, S32 *end) const
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 5ea9d6b5d8..3e7e59876c 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -43,7 +43,7 @@
 #include "llfocusmgr.h"
 #include "llrect.h"
 #include "llstl.h"
-#include "llui.h"	// colors saved settings
+#include "llui.h"
 #include "lluictrl.h"
 #include "llwindow.h"
 #include "v3color.h"
@@ -713,25 +713,38 @@ BOOL LLView::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_s
 			&& viewp->getEnabled()
 			&& viewp->handleToolTip(local_x, local_y, msg, sticky_rect_screen ))
 		{
+			// child provided a tooltip, just return
+			if (!msg.empty()) return TRUE;
+
+			// otherwise, one of our children ate the event so don't traverse
+			// siblings however, our child did not actually provide a tooltip
+            // so we might want to
 			handled = TRUE;
 			break;
 		}
 	}
 
+	// get our own tooltip
 	tool_tip = mToolTipMsg.getString();
 	if (
-		LLUI::sShowXUINames &&
-		(tool_tip.find(".xml", 0) == std::string::npos) && 
-		(mName.find("Drag", 0) == std::string::npos))
+		LLUI::sShowXUINames 
+		&& (tool_tip.find(".xml", 0) == std::string::npos) 
+		&& (mName.find("Drag", 0) == std::string::npos))
 	{
 		tool_tip = getShowNamesToolTip();
 	}
 
 	BOOL show_names_text_box = LLUI::sShowXUINames && dynamic_cast<LLTextBox*>(this) != NULL;
 
-	if( !handled && (blockMouseEvent(x, y) || show_names_text_box))
+	// don't allow any siblings to handle this event
+	// even if we don't have a tooltip
+	if (getMouseOpaque() || show_names_text_box)
 	{
+		handled = TRUE;
+	}
 
+	if(!tool_tip.empty())
+	{
 		msg = tool_tip;
 
 		// Convert rect local to screen coordinates
@@ -2063,139 +2076,6 @@ LLView* LLView::findSnapRect(LLRect& new_rect, const LLCoordGL& mouse_dir,
 
 	new_rect.translate(delta_x, delta_y);
 	return snap_view;
-
-	//// If the view is near the edge of its parent, snap it to
-	//// the edge.
-	//LLRect test_rect = getSnapRect();
-	//LLRect view_rect = getSnapRect();
-	//test_rect.stretch(padding);
-	//view_rect.stretch(padding);
-
-	//S32 x_threshold = threshold;
-	//S32 y_threshold = threshold;
-
-	//LLRect parent_local_snap_rect = mParentView->getLocalSnapRect();
-
-	//if (snap_type == SNAP_PARENT || snap_type == SNAP_PARENT_AND_SIBLINGS)
-	//{
-	//	if (llabs(parent_local_snap_rect.mRight - test_rect.mRight) <= x_threshold && (parent_local_snap_rect.mRight - test_rect.mRight) * mouse_dir.mX >= 0)
-	//	{
-	//		view_rect.translate(parent_local_snap_rect.mRight - view_rect.mRight, 0);
-	//		snap_view = mParentView;
-	//		x_threshold = llabs(parent_local_snap_rect.mRight - test_rect.mRight);
-	//	}
-
-	//	if (llabs(test_rect.mLeft - parent_local_snap_rect.mLeft) <= x_threshold && test_rect.mLeft * mouse_dir.mX <= 0)
-	//	{
-	//		view_rect.translate(parent_local_snap_rect.mLeft - view_rect.mLeft, 0);
-	//		snap_view = mParentView;
-	//		x_threshold = llabs(test_rect.mLeft - parent_local_snap_rect.mLeft);
-	//	}
-
-	//	if (llabs(test_rect.mBottom - parent_local_snap_rect.mBottom) <= y_threshold && test_rect.mBottom * mouse_dir.mY <= 0)
-	//	{
-	//		view_rect.translate(0, parent_local_snap_rect.mBottom - view_rect.mBottom);
-	//		snap_view = mParentView;
-	//		y_threshold = llabs(test_rect.mBottom - parent_local_snap_rect.mBottom);
-	//	}
-
-	//	if (llabs(parent_local_snap_rect.mTop - test_rect.mTop) <= y_threshold && (parent_local_snap_rect.mTop - test_rect.mTop) * mouse_dir.mY >= 0)
-	//	{
-	//		view_rect.translate(0, parent_local_snap_rect.mTop - view_rect.mTop);
-	//		snap_view = mParentView;
-	//		y_threshold = llabs(parent_local_snap_rect.mTop - test_rect.mTop);
-	//	}
-	//}
-	//if (snap_type == SNAP_SIBLINGS || snap_type == SNAP_PARENT_AND_SIBLINGS)
-	//{
-	//	for ( child_list_const_iter_t child_it = mParentView->getChildList()->begin();
-	//		  child_it != mParentView->getChildList()->end(); ++child_it)
-	//	{
-	//		LLView* siblingp = *child_it;
-
-	//		// skip non-snappable views (self, invisible views, etc)
-	//		if (!canSnapTo(siblingp)) continue;
-
-	//		LLRect sibling_rect = siblingp->getSnapRect();
-
-	//		if (llabs(test_rect.mRight - sibling_rect.mLeft) <= x_threshold 
-	//			&& (test_rect.mRight - sibling_rect.mLeft) * mouse_dir.mX <= 0)
-	//		{
-	//			view_rect.translate(sibling_rect.mLeft - view_rect.mRight, 0);
-	//			if (llabs(test_rect.mTop - sibling_rect.mTop) <= y_threshold && (test_rect.mTop - sibling_rect.mTop) * mouse_dir.mY <= 0)
-	//			{
-	//				view_rect.translate(0, sibling_rect.mTop - test_rect.mTop);
-	//				y_threshold = llabs(test_rect.mTop - sibling_rect.mTop);
-	//			}
-	//			else if (llabs(test_rect.mBottom - sibling_rect.mBottom) <= y_threshold && (test_rect.mBottom - sibling_rect.mBottom) * mouse_dir.mY <= 0)
-	//			{
-	//				view_rect.translate(0, sibling_rect.mBottom - test_rect.mBottom);
-	//				y_threshold = llabs(test_rect.mBottom - sibling_rect.mBottom);	
-	//			}
-	//			snap_view = siblingp;
-	//			x_threshold = llabs(test_rect.mRight - sibling_rect.mLeft);
-	//		}
-
-	//		if (llabs(test_rect.mLeft - sibling_rect.mRight) <= x_threshold 
-	//			&& (test_rect.mLeft - sibling_rect.mRight) * mouse_dir.mX <= 0)
-	//		{
-	//			view_rect.translate(sibling_rect.mRight - view_rect.mLeft, 0);
-	//			if (llabs(test_rect.mTop - sibling_rect.mTop) <= y_threshold && (test_rect.mTop - sibling_rect.mTop) * mouse_dir.mY <= 0)
-	//			{
-	//				view_rect.translate(0, sibling_rect.mTop - test_rect.mTop);
-	//				y_threshold = llabs(test_rect.mTop - sibling_rect.mTop);	
-	//			}
-	//			else if (llabs(test_rect.mBottom - sibling_rect.mBottom) <= y_threshold && (test_rect.mBottom - sibling_rect.mBottom) * mouse_dir.mY <= 0)
-	//			{
-	//				view_rect.translate(0, sibling_rect.mBottom - test_rect.mBottom);
-	//				y_threshold = llabs(test_rect.mBottom - sibling_rect.mBottom);	
-	//			}
-	//			snap_view = siblingp;
-	//			x_threshold = llabs(test_rect.mLeft - sibling_rect.mRight);
-	//		}
-
-	//		if (llabs(test_rect.mBottom - sibling_rect.mTop) <= y_threshold 
-	//			&& (test_rect.mBottom - sibling_rect.mTop) * mouse_dir.mY <= 0)
-	//		{
-	//			view_rect.translate(0, sibling_rect.mTop - view_rect.mBottom);
-	//			if (llabs(test_rect.mLeft - sibling_rect.mLeft) <= x_threshold && (test_rect.mLeft - sibling_rect.mLeft) * mouse_dir.mX <= 0)
-	//			{
-	//				view_rect.translate(sibling_rect.mLeft - test_rect.mLeft, 0);
-	//				x_threshold = llabs(test_rect.mLeft - sibling_rect.mLeft);
-	//			}
-	//			else if (llabs(test_rect.mRight - sibling_rect.mRight) <= x_threshold && (test_rect.mRight - sibling_rect.mRight) * mouse_dir.mX <= 0)
-	//			{
-	//				view_rect.translate(sibling_rect.mRight - test_rect.mRight, 0);
-	//				x_threshold = llabs(test_rect.mRight - sibling_rect.mRight);
-	//			}
-	//			snap_view = siblingp;
-	//			y_threshold = llabs(test_rect.mBottom - sibling_rect.mTop);
-	//		}
-
-	//		if (llabs(test_rect.mTop - sibling_rect.mBottom) <= y_threshold 
-	//			&& (test_rect.mTop - sibling_rect.mBottom) * mouse_dir.mY <= 0)
-	//		{
-	//			view_rect.translate(0, sibling_rect.mBottom - view_rect.mTop);
-	//			if (llabs(test_rect.mLeft - sibling_rect.mLeft) <= x_threshold && (test_rect.mLeft - sibling_rect.mLeft) * mouse_dir.mX <= 0)
-	//			{
-	//				view_rect.translate(sibling_rect.mLeft - test_rect.mLeft, 0);
-	//				x_threshold = llabs(test_rect.mLeft - sibling_rect.mLeft);
-	//			}
-	//			else if (llabs(test_rect.mRight - sibling_rect.mRight) <= x_threshold && (test_rect.mRight - sibling_rect.mRight) * mouse_dir.mX <= 0)
-	//			{
-	//				view_rect.translate(sibling_rect.mRight - test_rect.mRight, 0);
-	//				x_threshold = llabs(test_rect.mRight - sibling_rect.mRight);
-	//			}
-	//			snap_view = siblingp;
-	//			y_threshold = llabs(test_rect.mTop - sibling_rect.mBottom);
-	//		}
-	//	}
-	//}
-
-	//// shrink actual view rect back down
-	//view_rect.stretch(-padding);
-	//new_rect = view_rect;
-	//return snap_view;
 }
 
 LLView*	LLView::findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding)
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 76313d82bf..da9216cef6 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -1559,7 +1559,13 @@ void LLWindowWin32::captureMouse()
 
 void LLWindowWin32::releaseMouse()
 {
+	// *NOTE:Mani ReleaseCapture will spawn new windows messages...
+	// which will in turn call our MainWindowProc. It therefore requires
+	// pausing *and more importantly resumption* of the mainlooptimeout...
+	// just like DispatchMessage below.
+	mCallbacks->handlePauseWatchdog(this);
 	ReleaseCapture();
+	mCallbacks->handleResumeWatchdog(this);
 }
 
 
diff --git a/indra/mac_crash_logger/CrashReporter.nib/info.nib b/indra/mac_crash_logger/CrashReporter.nib/info.nib
index b5417442d0..06805c0e4f 100644
--- a/indra/mac_crash_logger/CrashReporter.nib/info.nib
+++ b/indra/mac_crash_logger/CrashReporter.nib/info.nib
@@ -5,15 +5,13 @@
 	<key>IBFramework Version</key>
 	<string>629</string>
 	<key>IBLastKnownRelativeProjectPath</key>
-	<string>../macview.xcodeproj</string>
+	<string>../../build-darwin-i386/SecondLife.xcodeproj</string>
 	<key>IBOldestOS</key>
 	<integer>5</integer>
 	<key>IBOpenObjects</key>
-	<array>
-		<integer>193</integer>
-	</array>
+	<array/>
 	<key>IBSystem Version</key>
-	<string>9B18</string>
+	<string>9E17</string>
 	<key>targetFramework</key>
 	<string>IBCarbonFramework</string>
 </dict>
diff --git a/indra/mac_crash_logger/CrashReporter.nib/objects.xib b/indra/mac_crash_logger/CrashReporter.nib/objects.xib
index 1099f561e7..634d1c5321 100644
--- a/indra/mac_crash_logger/CrashReporter.nib/objects.xib
+++ b/indra/mac_crash_logger/CrashReporter.nib/objects.xib
@@ -3,9 +3,10 @@
   <object name="rootObject" class="NSCustomObject" id="1">
   </object>
   <array count="7" name="allObjects">
-    <object class="IBCarbonStaticText" id="181">
-      <string name="title">Second Life appears to have crashed or frozen the last time it ran.&#10;&#10;This crash reporter collects information about your computer&apos;s hardware configuration, operating system, and some Second Life logs, all of which are used for debugging purposes only.&#10;&#10;In the space below, please briefly describe what you were doing or trying to do just prior to the crash. Thank you for your help!&#10;&#10;This report is NOT read by Customer Support. If you have billing or other questions, please go to: http://www.secondlife.com/support/&#10;&#10;If you don&apos;t wish to send Linden Lab a crash report, press Cancel.&#10;</string>
-      <string name="bounds">20 20 231 487 </string>
+    <object class="IBCarbonButton" id="182">
+      <ostype name="command">ok  </ostype>
+      <string name="title">Send Report</string>
+      <string name="bounds">414 273 434 378 </string>
     </object>
     <object class="IBCarbonButton" id="183">
       <ostype name="command">not!</ostype>
@@ -13,49 +14,47 @@
       <string name="title">Don&apos;t Send</string>
       <string name="bounds">414 390 434 487 </string>
     </object>
-    <object class="IBCarbonRootControl" id="167">
-      <array count="5" name="subviews">
-        <reference idRef="181"/>
-        <object class="IBCarbonButton" id="182">
-          <ostype name="command">ok  </ostype>
-          <string name="title">Send Report</string>
-          <string name="bounds">414 273 434 378 </string>
-        </object>
-        <reference idRef="183"/>
-        <object class="IBCarbonEditText" id="185">
-          <ostype name="controlSignature">text</ostype>
-          <boolean name="isUnicode">TRUE</boolean>
-          <string name="bounds">242 23 391 484 </string>
-        </object>
-        <object class="IBCarbonCheckBox" id="193">
-          <ostype name="controlSignature">remb</ostype>
-          <int name="initialState">1</int>
-          <string name="title">Remember This Choice</string>
-          <string name="bounds">415 20 433 186 </string>
-        </object>
-      </array>
-      <string name="bounds">0 0 454 507 </string>
+    <object class="IBCarbonStaticText" id="181">
+      <string name="title">Second Life appears to have crashed or frozen the last time it ran.&#10;&#10;This crash reporter collects information about your computer&apos;s hardware configuration, operating system, and some Second Life logs, all of which are used for debugging purposes only.&#10;&#10;In the space below, please briefly describe what you were doing or trying to do just prior to the crash. Thank you for your help!&#10;&#10;This report is NOT read by Customer Support. If you have billing or other questions, please go to: http://www.secondlife.com/support/&#10;&#10;If you don&apos;t wish to send Linden Lab a crash report, press Cancel.&#10;</string>
+      <string name="bounds">20 20 231 487 </string>
     </object>
     <object class="IBCarbonWindow" id="166">
       <int name="carbonWindowClass">2</int>
       <int name="themeBrush">3</int>
       <int name="windowPosition">7</int>
       <string name="title">Second Life Crash Logger</string>
-      <reference name="rootControl" idRef="167"/>
+      <object name="rootControl" class="IBCarbonRootControl" id="167">
+        <array count="5" name="subviews">
+          <reference idRef="181"/>
+          <reference idRef="182"/>
+          <reference idRef="183"/>
+          <object class="IBCarbonEditText" id="185">
+            <ostype name="controlSignature">text</ostype>
+            <boolean name="isUnicode">TRUE</boolean>
+            <string name="bounds">242 23 391 484 </string>
+          </object>
+          <object class="IBCarbonCheckBox" id="193">
+            <ostype name="controlSignature">remb</ostype>
+            <string name="title">Remember This Choice</string>
+            <string name="bounds">415 20 433 186 </string>
+          </object>
+        </array>
+        <string name="bounds">0 0 454 507 </string>
+      </object>
       <string name="windowRect">257 653 711 1160 </string>
       <string name="ScreenRectAtEncodeTime">0 0 768 1024 </string>
     </object>
-    <reference idRef="193"/>
     <reference idRef="185"/>
-    <reference idRef="182"/>
+    <reference idRef="167"/>
+    <reference idRef="193"/>
   </array>
   <array count="7" name="allParents">
     <reference idRef="167"/>
     <reference idRef="167"/>
-    <reference idRef="166"/>
-    <reference idRef="1"/>
     <reference idRef="167"/>
+    <reference idRef="1"/>
     <reference idRef="167"/>
+    <reference idRef="166"/>
     <reference idRef="167"/>
   </array>
   <dictionary count="2" name="nameTable">
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a13d883682..13fc165010 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -33,10 +33,10 @@
             <string>Color4</string>
         <key>Value</key>
             <array>
-                <real>0.0196078431372</real>
-                <real>0.6862745098039</real>
-                <real>0.9803921568627</real>
-                <real>1</real>
+                <real>1.0</real>
+                <real>1.0</real>
+                <real>1.0</real>
+                <real>1.0</real>
             </array>
         </map>
     <key>AgentChatColor</key>
@@ -165,17 +165,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>AsyncKeyboard</key>
-    <map>
-      <key>Comment</key>
-      <string>Improves responsiveness to keyboard input when at low framerates</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
     <key>AuctionShowFence</key>
     <map>
       <key>Comment</key>
@@ -4224,18 +4213,18 @@
       <key>Value</key>
       <real>0.0</real>
     </map>
-    <key>InstallLanguage</key>
-    <map>
-      <key>Comment</key>
-      <string>Language passed from installer (for UI)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>default</string>
-    </map>
-    <key>InventoryAutoOpenDelay</key>
+	<key>InstallLanguage</key>
+	<map>
+		<key>Comment</key>
+		<string>Language passed from installer (for UI)</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>String</string>
+		<key>Value</key>
+		<string>default</string>
+	</map>
+	<key>InventoryAutoOpenDelay</key>
     <map>
       <key>Comment</key>
       <string>Seconds before automatically opening inventory when mouse is over inventory button when performing inventory drag and drop</string>
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 8a8ef0deac..c02ba86d6c 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -1,4 +1,4 @@
-version 17
+version 19
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table
@@ -367,28 +367,40 @@ Disregard96DefaultDrawDistance	1	0
 
 list ATI_Radeon_X300 
 Disregard128DefaultDrawDistance	1	0
+RenderVBOEnable				1	0
 list ATI_Radeon_X400 
 Disregard128DefaultDrawDistance	1	0
+RenderVBOEnable				1	0
 list ATI_Radeon_X500 
 Disregard128DefaultDrawDistance	1	0
+RenderVBOEnable				1	0
 list ATI_Radeon_X600 
 Disregard128DefaultDrawDistance	1	0
+RenderVBOEnable				1	0
 list ATI_Radeon_X700 
 Disregard128DefaultDrawDistance	1	0
+RenderVBOEnable				1	0
 list ATI_Radeon_X1300 
 Disregard128DefaultDrawDistance	1	0
+RenderVBOEnable				1	0
 UseStartScreen					0	0
 list ATI_Radeon_X1400 
 Disregard128DefaultDrawDistance	1	0
+RenderVBOEnable				1	0
 list ATI_Radeon_X1500 
 Disregard128DefaultDrawDistance	1	0
+RenderVBOEnable				1	0
 UseStartScreen					0	0
 list ATI_Radeon_X1600 
 Disregard128DefaultDrawDistance	1	0
+RenderVBOEnable				1	0
 list ATI_Radeon_X1700 
 Disregard128DefaultDrawDistance	1	0
+RenderVBOEnable				1	0
 list ATI_Mobility_Radeon_X1xxx
 Disregard128DefaultDrawDistance	1	0
+RenderVBOEnable				1	0
+
 list ATI_Radeon_HD_2300
 Disregard128DefaultDrawDistance	1	0
 list ATI_Radeon_HD_2400
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
index 08a9794c61..09105b8d88 100644
--- a/indra/newview/featuretable_linux.txt
+++ b/indra/newview/featuretable_linux.txt
@@ -1,4 +1,4 @@
-version 17
+version 19
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index 323683462a..fd2496d8ad 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -1,4 +1,4 @@
-version 16
+version 19
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table
diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt
index 44d66a606b..748400532f 100644
--- a/indra/newview/gpu_table.txt
+++ b/indra/newview/gpu_table.txt
@@ -26,6 +26,7 @@ ATI All-in-Wonder 7500			.*ATI.*All-in-Wonder 75.*			0		1
 ATI All-in-Wonder 8500			.*ATI.*All-in-Wonder 85.*			0		1
 ATI All-in-Wonder 9200			.*ATI.*All-in-Wonder 92.*			0		1
 ATI All-in-Wonder 9xxx			.*ATI.*All-in-Wonder 9.*			1		1
+ATI All-in-Wonder HD			.*ATI.*All-in-Wonder HD.*			1		1
 ATI All-in-Wonder X600			.*ATI.*All-in-Wonder X6.*			1		1
 ATI All-in-Wonder X800			.*ATI.*All-in-Wonder X8.*			2		1
 ATI All-in-Wonder X1800			.*ATI.*All-in-Wonder X18.*			3		1
@@ -35,6 +36,7 @@ ATI All-in-Wonder Radeon 		.*ATI.*All-in-Wonder Radeon.*		0		1
 ATI ASUS A9xxx					.*ATI.*ASUS.*A9.*					1		1
 ATI ASUS AH24xx					.*ATI.*ASUS.*AH24.*					1		1
 ATI ASUS AH26xx					.*ATI.*ASUS.*AH26.*					3		1
+ATI ASUS AH34xx					.*ATI.*ASUS.*AH34.*					1		1
 ATI ASUS AH36xx					.*ATI.*ASUS.*AH36.*					3		1
 ATI ASUS AH46xx					.*ATI.*ASUS.*AH46.*					3		1
 ATI ASUS AX3xx					.*ATI.*ASUS.*AX3.*					1		1
@@ -46,12 +48,12 @@ ATI ASUS EAH34xx				.*ATI.*ASUS.*EAH34.*				1		1
 ATI ASUS EAH36xx				.*ATI.*ASUS.*EAH36.*				3		1
 ATI ASUS EAH38xx				.*ATI.*ASUS.*EAH38.*				3		1
 ATI ASUS EAH48xx				.*ATI.*ASUS.*EAH48.*				3		1
-ATI ASUS X1xxx					.*ATI.*ASUS.*X1.*					2		1
-ATI ASUS X7xx					.*ATI.*ASUS.*X7.*					1		1
-ATI Diamond X550				.*ATI.*Diamond X550.*				1		1
-ATI Diamond X13xx				.*ATI.*Diamond X13.*				1		1
-ATI Diamond X16xx				.*ATI.*Diamond X16.*				1		1
-ATI Diamond X19xx				.*ATI.*Diamond X19.*				1		1
+ATI Radeon X1xxx				.*ATI.*ASUS.*X1.*					2		1
+ATI Radeon X7xx					.*ATI.*ASUS.*X7.*					1		1
+ATI Radeon X500					.*ATI.*Diamond X5.*					1		1
+ATI Radeon X13xx				.*ATI.*Diamond X13.*				1		1
+ATI Radeon X16xx				.*ATI.*Diamond X16.*				1		1
+ATI Radeon X19xx				.*ATI.*Diamond X19.*				1		1
 ATI Display Adapter				.*ATI.*display adapter.*			0		1
 ATI FireGL 5200					.*ATI.*FireGL V52.*					0		1
 ATI FireGL 5xxx					.*ATI.*FireGL V5.*					1		1
@@ -63,6 +65,8 @@ ATI IGP 340M					.*ATI.*IGP.*340M.*					0		0
 ATI M52							.*ATI.*M52.*						1		1
 ATI M54							.*ATI.*M54.*						1		1
 ATI M56							.*ATI.*M56.*						1		1
+ATI M71							.*ATI.*M71.*						1		1
+ATI M72							.*ATI.*M72.*						1		1
 ATI M76							.*ATI.*M76.*						3		1
 ATI Mobility Radeon 7xxx		.*ATI.*Mobility.*Radeon 7.*			0		1
 ATI Mobility Radeon 8xxx		.*ATI.*Mobility.*Radeon 8.*			0		1
@@ -86,9 +90,13 @@ ATI Radeon HD 2300				.*ATI.*Radeon HD 23.*				0		1
 ATI Radeon HD 2400				.*ATI.*Radeon HD.*24.*				1		1
 ATI Radeon HD 2600				.*ATI.*Radeon HD 26.*				2		1
 ATI Radeon HD 2900				.*ATI.*Radeon HD 29.*				3		1
+ATI Radeon HD 3200				.*ATI.*Radeon HD.*32.*				1		1
+ATI Radeon HD 3300				.*ATI.*Radeon HD.*33.*				1		1
 ATI Radeon HD 3400				.*ATI.*Radeon HD.*34.*				1		1
 ATI Radeon HD 3600				.*ATI.*Radeon HD.*36.*				3		1
 ATI Radeon HD 3800				.*ATI.*Radeon HD.*38.*				3		1
+ATI Radeon HD 4300				.*ATI.*Radeon HD 43.*				1		1
+ATI Radeon HD 4600				.*ATI.*Radeon HD 46.*				3		1
 ATI Radeon HD 4800				.*ATI.*Radeon HD.*48.*				3		1
 ATI Radeon OpenGL				.*ATI.*Radeon OpenGL.* 				0		0
 ATI Radeon 2100					.*ATI.*Radeon 21.*					0		1
@@ -137,8 +145,8 @@ Intel 865G						.*Intel.*865G						0		0
 Intel 900						.*Intel.*900.*900					0		0
 Intel 915GM						.*Intel.*915GM						0		0
 Intel 915G						.*Intel.*915G						0		0
-Intel 945GM						.*Intel.*945GM						0		1
-Intel 945G						.*Intel.*945G						0		1
+Intel 945GM						.*Intel.*945GM.*					0		1
+Intel 945G						.*Intel.*945G.*						0		1
 Intel 950						.*Intel.*950.*						0		1
 Intel 965						.*Intel.*965.*						0		1
 Intel G33						.*Intel.*G33.*						0		0
@@ -180,17 +188,22 @@ NVIDIA GeForce 7500				.*NVIDIA.*GeForce 75.*				1		1
 NVIDIA GeForce 7600				.*NVIDIA.*GeForce 76.*				2		1
 NVIDIA GeForce 7800				.*NVIDIA.*GeForce.*78.*				2		1
 NVIDIA GeForce 7900				.*NVIDIA.*GeForce 79.*				2		1
+NVIDIA GeForce 8100				.*NVIDIA.*GeForce 81.*				1		1
 NVIDIA GeForce 8200				.*NVIDIA.*GeForce 82.*				1		1
 NVIDIA GeForce 8300				.*NVIDIA.*GeForce 83.*				1		1
 NVIDIA GeForce 8400				.*NVIDIA.*GeForce 84.*				1		1
-NVIDIA GeForce 8500				.*NVIDIA.*GeForce 85.*				3		1
+NVIDIA GeForce 8500				.*GeForce 85.*						3		1
+NVIDIA GeForce 8600M			.*NVIDIA.*GeForce.*8600M.*			1		1
 NVIDIA GeForce 8600				.*NVIDIA.*GeForce 86.*				3		1
 NVIDIA GeForce 8700				.*NVIDIA.*GeForce 87.*				3		1
 NVIDIA GeForce 8800				.*NVIDIA.*GeForce 88.*				3		1
 NVIDIA GeForce 9300M			.*NVIDIA.*GeForce 9300M.*			1		1
+NVIDIA GeForce 9400M			.*NVIDIA.*GeForce 9400M.*			1		1
 NVIDIA GeForce 9500M			.*NVIDIA.*GeForce 9500M.*			2		1
+NVIDIA GeForce 9600M			.*NVIDIA.*GeForce 9600M.*			2		1
 NVIDIA GeForce 9700M			.*NVIDIA.*GeForce 9700M.*			2		1
 NVIDIA GeForce 9300				.*NVIDIA.*GeForce 93.*				1		1
+NVIDIA GeForce 9400				.*GeForce 94.*						1		1
 NVIDIA GeForce 9500				.*NVIDIA.*GeForce 95.*				2		1
 NVIDIA GeForce 9600				.*NVIDIA.*GeForce 96.*				3		1
 NVIDIA GeForce 9800				.*NVIDIA.*GeForce 98.*				3		1
@@ -225,6 +238,10 @@ NVIDIA GeForce Go 7800			.*NVIDIA.*GeForce Go 78.*			2		1
 NVIDIA GeForce Go 7900			.*NVIDIA.*GeForce Go 79.*			2		1
 NVIDIA GeForce GTX 260			.*NVIDIA.*GeForce GTX 26.*			3		1
 NVIDIA GeForce GTX 280			.*NVIDIA.*GeForce GTX 28.*			3		1
+NVIDIA D9M						.*D9M.*								1		1
+NVIDIA G84						.*G84.*								1		1
+NVIDIA G92						.*G92.*								3		1
+NVIDIA G94						.*G94.*								3		1
 NVIDIA GeForce Go 6				.*GeForce Go 6.*					1		1
 NVIDIA NB9M						.*GeForce NB9M.*					1		1
 NVIDIA NB9P						.*GeForce NB9P.*					1		1
@@ -234,6 +251,8 @@ NVIDIA NV17						.*GeForce NV17.*					0		1
 NVIDIA NV34						.*NVIDIA.*NV34.*					0		1
 NVIDIA NV36						.*GeForce NV36.*					1		1
 NVIDIA NV43						.*NVIDIA.*NV43.*					1		1
+NVIDIA NV44						.*NVIDIA.*NV44.*					1		1
+NVIDIA nForce					.*NVIDIA.*nForce.*					0		0
 NVIDIA MCP78					.*NVIDIA.*MCP78.*					1		1
 NVIDIA Quadro2					.*Quadro2.*							0		1
 NVIDIA Quadro4					.*Quadro4.*							0		1
@@ -242,10 +261,12 @@ NVIDIA Quadro FX 4500			.*Quadro.*FX.*4500.*				3		1
 NVIDIA Quadro FX				.*Quadro FX.*						1		1
 NVIDIA Quadro NVS				.*Quadro NVS.*						0		1
 NVIDIA RIVA TNT					.*RIVA TNT.*						0		0
+NVIDIA PCI						.*NVIDIA.*/PCI/SSE2					0		0
 S3								.*S3 Graphics.*						0		0
 SiS								SiS.*								0		0
 Trident							Trident.*							0		0
 Tungsten Graphics				Tungsten.*							0		0
 XGI								XGI.*								0		0
 VIA								VIA.*								0		0
-
+Apple Generic					Apple.*Generic.*					0		0
+Apple Software Renderer			Apple.*Software Renderer.*			0		0
diff --git a/indra/newview/installers/windows/lang_de.nsi b/indra/newview/installers/windows/lang_de.nsi
index 911ed74348..b717a4d3a5 100644
--- a/indra/newview/installers/windows/lang_de.nsi
+++ b/indra/newview/installers/windows/lang_de.nsi
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index ac399b45df..b8b08855a8 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -191,26 +191,17 @@
 
 //----------------------------------------------------------------------------
 // viewer.cpp - these are only used in viewer, should be easily moved.
-extern void disable_win_error_reporting();
 
 #if LL_DARWIN
-#include <Carbon/Carbon.h>
 extern void init_apple_menu(const char* product);
-extern OSErr AEGURLHandler(const AppleEvent *messagein, AppleEvent *reply, long refIn);
-extern OSErr AEQuitHandler(const AppleEvent *messagein, AppleEvent *reply, long refIn);
-extern OSStatus simpleDialogHandler(EventHandlerCallRef handler, EventRef event, void *userdata);
-#include <boost/tokenizer.hpp>
 #endif // LL_DARWIN
 
-
 extern BOOL gRandomizeFramerate;
 extern BOOL gPeriodicSlowFrame;
 extern BOOL gDebugGL;
 
 ////////////////////////////////////////////////////////////
 // All from the last globals push...
-BOOL gHandleKeysAsync = FALSE;
-
 const F32 DEFAULT_AFK_TIMEOUT = 5.f * 60.f; // time with no input before user flagged as Away From Keyboard
 
 F32 gSimLastTime; // Used in LLAppViewer::init and send_stats()
@@ -241,7 +232,7 @@ F32 gFPSClamped = 10.f;						// Pretend we start at target rate.
 F32 gFrameDTClamped = 0.f;					// Time between adjacent checks to network for packets
 U64	gStartTime = 0; // gStartTime is "private", used only to calculate gFrameTimeSeconds
 U32 gFrameStalls = 0;
-const F64 FRAME_STALL_THRESHOLD = 5.0;
+const F64 FRAME_STALL_THRESHOLD = 1.0;
 
 LLTimer gRenderStartTime;
 LLFrameTimer gForegroundTime;
@@ -311,6 +302,8 @@ std::string gLoginPage;
 std::vector<std::string> gLoginURIs;
 static std::string gHelperURI;
 
+LLAppViewer::LLUpdaterInfo *LLAppViewer::sUpdaterInfo = NULL ;
+
 void idle_afk_check()
 {
 	// check idle timers
@@ -412,7 +405,6 @@ static void settings_to_globals()
 	gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates");
 	gMapScale = gSavedSettings.getF32("MapScale");
 	gMiniMapScale = gSavedSettings.getF32("MiniMapScale");
-	gHandleKeysAsync = gSavedSettings.getBOOL("AsyncKeyboard");
 	LLHoverView::sShowHoverTips = gSavedSettings.getBOOL("ShowHoverTips");
 
 	LLCubeMap::sUseCubeMaps = LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap");
@@ -665,6 +657,7 @@ bool LLAppViewer::init()
 					ui_audio_callback,
 					&LLUI::sGLScaleFactor);
 	LLWeb::initClass();			  // do this after LLUI
+
 	LLTextEditor::setURLCallbacks(&LLWeb::loadURL,
 				&LLURLDispatcher::dispatchFromTextEditor,
 				&LLURLDispatcher::dispatchFromTextEditor);
@@ -685,7 +678,6 @@ bool LLAppViewer::init()
 	// load MIME type -> media impl mappings
 	LLMIMETypes::parseMIMETypes( std::string("mime_types.xml") ); 
 
-
 	// Copy settings to globals. *TODO: Remove or move to appropriage class initializers
 	settings_to_globals();
 	// Setup settings listeners
@@ -829,7 +821,10 @@ bool LLAppViewer::init()
 		}
 
 	}
-	
+
+	// save the graphics card
+	gDebugInfo["GraphicsCard"] = LLFeatureManager::getInstance()->getGPUString();
+
 	// Save the current version to the prefs file
 	gSavedSettings.setString("LastRunVersion", gCurrentVersion);
 
@@ -885,12 +880,10 @@ bool LLAppViewer::mainLoop()
 			
 			{
 				LLFastTimer t2(LLFastTimer::FTM_MESSAGES);
-			#if LL_WINDOWS
-				if (!LLWinDebug::checkExceptionHandler())
+				if (!restoreErrorTrap())
 				{
-					llwarns << " Someone took over my exception handler (post messagehandling)!" << llendl;
+					llwarns << " Someone took over my signal/exception handler (post messagehandling)!" << llendl;
 				}
-			#endif
 
 				gViewerWindow->mWindow->gatherInput();
 			}
@@ -946,7 +939,7 @@ bool LLAppViewer::mainLoop()
 					
 					resumeMainloopTimeout();
 				}
-
+ 
 				if (gDoDisconnect && (LLStartUp::getStartupState() == STATE_STARTED))
 				{
 					pauseMainloopTimeout();
@@ -1362,6 +1355,10 @@ bool LLAppViewer::cleanup()
 	delete sImageDecodeThread;
     sImageDecodeThread = NULL;
 
+	//Note:
+	//LLViewerMedia::cleanupClass() has to be put before gImageList.shutdown()
+	//because some new image might be generated during cleaning up media. --bao
+	LLViewerMedia::cleanupClass();
 	gImageList.shutdown(); // shutdown again in case a callback added something
 	LLUIImageList::getInstance()->cleanUp();
 	
@@ -1387,14 +1384,17 @@ bool LLAppViewer::cleanup()
 	LLWatchdog::getInstance()->cleanup();
 
 	end_messaging_system();
+	llinfos << "Message system deleted." << llendflush;
 
 	// *NOTE:Mani - The following call is not thread safe. 
 	LLCurl::cleanupClass();
+	llinfos << "LLCurl cleaned up." << llendflush;
 
 	// If we're exiting to launch an URL, do that here so the screen
 	// is at the right resolution before we launch IE.
 	if (!gLaunchFileOnQuit.empty())
 	{
+		llinfos << "Launch file on quit." << llendflush;
 #if LL_WINDOWS
 		// Indicate an application is starting.
 		SetCursor(LoadCursor(NULL, IDC_WAIT));
@@ -1404,9 +1404,8 @@ bool LLAppViewer::cleanup()
 		ms_sleep(1000);
 
 		LLWeb::loadURLExternal( gLaunchFileOnQuit );
+		llinfos << "File launched." << llendflush;
 	}
-	
-	LLViewerMedia::cleanupClass();
 
     llinfos << "Goodbye" << llendflush;
 
@@ -1414,6 +1413,25 @@ bool LLAppViewer::cleanup()
 	return true;
 }
 
+// A callback for llerrs to call during the watchdog error.
+void watchdog_llerrs_callback(const std::string &error_string)
+{
+	gLLErrorActivated = true;
+
+#ifdef LL_WINDOWS
+	RaiseException(0,0,0,0);
+#else
+	raise(SIGQUIT);
+#endif
+}
+
+// A callback for the watchdog to call.
+void watchdog_killer_callback()
+{
+	LLError::setFatalFunction(watchdog_llerrs_callback);
+	llerrs << "Watchdog killer event" << llendl;
+}
+
 bool LLAppViewer::initThreads()
 {
 #if MEM_TRACK_MEM
@@ -1423,10 +1441,11 @@ bool LLAppViewer::initThreads()
 #endif
 
 	const S32 NEVER_SUBMIT_REPORT = 2;
-	if(TRUE == gSavedSettings.getBOOL("WatchdogEnabled") 
-		&& (gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING) != NEVER_SUBMIT_REPORT))
+	bool use_watchdog = gSavedSettings.getBOOL("WatchdogEnabled");
+	bool send_reports = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING) != NEVER_SUBMIT_REPORT;
+	if(use_watchdog && send_reports)
 	{
-		LLWatchdog::getInstance()->init();
+		LLWatchdog::getInstance()->init(watchdog_killer_callback);
 	}
 
 	LLVFSThread::initClass(enable_threads && true);
@@ -2013,7 +2032,7 @@ bool LLAppViewer::initConfiguration()
 		}
 
 		initMarkerFile();
-
+		
 #if LL_SEND_CRASH_REPORTS
 		if (gLastExecEvent == LAST_EXEC_FROZE)
 		{
@@ -2035,52 +2054,8 @@ bool LLAppViewer::initConfiguration()
 			{
 				llinfos << "Sending crash report." << llendl;
 
-#if LL_WINDOWS
-				std::string exe_path = gDirUtilp->getAppRODataDir();
-				exe_path += gDirUtilp->getDirDelimiter();
-				exe_path += "win_crash_logger.exe";
-
-				std::string arg_string = "-previous ";
-				// Spawn crash logger.
-				// NEEDS to wait until completion, otherwise log files will get smashed.
-				_spawnl(_P_WAIT, exe_path.c_str(), exe_path.c_str(), arg_string.c_str(), NULL);
-#elif LL_DARWIN
-				std::string command_str;
-				command_str = "mac-crash-logger.app/Contents/MacOS/mac-crash-logger ";
-				command_str += "-previous";
-				// XXX -- We need to exit fullscreen mode for this to work.
-				// XXX -- system() also doesn't wait for completion.  Hmm...
-				system(command_str.c_str());		/* Flawfinder: Ignore */
-#elif LL_LINUX || LL_SOLARIS
-				std::string cmd =gDirUtilp->getAppRODataDir();
-				cmd += gDirUtilp->getDirDelimiter();
-#if LL_LINUX
-				cmd += "linux-crash-logger.bin";
-#else // LL_SOLARIS
-				cmd += "bin/solaris-crash-logger";
-#endif // LL_LINUX
-				char* const cmdargv[] =
-					{(char*)cmd.c_str(),
-					 (char*)"-previous",
-					 NULL};
-				fflush(NULL); // flush all buffers before the child inherits them
-				pid_t pid = fork();
-				if (pid == 0)
-				{ // child
-					execv(cmd.c_str(), cmdargv);		/* Flawfinder: Ignore */
-					llwarns << "execv failure when trying to start " << cmd << llendl;
-					_exit(1); // avoid atexit()
-				} else {
-					if (pid > 0)
-					{
-						// wait for child proc to die
-						int childExitStatus;
-						waitpid(pid, &childExitStatus, 0);
-					} else {
-						llwarns << "fork failure." << llendl;
-					}
-				}
-#endif
+				bool report_freeze = true;
+				handleCrashReporting(report_freeze);
 			}
 			else
 			{
@@ -2246,7 +2221,6 @@ void LLAppViewer::cleanupSavedSettings()
 
 	gSavedSettings.setF32("MapScale", gMapScale );
 	gSavedSettings.setF32("MiniMapScale", gMiniMapScale );
-	gSavedSettings.setBOOL("AsyncKeyboard", gHandleKeysAsync);
 	gSavedSettings.setBOOL("ShowHoverTips", LLHoverView::sShowHoverTips);
 
 	// Some things are cached in LLAgent.
@@ -2284,7 +2258,7 @@ void LLAppViewer::writeSystemInfo()
 	gDebugInfo["RAMInfo"]["Physical"] = (LLSD::Integer)(gSysMemory.getPhysicalMemoryKB());
 	gDebugInfo["RAMInfo"]["Allocated"] = (LLSD::Integer)(gMemoryAllocated>>10); // MB -> KB
 	gDebugInfo["OSInfo"] = getOSInfo().getOSStringSimple();
-		
+
 	// The user is not logged on yet, but record the current grid choice login url
 	// which may have been the intended grid. This can b
 	gDebugInfo["GridName"] = LLViewerLogin::getInstance()->getGridLabel();
@@ -2295,6 +2269,13 @@ void LLAppViewer::writeSystemInfo()
 	gDebugInfo["MainloopThreadID"] = (S32)thread_id;
 #endif
 
+	// "CrashNotHandled" is set here, while things are running well,
+	// in case of a freeze. If there is a freeze, the crash logger will be launched
+	// and can read this value from the debug_info.log.
+	// If the crash is handled by LLAppViewer::handleViewerCrash, ie not a freeze,
+	// then the value of "CrashNotHandled" will be set to true.
+	gDebugInfo["CrashNotHandled"] = (LLSD::Boolean)true;
+	
 	// Dump some debugging info
 	LL_INFOS("SystemInfo") << gSecondLife
 			<< " version " << LL_VERSION_MAJOR << "." << LL_VERSION_MINOR << "." << LL_VERSION_PATCH
@@ -2369,6 +2350,9 @@ void LLAppViewer::handleViewerCrash()
 	gDebugInfo["CAFilename"] = gDirUtilp->getCAFile();
 	gDebugInfo["ViewerExePath"] = gDirUtilp->getExecutablePathAndName();
 	gDebugInfo["CurrentPath"] = gDirUtilp->getCurPath();
+	gDebugInfo["SessionLength"] = F32(LLFrameTimer::getElapsedSeconds());
+	gDebugInfo["StartupState"] = LLStartUp::getStartupStateString();
+
 	if(gLogoutInProgress)
 	{
 		gDebugInfo["LastExecEvent"] = LAST_EXEC_LOGOUT_CRASH;
@@ -2394,6 +2378,9 @@ void LLAppViewer::handleViewerCrash()
 		gDebugInfo["MainloopTimeoutState"] = LLAppViewer::instance()->mMainloopTimeout->getState();
 	}
 	
+	// The crash is being handled here so set this value to false.
+	// Otherwise the crash logger will think this crash was a freeze.
+	gDebugInfo["CrashNotHandled"] = (LLSD::Boolean)false;
     
 	//Write out the crash status file
 	//Use marker file style setup, as that's the simplest, especially since
@@ -3857,6 +3844,11 @@ void LLAppViewer::pauseMainloopTimeout()
 
 void LLAppViewer::pingMainloopTimeout(const std::string& state, F32 secs)
 {
+//	if(!restoreErrorTrap())
+//	{
+//		llwarns << "!!!!!!!!!!!!! Its an error trap!!!!" << state << llendl;
+//	}
+	
 	if(mMainloopTimeout)
 	{
 		if(secs < 0.0f)
@@ -3869,3 +3861,42 @@ void LLAppViewer::pingMainloopTimeout(const std::string& state, F32 secs)
 	}
 }
 
+void LLAppViewer::handleLoginComplete()
+{
+	initMainloopTimeout("Mainloop Init");
+
+	// Store some data to DebugInfo in case of a freeze.
+	gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
+
+	gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
+	gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
+	gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
+	gDebugInfo["ClientInfo"]["BuildVersion"] = LL_VERSION_BUILD;
+
+	LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+	if ( parcel && parcel->getMusicURL()[0])
+	{
+		gDebugInfo["ParcelMusicURL"] = parcel->getMusicURL();
+	}	
+	if ( parcel && parcel->getMediaURL()[0])
+	{
+		gDebugInfo["ParcelMediaURL"] = parcel->getMediaURL();
+	}
+	
+	gDebugInfo["SettingsFilename"] = gSavedSettings.getString("ClientSettingsFile");
+	gDebugInfo["CAFilename"] = gDirUtilp->getCAFile();
+	gDebugInfo["ViewerExePath"] = gDirUtilp->getExecutablePathAndName();
+	gDebugInfo["CurrentPath"] = gDirUtilp->getCurPath();
+
+	if(gAgent.getRegion())
+	{
+		gDebugInfo["CurrentSimHost"] = gAgent.getRegionHost().getHostName();
+		gDebugInfo["CurrentRegion"] = gAgent.getRegion()->getName();
+	}
+
+	if(LLAppViewer::instance()->mMainloopTimeout)
+	{
+		gDebugInfo["MainloopTimeoutState"] = LLAppViewer::instance()->mMainloopTimeout->getState();
+	}
+	writeDebugInfo();
+}
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index e6856e9744..41081237c7 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -77,7 +77,9 @@ public:
 	// Report true if under the control of a debugger. A null-op default.
 	virtual bool beingDebugged() { return false; } 
 
-	virtual void handleCrashReporting() = 0; // What to do with crash report?
+	virtual bool restoreErrorTrap() = 0; // Require platform specific override to reset error handling mechanism.
+	                                     // return false if the error trap needed restoration.
+	virtual void handleCrashReporting(bool reportFreeze = false) = 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.
 	static void handleSyncViewerCrash(); // Hey! The viewer crashed. Do this right NOW in the context of the crashing thread.
@@ -140,6 +142,9 @@ public:
 	void resumeMainloopTimeout(const std::string& state = "", F32 secs = -1.0f);
 	void pingMainloopTimeout(const std::string& state, F32 secs = -1.0f);
 
+	// Handle the 'login completed' event.
+	// *NOTE:Mani Fix this for login abstraction!!
+	void handleLoginComplete();
 
 protected:
 	virtual bool initWindow(); // Initialize the viewer's window.
@@ -222,6 +227,15 @@ private:
 	// for tracking viewer<->region circuit death
 	bool mAgentRegionLastAlive;
 	LLUUID mAgentRegionLastID;
+
+public:
+	//some information for updater
+	typedef struct
+	{
+		std::string mUpdateExePath;
+		std::ostringstream mParams;
+	}LLUpdaterInfo ;
+	static LLUpdaterInfo *sUpdaterInfo ;
 };
 
 // consts from viewer.h
@@ -232,7 +246,6 @@ const S32 AGENT_UPDATES_PER_SECOND  = 10;
 //
 // "// llstartup" indicates that llstartup is the only client for this global.
 
-extern BOOL gHandleKeysAsync; // gSavedSettings used by llviewerdisplay.cpp & llviewermenu.cpp
 extern LLSD gDebugInfo;
 
 extern BOOL	gAllowIdleAFK;
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp
index 2a5f0ea270..1df4f81416 100644
--- a/indra/newview/llappviewerlinux.cpp
+++ b/indra/newview/llappviewerlinux.cpp
@@ -334,6 +334,13 @@ bool LLAppViewerLinux::init()
 	return LLAppViewer::init();
 }
 
+bool LLAppViewerLinux::restoreErrorTrap()
+{
+	// *NOTE:Mani there is a case for implementing this or the mac.
+	// Linux doesn't need it to my knowledge.
+	return true;
+}
+
 /////////////////////////////////////////
 #if LL_DBUS_ENABLED
 
@@ -526,57 +533,90 @@ void LLAppViewerLinux::handleSyncCrashTrace()
 #  endif // LL_ELFBIN
 }
 
-void LLAppViewerLinux::handleCrashReporting()
+void LLAppViewerLinux::handleCrashReporting(bool reportFreeze)
 {
-	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 != cb)
-	{	
-		// launch the actual crash logger
-		const char* ask_dialog = "-dialog";
-		if (CRASH_BEHAVIOR_ASK != cb)
-			ask_dialog = ""; // omit '-dialog' option
-		std::string cmd =gDirUtilp->getAppRODataDir();
-		cmd += gDirUtilp->getDirDelimiter();
-		cmd += "linux-crash-logger.bin";
-		const char * cmdargv[] =
-			{cmd.c_str(),
-			 ask_dialog,
-			 "-user",
-			 (char*)LLViewerLogin::getInstance()->getGridLabel().c_str(),
-			 "-name",
-			 LLAppViewer::instance()->getSecondLifeTitle().c_str(),
+	std::string cmd =gDirUtilp->getAppRODataDir();
+	cmd += gDirUtilp->getDirDelimiter();
+#if LL_LINUX
+	cmd += "linux-crash-logger.bin";
+#else // LL_SOLARIS
+	cmd += "bin/solaris-crash-logger";
+#endif // LL_LINUX
+
+	if(reportFreeze)
+	{
+		char* const cmdargv[] =
+			{(char*)cmd.c_str(),
+			 (char*)"-previous",
 			 NULL};
-		fflush(NULL);
+
+		fflush(NULL); // flush all buffers before the child inherits them
 		pid_t pid = fork();
 		if (pid == 0)
 		{ // child
-			execv(cmd.c_str(), (char* const*) cmdargv);		/* Flawfinder: ignore */
+			execv(cmd.c_str(), cmdargv);		/* Flawfinder: Ignore */
 			llwarns << "execv failure when trying to start " << cmd << llendl;
 			_exit(1); // avoid atexit()
-		} 
-		else
-		{
+		} else {
 			if (pid > 0)
 			{
-				// DO NOT wait for child proc to die; we want
-				// the logger to outlive us while we quit to
-				// free up the screen/keyboard/etc.
-				////int childExitStatus;
-				////waitpid(pid, &childExitStatus, 0);
+				// wait for child proc to die
+				int childExitStatus;
+				waitpid(pid, &childExitStatus, 0);
+			} else {
+				llwarns << "fork failure." << llendl;
+			}
+		}
+	}
+	else
+	{
+		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 != cb)
+		{	
+			// launch the actual crash logger
+			const char* ask_dialog = "-dialog";
+			if (CRASH_BEHAVIOR_ASK != cb)
+				ask_dialog = ""; // omit '-dialog' option
+			const char * cmdargv[] =
+				{cmd.c_str(),
+				 ask_dialog,
+				 "-user",
+				 (char*)LLViewerLogin::getInstance()->getGridLabel().c_str(),
+				 "-name",
+				 LLAppViewer::instance()->getSecondLifeTitle().c_str(),
+				 NULL};
+			fflush(NULL);
+			pid_t pid = fork();
+			if (pid == 0)
+			{ // child
+				execv(cmd.c_str(), (char* const*) cmdargv);		/* Flawfinder: ignore */
+				llwarns << "execv failure when trying to start " << cmd << llendl;
+				_exit(1); // avoid atexit()
 			} 
 			else
 			{
-				llwarns << "fork failure." << llendl;
+				if (pid > 0)
+				{
+					// DO NOT wait for child proc to die; we want
+					// the logger to outlive us while we quit to
+					// free up the screen/keyboard/etc.
+					////int childExitStatus;
+					////waitpid(pid, &childExitStatus, 0);
+				} 
+				else
+				{
+					llwarns << "fork failure." << llendl;
+				}
 			}
 		}
+		// Sometimes signals don't seem to quit the viewer.  Also, we may
+		// have been called explicitly instead of from a signal handler.
+		// Make sure we exit so as to not totally confuse the user.
+		_exit(1); // avoid atexit(), else we may re-crash in dtors.
 	}
-	// Sometimes signals don't seem to quit the viewer.  Also, we may
-	// have been called explicitly instead of from a signal handler.
-	// Make sure we exit so as to not totally confuse the user.
-	_exit(1); // avoid atexit(), else we may re-crash in dtors.
 }
 
 bool LLAppViewerLinux::beingDebugged()
diff --git a/indra/newview/llappviewerlinux.h b/indra/newview/llappviewerlinux.h
index a0e48ea388..2929e8a1b0 100644
--- a/indra/newview/llappviewerlinux.h
+++ b/indra/newview/llappviewerlinux.h
@@ -61,8 +61,9 @@ public:
 
 protected:
 	virtual bool beingDebugged();
-
-	virtual void handleCrashReporting();
+	
+	virtual bool restoreErrorTrap();
+	virtual void handleCrashReporting(bool reportFreeze);
 	virtual void handleSyncCrashTrace();
 
 	virtual bool initLogging();
diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp
index 81990b0464..01e6483adc 100644
--- a/indra/newview/llappviewermacosx.cpp
+++ b/indra/newview/llappviewermacosx.cpp
@@ -48,7 +48,7 @@
 #include "llurldispatcher.h"
 #include <Carbon/Carbon.h>
 #include "lldir.h"
-
+#include <signal.h>
 class LLWebBrowserCtrl;		// for LLURLDispatcher
 
 namespace 
@@ -196,22 +196,106 @@ bool LLAppViewerMacOSX::initParseCommandLine(LLCommandLineParser& clp)
     return true;
 }
 
+// *FIX:Mani It would be nice to provide a clean interface to get the
+// default_unix_signal_handler for the LLApp class.
+extern void default_unix_signal_handler(int, siginfo_t *, void *);
+bool LLAppViewerMacOSX::restoreErrorTrap()
+{
+	// This method intends to reinstate signal handlers.
+	// *NOTE:Mani It was found that the first execution of a shader was overriding
+	// our initial signal handlers somehow.
+	// This method will be called (at least) once per mainloop execution.
+	// *NOTE:Mani The signals used below are copied over from the 
+	// setup_signals() func in LLApp.cpp
+	// LLApp could use some way of overriding that func, but for this viewer
+	// fix I opt to avoid affecting the server code.
+	
+	// Set up signal handlers that may result in program termination
+	//
+	struct sigaction act;
+	struct sigaction old_act;
+	act.sa_sigaction = default_unix_signal_handler;
+	sigemptyset( &act.sa_mask );
+	act.sa_flags = SA_SIGINFO;
+	
+	unsigned int reset_count = 0;
+	
+#define SET_SIG(S) 	sigaction(SIGABRT, &act, &old_act); \
+					if((unsigned int)act.sa_sigaction != (unsigned int) old_act.sa_sigaction) \
+						++reset_count;
+	// Synchronous signals
+	SET_SIG(SIGABRT)
+	SET_SIG(SIGALRM)
+	SET_SIG(SIGBUS)
+	SET_SIG(SIGFPE)
+	SET_SIG(SIGHUP) 
+	SET_SIG(SIGILL)
+	SET_SIG(SIGPIPE)
+	SET_SIG(SIGSEGV)
+	SET_SIG(SIGSYS)
+	
+	SET_SIG(LL_HEARTBEAT_SIGNAL)
+	SET_SIG(LL_SMACKDOWN_SIGNAL)
+	
+	// Asynchronous signals that are normally ignored
+	SET_SIG(SIGCHLD)
+	SET_SIG(SIGUSR2)
+	
+	// Asynchronous signals that result in attempted graceful exit
+	SET_SIG(SIGHUP)
+	SET_SIG(SIGTERM)
+	SET_SIG(SIGINT)
+	
+	// Asynchronous signals that result in core
+	SET_SIG(SIGQUIT)	
+#undef SET_SIG
+	
+	return reset_count == 0;
+}
+
 void LLAppViewerMacOSX::handleSyncCrashTrace()
 {
 	// do nothing
 }
 
-void LLAppViewerMacOSX::handleCrashReporting()
+void LLAppViewerMacOSX::handleCrashReporting(bool reportFreeze)
 {
-	// Macintosh
 	std::string command_str;
-	command_str += "open mac-crash-logger.app";	
+	//command_str = "open Second Life.app/Contents/Resources/mac-crash-logger.app";
+	command_str = "mac-crash-logger.app/Contents/MacOS/mac-crash-logger";
 	
-	clear_signals();
-	llinfos << "Launching crash reporter using: '" << command_str << "'" << llendl;
-	system(command_str.c_str());		/* Flawfinder: ignore */
-	llinfos << "returned from crash reporter... dying" << llendl;	
-	_exit(1);
+	FSRef appRef;
+	Boolean isDir = 0;
+	OSStatus os_result = FSPathMakeRef((UInt8*)command_str.c_str(),
+									   &appRef,
+									   &isDir);
+	if(os_result >= 0)
+	{
+		LSApplicationParameters appParams;
+		memset(&appParams, 0, sizeof(appParams));
+	 	appParams.version = 0;
+		appParams.flags = kLSLaunchNoParams | kLSLaunchStartClassic;
+		appParams.application = &appRef;
+		
+		if(reportFreeze)
+		{
+			// Make sure freeze reporting launches the crash logger synchronously, lest 
+			// Log files get changed by SL while the logger is running.
+		}
+		else
+		{
+			appParams.flags |= kLSLaunchAsync;
+			clear_signals();
+		}
+		
+		ProcessSerialNumber o_psn;
+		os_result = LSOpenApplication(&appParams, &o_psn);
+	}
+
+	if(!reportFreeze)
+	{
+		_exit(1);
+	}
 }
 
 std::string LLAppViewerMacOSX::generateSerialNumber()
diff --git a/indra/newview/llappviewermacosx.h b/indra/newview/llappviewermacosx.h
index 644c2e0551..bddcd31a3e 100644
--- a/indra/newview/llappviewermacosx.h
+++ b/indra/newview/llappviewermacosx.h
@@ -49,7 +49,8 @@ public:
 
 
 protected:
-	virtual void handleCrashReporting(); 
+	virtual bool restoreErrorTrap();
+	virtual void handleCrashReporting(bool reportFreeze); 
 	virtual void handleSyncCrashTrace();
 
 	std::string generateSerialNumber();
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 06b2a467de..c289daef3c 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -85,6 +85,7 @@ LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *excepti
 	
     // Translate the signals/exceptions into cross-platform stuff
 	// Windows implementation
+    _tprintf( _T("Entering Windows Exception Handler...\n") );
 	llinfos << "Entering Windows Exception Handler..." << llendl;
 
 	// Make sure the user sees something to indicate that the app crashed.
@@ -92,7 +93,9 @@ LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *excepti
 
 	if (LLApp::isError())
 	{
+	    _tprintf( _T("Got another fatal signal while in the error handler, die now!\n") );
 		llwarns << "Got another fatal signal while in the error handler, die now!" << llendl;
+
 		retval = EXCEPTION_EXECUTE_HANDLER;
 		return retval;
 	}
@@ -121,7 +124,28 @@ LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *excepti
 	return retval;
 }
 
+// Create app mutex creates a unique global windows object. 
+// If the object can be created it returns true, otherwise
+// it returns false. The false result can be used to determine 
+// if another instance of a second life app (this vers. or later)
+// is running.
+// *NOTE: Do not use this method to run a single instance of the app.
+// This is intended to help debug problems with the cross-platform 
+// locked file method used for that purpose.
+bool create_app_mutex()
+{
+	bool result = true;
+	LPCWSTR unique_mutex_name = L"SecondLifeAppMutex";
+	HANDLE hMutex;
+	hMutex = CreateMutex(NULL, TRUE, unique_mutex_name); 
+	if(GetLastError() == ERROR_ALREADY_EXISTS) 
+	{     
+		result = false;
+	}
+	return result;
+}
 
+//#define DEBUGGING_SEH_FILTER 1
 #if DEBUGGING_SEH_FILTER
 #	define WINMAIN DebuggingWinMain
 #else
@@ -148,6 +172,10 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
 	
 	viewer_app_ptr->setErrorHandler(LLAppViewer::handleViewerCrash);
 
+	// Set a debug info flag to indicate if multiple instances are running.
+	bool found_other_instance = !create_app_mutex();
+	gDebugInfo["FoundOtherInstanceAtStartup"] = LLSD::Boolean(found_other_instance);
+
 	bool ok = viewer_app_ptr->init();
 	if(!ok)
 	{
@@ -197,6 +225,16 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
 	}
 	delete viewer_app_ptr;
 	viewer_app_ptr = NULL;
+
+	//start updater
+	if(LLAppViewer::sUpdaterInfo)
+	{
+		_spawnl(_P_NOWAIT, LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mParams.str().c_str(), NULL);
+
+		delete LLAppViewer::sUpdaterInfo ;
+		LLAppViewer::sUpdaterInfo = NULL ;
+	}
+
 	return 0;
 }
 
@@ -326,6 +364,17 @@ bool LLAppViewerWin32::cleanup()
 	return result;
 }
 
+bool LLAppViewerWin32::initLogging()
+{
+	// Remove the crash stack log from previous executions.
+	// Since we've started logging a new instance of the app, we can assume 
+	// *NOTE: This should happen before the we send a 'previous instance froze'
+	// crash report, but it must happen after we initialize the DirUtil.
+	LLWinDebug::clearCrashStacks();
+
+	return LLAppViewer::initLogging();
+}
+
 void LLAppViewerWin32::initConsole()
 {
 	// pop up debug console
@@ -407,7 +456,7 @@ bool LLAppViewerWin32::initHardwareTest()
 		LLSplashScreen::update(splash_msg.str());
 	}
 
-	if (!LLWinDebug::checkExceptionHandler())
+	if (!restoreErrorTrap())
 	{
 		LL_WARNS("AppInit") << " Someone took over my exception handler (post hardware probe)!" << LL_ENDL;
 	}
@@ -447,36 +496,39 @@ bool LLAppViewerWin32::initParseCommandLine(LLCommandLineParser& clp)
 	return true;
 }
 
+bool LLAppViewerWin32::restoreErrorTrap()
+{
+	return LLWinDebug::checkExceptionHandler();
+}
+
 void LLAppViewerWin32::handleSyncCrashTrace()
 {
 	// do nothing
 }
 
-void LLAppViewerWin32::handleCrashReporting()
+void LLAppViewerWin32::handleCrashReporting(bool reportFreeze)
 {
-	// Windows only behaivor. Spawn win crash reporter.
-	std::string exe_path = gDirUtilp->getAppRODataDir();
+	const char* logger_name = "win_crash_logger.exe";
+	std::string exe_path = gDirUtilp->getExecutableDir();
 	exe_path += gDirUtilp->getDirDelimiter();
-	exe_path += "win_crash_logger.exe";
+	exe_path += logger_name;
 
-	std::string arg_string = "-user ";
-	arg_string += LLViewerLogin::getInstance()->getGridLabel();
-	
-	S32 cb = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING);
-	switch(cb)
+	const char* arg_str = logger_name;
+
+	// *NOTE:Mani - win_crash_logger.exe no longer parses command line options.
+	if(reportFreeze)
+	{
+		// Spawn crash logger.
+		// NEEDS to wait until completion, otherwise log files will get smashed.
+		_spawnl(_P_WAIT, exe_path.c_str(), arg_str, NULL);
+	}
+	else
 	{
-	case CRASH_BEHAVIOR_ASK:
-	default:
-		arg_string += " -dialog ";
-		_spawnl(_P_NOWAIT, exe_path.c_str(), exe_path.c_str(), arg_string.c_str(), NULL);
-		break;
-
-	case CRASH_BEHAVIOR_ALWAYS_SEND:
-		_spawnl(_P_NOWAIT, exe_path.c_str(), exe_path.c_str(), arg_string.c_str(), NULL);
-		break;
-
-	case CRASH_BEHAVIOR_NEVER_SEND:
-		break;
+		S32 cb = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING);
+		if(cb != CRASH_BEHAVIOR_NEVER_SEND)
+		{
+			_spawnl(_P_NOWAIT, exe_path.c_str(), arg_str, NULL);
+		}
 	}
 }
 
diff --git a/indra/newview/llappviewerwin32.h b/indra/newview/llappviewerwin32.h
index 5f26a18263..4830c23125 100644
--- a/indra/newview/llappviewerwin32.h
+++ b/indra/newview/llappviewerwin32.h
@@ -49,11 +49,13 @@ public:
 	virtual bool cleanup();
 
 protected:
+	virtual bool initLogging(); // Override to clean stack_trace info.
 	virtual void initConsole(); // Initialize OS level debugging console.
 	virtual bool initHardwareTest(); // Win32 uses DX9 to test hardware.
 	virtual bool initParseCommandLine(LLCommandLineParser& clp);
 
-	virtual void handleCrashReporting(); 
+	virtual bool restoreErrorTrap();
+	virtual void handleCrashReporting(bool reportFreeze); 
 	virtual void handleSyncCrashTrace();
 
 	virtual bool sendURLToOtherInstance(const std::string& url);
diff --git a/indra/newview/llcompilequeue.cpp b/indra/newview/llcompilequeue.cpp
index d3041c6206..e9dbc69bce 100644
--- a/indra/newview/llcompilequeue.cpp
+++ b/indra/newview/llcompilequeue.cpp
@@ -60,6 +60,8 @@
 #include "llviewerstats.h"
 #include "lluictrlfactory.h"
 
+#include "llselectmgr.h"
+
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
@@ -194,7 +196,20 @@ BOOL LLFloaterScriptQueue::start()
 {
 	//llinfos << "LLFloaterCompileQueue::start()" << llendl;
 	std::string buffer;
-	buffer = llformat("Starting %s of %d items.", mStartString.c_str(), mObjectIDs.count()); // *TODO: Translate
+
+	LLSelectMgr *mgr = LLSelectMgr::getInstance();
+	LLObjectSelectionHandle selectHandle = mgr->getSelection();
+	U32 n_objects = 0;
+	if (gSavedSettings.getBOOL("EditLinkedParts"))
+	{
+		n_objects = selectHandle->getObjectCount();
+	}
+	else
+	{
+		n_objects = selectHandle->getRootObjectCount();
+	}
+
+	buffer = llformat("Starting %s of %d items.", mStartString.c_str(), n_objects); // *TODO: Translate
 	
 	LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
 	list->addCommentText(buffer);
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp
index ccf130be7a..d08e82301b 100644
--- a/indra/newview/lldrawpoolbump.cpp
+++ b/indra/newview/lldrawpoolbump.cpp
@@ -445,7 +445,6 @@ void LLDrawPoolBump::endShiny(bool invisible)
 			gGL.getTexUnit(cube_channel)->setTextureBlendType(LLTexUnit::TB_MULT);
 		}
 	}
-	
 	gGL.getTexUnit(diffuse_channel)->disable();
 	gGL.getTexUnit(cube_channel)->disable();
 
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index b43838a3a4..3afbdae924 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -29,11 +29,11 @@
  * $/LicenseInfo$
  */
 
+#include "llviewerprecompiledheaders.h"
+
 #include <iostream>
 #include <fstream>
 
-#include "llviewerprecompiledheaders.h"
-
 #include <boost/regex.hpp>
 
 #include "llfeaturemanager.h"
diff --git a/indra/newview/llfloaterinspect.cpp b/indra/newview/llfloaterinspect.cpp
index 16c26ac588..a2054cb70b 100644
--- a/indra/newview/llfloaterinspect.cpp
+++ b/indra/newview/llfloaterinspect.cpp
@@ -206,8 +206,8 @@ void LLFloaterInspect::refresh()
 	mObjectList->operateOnAll(LLScrollListCtrl::OP_DELETE);
 	//List all transient objects, then all linked objects
 
-	for (LLObjectSelection::iterator iter = mObjectSelection->begin();
-		 iter != mObjectSelection->end(); iter++)
+	for (LLObjectSelection::valid_iterator iter = mObjectSelection->valid_begin();
+		 iter != mObjectSelection->valid_end(); iter++)
 	{
 		LLSelectNode* obj = *iter;
 		LLSD row;
diff --git a/indra/newview/llfloaterpostcard.cpp b/indra/newview/llfloaterpostcard.cpp
index 3e12c2e47c..3182568fe8 100644
--- a/indra/newview/llfloaterpostcard.cpp
+++ b/indra/newview/llfloaterpostcard.cpp
@@ -245,7 +245,7 @@ void LLFloaterPostcard::onClickSend(void* data)
 		std::string from(self->childGetValue("from_form").asString());
 		std::string to(self->childGetValue("to_form").asString());
 		
-		boost::regex emailFormat("[A-Za-z0-9.%+-_]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}");
+		boost::regex emailFormat("[A-Za-z0-9.%+-_]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}(,[ \t]*[A-Za-z0-9.%+-_]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,})*");
 		
 		if (to.empty() || !boost::regex_match(to, emailFormat))
 		{
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index db2ea7f41a..dcfb1e9442 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -899,6 +899,13 @@ void LLSnapshotLivePreview::getSize(S32& w, S32& h) const
 
 LLFloaterPostcard* LLSnapshotLivePreview::savePostcard()
 {
+	if(mViewerImage[mCurImageIndex].isNull())
+	{
+		//this should never happen!!
+		llwarns << "The snapshot image has not been generated!" << llendl ;
+		return NULL ;
+	}
+
 	// calculate and pass in image scale in case image data only use portion
 	// of viewerimage buffer
 	LLVector2 image_scale(1.f, 1.f);
@@ -914,9 +921,10 @@ LLFloaterPostcard* LLSnapshotLivePreview::savePostcard()
 		return NULL;
 	}
 	LLFloaterPostcard* floater = LLFloaterPostcard::showFromSnapshot(jpg, mViewerImage[mCurImageIndex], image_scale, mPosTakenGlobal);
-	// relinquish lifetime of viewerimage and jpeg image to postcard floater
-	mViewerImage[mCurImageIndex] = NULL;
+	// relinquish lifetime of jpeg image to postcard floater
 	mFormattedImage = NULL;
+	mDataSize = 0;
+	updateSnapshot(FALSE, FALSE);
 
 	return floater;
 }
@@ -963,11 +971,19 @@ void LLSnapshotLivePreview::saveTexture()
 	}
 
 	LLViewerStats::getInstance()->incStat(LLViewerStats::ST_SNAPSHOT_COUNT );
+	
+	mDataSize = 0;
 }
 
 BOOL LLSnapshotLivePreview::saveLocal()
 {
 	BOOL success = gViewerWindow->saveImageNumbered(mFormattedImage);
+
+	// Relinquish image memory. Save button will be disabled as a side-effect.
+	mFormattedImage = NULL;
+	mDataSize = 0;
+	updateSnapshot(FALSE, FALSE);
+
 	if(success)
 	{
 		gViewerWindow->playSnapshotAnimAndSound();
@@ -1247,14 +1263,14 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
 	BOOL got_bytes = previewp && previewp->getDataSize() > 0;
 	BOOL got_snap = previewp->getSnapshotUpToDate();
 
-	floater->childSetEnabled("send_btn",   shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD && got_bytes && got_snap && previewp->getDataSize() <= MAX_POSTCARD_DATASIZE);
-	floater->childSetEnabled("upload_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_TEXTURE  && got_bytes && got_snap);
-	floater->childSetEnabled("save_btn",   shot_type == LLSnapshotLivePreview::SNAPSHOT_LOCAL    && got_bytes && got_snap);
+	floater->childSetEnabled("send_btn",   shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD && got_snap && previewp->getDataSize() <= MAX_POSTCARD_DATASIZE);
+	floater->childSetEnabled("upload_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_TEXTURE  && got_snap);
+	floater->childSetEnabled("save_btn",   shot_type == LLSnapshotLivePreview::SNAPSHOT_LOCAL    && got_snap);
 
 	LLLocale locale(LLLocale::USER_LOCALE);
 	std::string bytes_string;
 	LLResMgr::getInstance()->getIntegerString(bytes_string, (previewp->getDataSize()) >> 10 );
-	floater->childSetTextArg("file_size_label", "[SIZE]", got_snap ? bytes_string : got_bytes ? floater->getString("unknown") : std::string("???"));
+	floater->childSetTextArg("file_size_label", "[SIZE]", got_snap ? bytes_string : floater->getString("unknown"));
 	floater->childSetColor("file_size_label", 
 		shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD 
 		&& got_bytes
@@ -1384,6 +1400,8 @@ void LLFloaterSnapshot::Impl::onClickKeep(void* data)
 		{
 			checkAutoSnapshot(previewp);
 		}
+
+		updateControls(view);
 	}
 }
 
@@ -1638,6 +1656,9 @@ void LLFloaterSnapshot::Impl::updateResolution(LLUICtrl* ctrl, void* data, BOOL
 	LLSnapshotLivePreview* previewp = getPreviewView(view);
 	if (previewp && combobox->getCurrentIndex() >= 0)
 	{
+		S32 original_width = 0 , original_height = 0 ;
+		previewp->getSize(original_width, original_height) ;
+		
 		if (width == 0 || height == 0)
 		{
 			// take resolution from current window size
@@ -1662,12 +1683,17 @@ void LLFloaterSnapshot::Impl::updateResolution(LLUICtrl* ctrl, void* data, BOOL
 		{
 			resetSnapshotSizeOnUI(view, width, height) ;
 		}
-		previewp->setSize(width, height);
-
+		
 		if(view->childGetValue("snapshot_width").asInteger() != width || view->childGetValue("snapshot_height").asInteger() != height)
 		{
 			view->childSetValue("snapshot_width", width);
 			view->childSetValue("snapshot_height", height);
+		}
+
+		if(original_width != width || original_height != height)
+		{
+			previewp->setSize(width, height);
+
 			// hide old preview as the aspect ratio could be wrong
 			checkAutoSnapshot(previewp, FALSE);
 			getPreviewView(view)->updateSnapshot(FALSE, TRUE);
diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp
index 617d4d010f..eea6b40cba 100644
--- a/indra/newview/llfloatertopobjects.cpp
+++ b/indra/newview/llfloatertopobjects.cpp
@@ -212,7 +212,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 		if (mCurrentMode == STAT_REPORT_TOP_SCRIPTS
 			&& have_extended_data)
 		{
-			element["columns"][5]["column"] = "Mono Time";
+			element["columns"][5]["column"] = "mono_time";
 			element["columns"][5]["value"] = llformat("%0.3f", mono_score);
 			element["columns"][5]["font"] = "SANSSERIF";
 		}
@@ -238,6 +238,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 	{
 		setTitle(getString("top_scripts_title"));
 		list->setColumnLabel("score", getString("scripts_score_label"));
+		list->setColumnLabel("mono_time", getString("scripts_mono_time_label"));
 		
 		LLUIString format = getString("top_scripts_text");
 		format.setArg("[COUNT]", llformat("%d", total_count));
@@ -248,6 +249,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 	{
 		setTitle(getString("top_colliders_title"));
 		list->setColumnLabel("score", getString("colliders_score_label"));
+		list->setColumnLabel("mono_time", "");
 		LLUIString format = getString("top_colliders_text");
 		format.setArg("[COUNT]", llformat("%d", total_count));
 		childSetValue("title_text", LLSD(format));
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index b56629b60a..d46006f7dd 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1499,7 +1499,7 @@ void LLInventoryModel::stopBackgroundFetch()
 //static 
 void LLInventoryModel::backgroundFetch(void*)
 {
-	if (sBackgroundFetchActive)
+	if (sBackgroundFetchActive && gAgent.getRegion())
 	{
 		//If we'll be using the capability, we'll be sending batches and the background thing isn't as important.
 		std::string url = gAgent.getRegion()->getCapability("WebFetchInventoryDescendents");   
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 7b7bdfd582..81decdf40a 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -5940,9 +5940,9 @@ S32 LLObjectSelection::getRootObjectCount()
 	return count;
 }
 
-bool LLObjectSelection::applyToObjects(LLSelectedObjectFunctor* func, bool firstonly)
+bool LLObjectSelection::applyToObjects(LLSelectedObjectFunctor* func)
 {
-	bool result = firstonly ? false : true;
+	bool result = true;
 	for (iterator iter = begin(); iter != end(); )
 	{
 		iterator nextiter = iter++;
@@ -5950,10 +5950,7 @@ bool LLObjectSelection::applyToObjects(LLSelectedObjectFunctor* func, bool first
 		if (!object)
 			continue;
 		bool r = func->apply(object);
-		if (firstonly && r)
-			return true;
-		else
-			result = result && r;
+		result = result && r;
 	}
 	return result;
 }
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index ecd065fdf8..f210fdb9d3 100644
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -316,7 +316,7 @@ public:
 	// If firstonly is FALSE, returns the AND of all apply() calls.
 	// Else returns TRUE immediately if any apply() call succeeds (i.e. OR with early exit)
 	bool applyToRootObjects(LLSelectedObjectFunctor* func, bool firstonly = false);
-	bool applyToObjects(LLSelectedObjectFunctor* func, bool firstonly = false);
+	bool applyToObjects(LLSelectedObjectFunctor* func);
 	bool applyToTEs(LLSelectedTEFunctor* func, bool firstonly = false);
 	bool applyToRootNodes(LLSelectedNodeFunctor* func, bool firstonly = false);
 	bool applyToNodes(LLSelectedNodeFunctor* func, bool firstonly = false);
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 59bf29161e..18b3cb856e 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -118,10 +118,14 @@ void validate_drawable(LLDrawable* drawablep)
 
 S32 AABBSphereIntersect(const LLVector3& min, const LLVector3& max, const LLVector3 &origin, const F32 &rad)
 {
+	return AABBSphereIntersectR2(min, max, origin, rad*rad);
+}
+
+S32 AABBSphereIntersectR2(const LLVector3& min, const LLVector3& max, const LLVector3 &origin, const F32 &r)
+{
 	F32 d = 0.f;
 	F32 t;
-	F32 r = rad*rad;
-
+	
 	if ((min-origin).magVecSquared() < r &&
 		(max-origin).magVecSquared() < r)
 	{
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h
index 2d9900da1b..1fa24d2115 100644
--- a/indra/newview/llspatialpartition.h
+++ b/indra/newview/llspatialpartition.h
@@ -52,6 +52,7 @@ class LLSpatialBridge;
 class LLSpatialGroup;
 
 S32 AABBSphereIntersect(const LLVector3& min, const LLVector3& max, const LLVector3 &origin, const F32 &rad);
+S32 AABBSphereIntersectR2(const LLVector3& min, const LLVector3& max, const LLVector3 &origin, const F32 &radius_squared);
 
 class LLDrawInfo : public LLRefCount 
 {
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 3de0cf80ce..9a6454be33 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2516,7 +2516,7 @@ bool idle_startup()
 		gDebugView->mFastTimerView->setVisible(TRUE);
 #endif
 
-		LLAppViewer::instance()->initMainloopTimeout("Mainloop Init");
+		LLAppViewer::instance()->handleLoginComplete();
 
 		return TRUE;
 	}
@@ -2832,7 +2832,6 @@ void update_app(BOOL mandatory, const std::string& auth_msg)
 
 void update_dialog_callback(S32 option, void *userdata)
 {
-	std::string update_exe_path;
 	bool mandatory = userdata != NULL;
 
 #if !LL_RELEASE_FOR_DOWNLOAD
@@ -2875,29 +2874,41 @@ void update_dialog_callback(S32 option, void *userdata)
 	// *TODO constantize this guy
 	LLURI update_url = LLURI::buildHTTP("secondlife.com", 80, "update.php", query_map);
 	
+	if(LLAppViewer::sUpdaterInfo)
+	{
+		delete LLAppViewer::sUpdaterInfo ;
+	}
+	LLAppViewer::sUpdaterInfo = new LLAppViewer::LLUpdaterInfo() ;
+	
 #if LL_WINDOWS
-	update_exe_path = gDirUtilp->getTempFilename();
-	if (update_exe_path.empty())
+	LLAppViewer::sUpdaterInfo->mUpdateExePath = gDirUtilp->getTempFilename();
+	if (LLAppViewer::sUpdaterInfo->mUpdateExePath.empty())
 	{
+		delete LLAppViewer::sUpdaterInfo ;
+		LLAppViewer::sUpdaterInfo = NULL ;
+
 		// We're hosed, bail
 		LL_WARNS("AppInit") << "LLDir::getTempFilename() failed" << LL_ENDL;
 		LLAppViewer::instance()->forceQuit();
 		return;
 	}
 
-	update_exe_path += ".exe";
+	LLAppViewer::sUpdaterInfo->mUpdateExePath += ".exe";
 
 	std::string updater_source = gDirUtilp->getAppRODataDir();
 	updater_source += gDirUtilp->getDirDelimiter();
 	updater_source += "updater.exe";
 
 	LL_DEBUGS("AppInit") << "Calling CopyFile source: " << updater_source
-			<< " dest: " << update_exe_path
+			<< " dest: " << LLAppViewer::sUpdaterInfo->mUpdateExePath
 			<< LL_ENDL;
 
 
-	if (!CopyFileA(updater_source.c_str(), update_exe_path.c_str(), FALSE))
+	if (!CopyFileA(updater_source.c_str(), LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), FALSE))
 	{
+		delete LLAppViewer::sUpdaterInfo ;
+		LLAppViewer::sUpdaterInfo = NULL ;
+
 		LL_WARNS("AppInit") << "Unable to copy the updater!" << LL_ENDL;
 		LLAppViewer::instance()->forceQuit();
 		return;
@@ -2910,18 +2921,13 @@ void update_dialog_callback(S32 option, void *userdata)
 		gSavedSettings.setString( "NextLoginLocation", LLURLSimString::sInstance.mSimString ); 
 	};
 
-	std::ostringstream params;
-	params << "-url \"" << update_url.asString() << "\"";
+	LLAppViewer::sUpdaterInfo->mParams << "-url \"" << update_url.asString() << "\"";
 
-	LL_DEBUGS("AppInit") << "Calling updater: " << update_exe_path << " " << params.str() << LL_ENDL;
+	LL_DEBUGS("AppInit") << "Calling updater: " << LLAppViewer::sUpdaterInfo->mUpdateExePath << " " << LLAppViewer::sUpdaterInfo->mParams.str() << LL_ENDL;
 
 	//Explicitly remove the marker file, otherwise we pass the lock onto the child process and things get weird.
 	LLAppViewer::instance()->removeMarkerFile(); // In case updater fails
 	
-	// Use spawn() to run asynchronously
-	int retval = _spawnl(_P_NOWAIT, update_exe_path.c_str(), update_exe_path.c_str(), params.str().c_str(), NULL);
-	LL_DEBUGS("AppInit") << "Spawn returned " << retval << LL_ENDL;
-
 #elif LL_DARWIN
 	// if a sim name was passed in via command line parameter (typically through a SLURL)
 	if ( LLURLSimString::sInstance.mSimString.length() )
@@ -2930,19 +2936,19 @@ void update_dialog_callback(S32 option, void *userdata)
 		gSavedSettings.setString( "NextLoginLocation", LLURLSimString::sInstance.mSimString ); 
 	};
 	
-	update_exe_path = "'";
-	update_exe_path += gDirUtilp->getAppRODataDir();
-	update_exe_path += "/mac-updater.app/Contents/MacOS/mac-updater' -url \"";
-	update_exe_path += update_url.asString();
-	update_exe_path += "\" -name \"";
-	update_exe_path += LLAppViewer::instance()->getSecondLifeTitle();
-	update_exe_path += "\" &";
-
-	LL_DEBUGS("AppInit") << "Calling updater: " << update_exe_path << LL_ENDL;
-	
+	LLAppViewer::sUpdaterInfo->mUpdateExePath = "'";
+	LLAppViewer::sUpdaterInfo->mUpdateExePath += gDirUtilp->getAppRODataDir();
+	LLAppViewer::sUpdaterInfo->mUpdateExePath += "/mac-updater.app/Contents/MacOS/mac-updater' -url \"";
+	LLAppViewer::sUpdaterInfo->mUpdateExePath += update_url.asString();
+	LLAppViewer::sUpdaterInfo->mUpdateExePath += "\" -name \"";
+	LLAppViewer::sUpdaterInfo->mUpdateExePath += LLAppViewer::instance()->getSecondLifeTitle();
+	LLAppViewer::sUpdaterInfo->mUpdateExePath += "\" &";
+
+	LL_DEBUGS("AppInit") << "Calling updater: " << LLAppViewer::sUpdaterInfo->mUpdateExePath << LL_ENDL;
+
 	// Run the auto-updater.
-	system(update_exe_path.c_str());		/* Flawfinder: ignore */
-	
+	system(LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str()); /* Flawfinder: ignore */
+
 #elif LL_LINUX
 	OSMessageBox("Automatic updating is not yet implemented for Linux.\n"
 		"Please download the latest version from www.secondlife.com.",
diff --git a/indra/newview/llstartup.h b/indra/newview/llstartup.h
index 3cfe1ca97f..1639ed55b6 100644
--- a/indra/newview/llstartup.h
+++ b/indra/newview/llstartup.h
@@ -87,6 +87,7 @@ public:
 	// Always use this to set gStartupState so changes are logged
 	static void setStartupState( EStartupState state );
 	static EStartupState getStartupState() { return gStartupState; };
+	static std::string getStartupStateString() { return startupStateToString(gStartupState); };
 
 	static void multimediaInit();
 		// Initialize LLViewerMedia multimedia engine.
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp
index 158bae00b8..5f56318d83 100644
--- a/indra/newview/lltexlayer.cpp
+++ b/indra/newview/lltexlayer.cpp
@@ -60,8 +60,6 @@
 // SJB: We really always want to use the GL cache;
 // let GL page textures in and out of video RAM instead of trying to do so by hand.
 
-LLGradientPaletteList gGradientPaletteList;
-
 // static
 S32 LLTexLayerSetBuffer::sGLByteCount = 0;
 S32 LLTexLayerSetBuffer::sGLBumpByteCount = 0;
@@ -1796,8 +1794,6 @@ BOOL LLTexLayerParamAlphaInfo::parseXml(LLXmlTreeNode* node)
 	static LLStdStringHandle domain_string = LLXmlTree::addAttributeString("domain");
 	param_alpha_node->getFastAttributeF32( domain_string, mDomain );
 
-	gGradientPaletteList.initPalette(mDomain);
-
 	return TRUE;
 }
 
@@ -1992,7 +1988,7 @@ BOOL LLTexLayerParamAlpha::render( S32 x, S32 y, S32 width, S32 height )
 		if(	!mCachedProcessedImageGL ||
 			(mCachedProcessedImageGL->getWidth() != image_tga_width) ||
 			(mCachedProcessedImageGL->getHeight() != image_tga_height) ||
-			(weight_changed && !(gGLManager.mHasPalettedTextures && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_PALETTE))) )
+			(weight_changed ))
 		{
 //			llinfos << "Building Cached Alpha: " << mName << ": (" << mStaticImageRaw->getWidth() << ", " << mStaticImageRaw->getHeight() << ") " << effective_weight << llendl;
 			mCachedEffectiveWeight = effective_weight;
@@ -2004,32 +2000,15 @@ BOOL LLTexLayerParamAlpha::render( S32 x, S32 y, S32 width, S32 height )
 				// We now have something in one of our caches
 				LLTexLayerSet::sHasCaches |= mCachedProcessedImageGL ? TRUE : FALSE;
 
-				if (gGLManager.mHasPalettedTextures && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_PALETTE))
-				{
-					// interpret luminance values as color index table
-					mCachedProcessedImageGL->setExplicitFormat( GL_COLOR_INDEX8_EXT, GL_COLOR_INDEX ); 
-				}
-				else
-				{
-					mCachedProcessedImageGL->setExplicitFormat( GL_ALPHA8, GL_ALPHA );
-				}
+
+				mCachedProcessedImageGL->setExplicitFormat( GL_ALPHA8, GL_ALPHA );
 			}
 
 			// Applies domain and effective weight to data as it is decoded. Also resizes the raw image if needed.
-			if (gGLManager.mHasPalettedTextures && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_PALETTE))
-			{
-				mStaticImageRaw = NULL;
-				mStaticImageRaw = new LLImageRaw;
-				mStaticImageTGA->decode(mStaticImageRaw);
-				mNeedsCreateTexture = TRUE;
-			}
-			else
-			{
-				mStaticImageRaw = NULL;
-				mStaticImageRaw = new LLImageRaw;
-				mStaticImageTGA->decodeAndProcess( mStaticImageRaw, getInfo()->mDomain, effective_weight );
-				mNeedsCreateTexture = TRUE;
-			}
+			mStaticImageRaw = NULL;
+			mStaticImageRaw = new LLImageRaw;
+			mStaticImageTGA->decodeAndProcess( mStaticImageRaw, getInfo()->mDomain, effective_weight );
+			mNeedsCreateTexture = TRUE;
 		}
 
 		if( mCachedProcessedImageGL )
@@ -2047,10 +2026,6 @@ BOOL LLTexLayerParamAlpha::render( S32 x, S32 y, S32 width, S32 height )
 
 				LLGLSNoAlphaTest gls_no_alpha_test;
 				gGL.getTexUnit(0)->bind(mCachedProcessedImageGL);
-				if (gGLManager.mHasPalettedTextures && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_PALETTE))
-				{					
-					gGradientPaletteList.setHardwarePalette( getInfo()->mDomain, effective_weight );			
-				}
 				gl_rect_2d_simple_tex( width, height );
 				gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 				stop_glerror();
@@ -2540,68 +2515,3 @@ LLMaskedMorph::LLMaskedMorph( LLPolyMorphTarget *morph_target, BOOL invert ) : m
 	morph_target->addPendingMorphMask();
 }
 
-
-//-----------------------------------------------------------------------------
-// LLGradientPaletteList
-//-----------------------------------------------------------------------------
-
-LLGradientPaletteList::~LLGradientPaletteList()
-{
-	// Note: can't just call deleteAllData() because the data values are arrays.
-	for( palette_map_t::iterator iter = mPaletteMap.begin();
-		 iter != mPaletteMap.end(); iter++ )
-	{
-		U8* data = iter->second;
-		delete []data;
-	}
-}
-
-void LLGradientPaletteList::initPalette(F32 domain)
-{
-	palette_map_t::iterator iter = mPaletteMap.find( domain );
-	if( iter == mPaletteMap.end() )
-	{
-		U8 *palette = new U8[512 * 4];
-		mPaletteMap[domain] = palette;
-		S32 ramp_start = 255 - llfloor(domain * 255.f);
-		S32 ramp_end = 255;
-		F32 ramp_factor = (ramp_end == ramp_start) ? 0.f : (255.f / ((F32)ramp_end - (F32)ramp_start));
-
-		// *TODO: move conditionals outside of loop, since this really
-		// is just a sequential process.
-		for (S32 i = 0; i < 512; i++)
-		{
-			palette[(i * 4) + 1] = 0;
-			palette[(i * 4) + 2] = 0;
-			if (i <= ramp_start)
-			{
-				palette[(i * 4)] = 0;
-				palette[(i * 4) + 3] = 0;
-			}
-			else if (i < ramp_end)
-			{
-				palette[(i * 4)] = llfloor(((F32)i - (F32)ramp_start) * ramp_factor);
-				palette[(i * 4) + 3] = llfloor(((F32)i - (F32)ramp_start) * ramp_factor);
-			}
-			else
-			{
-				palette[(i * 4)] = 255;
-				palette[(i * 4) + 3] = 255;
-			}
-		}
-	}
-}
-
-void LLGradientPaletteList::setHardwarePalette( F32 domain, F32 effective_weight )
-{
-	palette_map_t::iterator iter = mPaletteMap.find( domain );
-	if( iter != mPaletteMap.end() )
-	{
-		U8* palette = iter->second;
-		set_palette( palette + llfloor(effective_weight * (255.f * (1.f - domain))) * 4);
-	}
-	else
-	{
-		llwarns << "LLGradientPaletteList::setHardwarePalette() missing domain " << domain << llendl;
-	}
-}
diff --git a/indra/newview/lltexlayer.h b/indra/newview/lltexlayer.h
index 992e392fc7..3fb6b50977 100644
--- a/indra/newview/lltexlayer.h
+++ b/indra/newview/lltexlayer.h
@@ -527,41 +527,6 @@ public:
 };
 
 
-//-----------------------------------------------------------------------------
-// LLGradientPaletteList
-// A static set of ramp grayscale palettes.  The "effective_weight" is used 
-// to determine the x position of the ramp (offset)
-//
-// "Domain" isn't really the right word.  It refers to the width of the 
-// ramp portion of the function that relates input and output pixel values.
-// A domain of 0 gives a step function.
-// 
-//   |                      /----------------
-//  O|                     / |
-//  u|                    /  |
-//  t|                   /   |
-//  p|------------------/    |
-//  u|                  |    | 
-//  t|<---------------->|<-->|
-//   |  "offset"         "domain"
-//   |
-// --+---Input--------------------------------
-//   |
-//-----------------------------------------------------------------------------
-class LLGradientPaletteList
-{
-public:
-	LLGradientPaletteList() {}
-	~LLGradientPaletteList();
-
-	void		 initPalette(F32 domain);
-	void		 setHardwarePalette(F32 domain, F32 effective_weight);
-	
-private:
-	typedef std::map<F32, U8*> palette_map_t;
-	palette_map_t		mPaletteMap;
-};
-
 // Used by LLTexLayerSetBuffer for a callback.
 class LLBakedUploadData
 {
diff --git a/indra/newview/llurlhistory.cpp b/indra/newview/llurlhistory.cpp
index 902ab88688..6c0ef01c81 100644
--- a/indra/newview/llurlhistory.cpp
+++ b/indra/newview/llurlhistory.cpp
@@ -72,9 +72,16 @@ bool LLURLHistory::loadFile(const std::string& filename)
 
 // static
 bool LLURLHistory::saveFile(const std::string& filename)
-{
-	std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter();
-	llofstream out((temp_str + filename));
+{	
+	std::string temp_str = gDirUtilp->getLindenUserDir();
+	if( temp_str.empty() )
+	{
+		llwarns << "Can't save. No user directory set." << llendl;
+		return false;
+	}
+
+	temp_str += gDirUtilp->getDirDelimiter() + filename;
+	llofstream out(temp_str);
 	if (!out.good())
 	{
 		llwarns << "Unable to open " << filename << " for output." << llendl;
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp
index 0363dba631..b6d54d9789 100644
--- a/indra/newview/llviewerassetstorage.cpp
+++ b/indra/newview/llviewerassetstorage.cpp
@@ -29,9 +29,9 @@
  * $/LicenseInfo$
  */
 
+#include "llviewerprecompiledheaders.h"
 
 #include "linden_common.h"
-#include "llviewerprecompiledheaders.h"
 
 #include "llagent.h"
 #include "llviewerassetstorage.h"
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 2f907fddbf..0eb289beed 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -113,7 +113,6 @@ void render_ui_3d();
 void render_ui_2d();
 void render_disconnected_background();
 void render_hud_elements();
-void process_keystrokes_async();
 
 void display_startup()
 {
@@ -684,7 +683,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 			glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 		}
 
-		LLAppViewer::instance()->pingMainloopTimeout("Display:Render");
+		LLAppViewer::instance()->pingMainloopTimeout("Display:RenderStart");
 		
 		//// render frontmost floater opaque for occlusion culling purposes
 		//LLFloater* frontmost_floaterp = gFloaterView->getFrontmost();
@@ -730,10 +729,13 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 			glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 			gGL.setColorMask(true, false);
 		}
-
+		
+		LLAppViewer::instance()->pingMainloopTimeout("Display:RenderGeom");
+		
 		if (!(LLAppViewer::instance()->logoutRequestSent() && LLAppViewer::instance()->hasSavedFinalSnapshot())
 				&& !gRestoreGL)
 		{
+
 			gGL.setColorMask(true, false);
 			LLPipeline::sUnderWaterRender = LLViewerCamera::getInstance()->cameraUnderWater() ? TRUE : FALSE;
 			gPipeline.renderGeom(*LLViewerCamera::getInstance(), TRUE);
@@ -748,9 +750,12 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 			}
 			stop_glerror();
 		}
+
+		LLAppViewer::instance()->pingMainloopTimeout("Display:RenderFlush");		
 		
 		if (to_texture)
 		{
+
 			gPipeline.mScreen.flush();
 		}
 
@@ -759,23 +764,20 @@ 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());
-
+		
+		LLAppViewer::instance()->pingMainloopTimeout("Display:RenderUI");
+		
 		if (!for_snapshot)
 		{
+			gFrameStats.start(LLFrameStats::RENDER_UI);
 			render_ui();
 		}
 
 		LLSpatialGroup::sNoDelete = FALSE;
 	}
-	gFrameStats.start(LLFrameStats::RENDER_UI);
-
-	if (gHandleKeysAsync)
-	{
-		LLAppViewer::instance()->pingMainloopTimeout("Display:Keystrokes");
-		process_keystrokes_async();
-		stop_glerror();
-	}
-
+	
+	LLAppViewer::instance()->pingMainloopTimeout("Display:FrameStats");
+	
 	gFrameStats.start(LLFrameStats::MISC_END);
 	stop_glerror();
 
@@ -1231,43 +1233,3 @@ void display_cleanup()
 {
 	gDisconnectedImagep = NULL;
 }
-
-void process_keystrokes_async()
-{
-#if LL_WINDOWS
-	MSG			msg;
-	// look through all input messages, leaving them in the event queue
-	while( PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE | PM_NOYIELD))
-	{
-		// on first mouse message, break out
-		if (msg.message >= WM_MOUSEFIRST && 
-			msg.message <= WM_MOUSELAST ||
-			msg.message == WM_QUIT)
-		{
-			break;
-		}
-
-		// this is a message we want to handle now, so remove it from the event queue
-		PeekMessage(&msg, NULL, msg.message, msg.message, PM_REMOVE | PM_NOYIELD);
-		//		if (msg.message == WM_KEYDOWN)
-		//		{
-		//			llinfos << "Process async key down " << (U32)msg.wParam << llendl;
-		//		}
-		TranslateMessage(&msg);
-		DispatchMessage(&msg);
-	}
-
-	// Scan keyboard for movement keys.  Command keys and typing
-	// are handled by windows callbacks.  Don't do this until we're
-	// done initializing.  JC
-	if (gViewerWindow->mWindow->getVisible() 
-		&& gViewerWindow->getActive()
-		&& !gViewerWindow->mWindow->getMinimized()
-		&& LLStartUp::getStartupState() == STATE_STARTED
-		&& !gViewerWindow->getShowProgress()
-		&& !gFocusMgr.focusLocked())
-	{
-		gKeyboard->scanKeyboard();
-	}
-#endif
-}
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index ea1ef2a6a6..aa78362089 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -552,6 +552,7 @@ void LLViewerMedia::buildMediaManagerData( LLMediaManagerData* init_data )
 // static
 void LLViewerMedia::cleanupClass()
 {
+	stop() ;
 	LLMediaManager::cleanupClass();
 }
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 6e37e6253f..c8ad7fad97 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -1023,7 +1023,6 @@ void init_debug_ui_menu(LLMenuGL* menu)
 	menu->append(new LLMenuItemCallGL("Web Browser Test", &handle_web_browser_test));
 	menu->append(new LLMenuItemCallGL("Buy Currency Test", &handle_buy_currency_test));
 	menu->append(new LLMenuItemCallGL("Editable UI", &edit_ui));
-	menu->append(new LLMenuItemToggleGL("Async Keystrokes", &gHandleKeysAsync));
 	menu->append(new LLMenuItemCallGL( "Dump SelectMgr", &dump_select_mgr));
 	menu->append(new LLMenuItemCallGL( "Dump Inventory", &dump_inventory));
 	menu->append(new LLMenuItemCallGL( "Dump Focus Holder", &handle_dump_focus, NULL, NULL, 'F', MASK_ALT | MASK_CONTROL));
@@ -1154,10 +1153,6 @@ void init_debug_rendering_menu(LLMenuGL* menu)
 											&LLPipeline::toggleRenderDebugFeature, NULL,
 											&LLPipeline::toggleRenderDebugFeatureControl,
 											(void*)LLPipeline::RENDER_DEBUG_FEATURE_FOG, KEY_F6, MASK_ALT|MASK_CONTROL));
-	sub_menu->append(new LLMenuItemCheckGL("Palletized Textures",
-											&LLPipeline::toggleRenderDebugFeature, NULL,
-											&LLPipeline::toggleRenderDebugFeatureControl,
-											(void*)LLPipeline::RENDER_DEBUG_FEATURE_PALETTE, KEY_F7, MASK_ALT|MASK_CONTROL));
 	sub_menu->append(new LLMenuItemCheckGL("Test FRInfo",
 											&LLPipeline::toggleRenderDebugFeature, NULL,
 											&LLPipeline::toggleRenderDebugFeatureControl,
@@ -1748,7 +1743,7 @@ class LLViewCommunicate : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-        if (LLFloaterChatterBox::getInstance()->getFloaterCount() == 0)
+		if (LLFloaterChatterBox::getInstance()->getFloaterCount() == 0)
 		{
 			LLFloaterMyFriends::toggleInstance();
 		}
@@ -1756,7 +1751,6 @@ class LLViewCommunicate : public view_listener_t
 		{
 			LLFloaterChatterBox::toggleInstance();
 		}
-		
 		return true;
 	}
 };
@@ -5228,6 +5222,10 @@ class LLFloaterVisible : public view_listener_t
 		{
 			new_value = LLFloaterMyFriends::instanceVisible(0);
 		}
+		else if (floater_name == "communicate")
+		{
+			new_value = LLFloaterChatterBox::instanceVisible();
+		}
 		else if (floater_name == "toolbar")
 		{
 			new_value = LLToolBar::visible(NULL);
@@ -5264,6 +5262,11 @@ class LLFloaterVisible : public view_listener_t
 		{
 			new_value = LLFloaterBeacons::instanceVisible(LLSD());
 		}
+		else if (floater_name == "inventory")
+		{
+			LLInventoryView* iv = LLInventoryView::getActiveInventory(); 
+			new_value = (NULL != iv && TRUE == iv->getVisible());
+		}
 		gMenuHolder->findControl(control_name)->setValue(new_value);
 		return true;
 	}
@@ -5929,10 +5932,10 @@ namespace
 
 void queue_actions(LLFloaterScriptQueue* q, const std::string& noscriptmsg, const std::string& nomodmsg)
 {
-	// Apply until an object fails
 	QueueObjects func(q);
-	const bool firstonly = true;
-	bool fail = LLSelectMgr::getInstance()->getSelection()->applyToObjects(&func, firstonly);
+	LLSelectMgr *mgr = LLSelectMgr::getInstance();
+	LLObjectSelectionHandle selectHandle = mgr->getSelection();
+	bool fail = selectHandle->applyToObjects(&func);
 	if(fail)
 	{
 		if ( !func.scripted )
@@ -5957,61 +5960,67 @@ void queue_actions(LLFloaterScriptQueue* q, const std::string& noscriptmsg, cons
 	}
 }
 
+void handle_compile_queue(std::string to_lang)
+{
+	LLFloaterCompileQueue* queue;
+	if (to_lang == "mono")
+	{
+		queue = LLFloaterCompileQueue::create(TRUE);
+	}
+	else
+	{
+		queue = LLFloaterCompileQueue::create(FALSE);
+	}
+	queue_actions(queue, "CannotRecompileSelectObjectsNoScripts", "CannotRecompileSelectObjectsNoPermission");
+}
+
+void handle_reset_selection(void)
+{
+	LLFloaterResetQueue* queue = LLFloaterResetQueue::create();
+	queue_actions(queue, "CannotResetSelectObjectsNoScripts", "CannotResetSelectObjectsNoPermission");
+}
+
+void handle_set_run_selection(void)
+{
+	LLFloaterRunQueue* queue = LLFloaterRunQueue::create();
+	queue_actions(queue, "CannotSetRunningSelectObjectsNoScripts", "CannotSerRunningSelectObjectsNoPermission");
+}
+
+void handle_set_not_run_selection(void)
+{
+	LLFloaterNotRunQueue* queue = LLFloaterNotRunQueue::create();
+	queue_actions(queue, "CannotSetRunningNotSelectObjectsNoScripts", "CannotSerRunningNotSelectObjectsNoPermission");
+}
+
 class LLToolsSelectedScriptAction : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
 		std::string action = userdata.asString();
-		LLFloaterScriptQueue* queue = NULL;
 		if (action == "compile mono")
 		{
-			queue = LLFloaterCompileQueue::create(TRUE);
+			handle_compile_queue("mono");
 		}
 		if (action == "compile lsl")
 		{
-			queue = LLFloaterCompileQueue::create(FALSE);
+			handle_compile_queue("lsl");
 		}
 		else if (action == "reset")
 		{
-			queue = LLFloaterResetQueue::create();
+			handle_reset_selection();
 		}
 		else if (action == "start")
 		{
-			queue = LLFloaterRunQueue::create();
+			handle_set_run_selection();
 		}
 		else if (action == "stop")
 		{
-			queue = LLFloaterNotRunQueue::create();
+			handle_set_not_run_selection();
 		}
-		if (!queue)
-		{
-			return true;
-		}
-
-		queue_actions(queue, "CannotRecompileSelectObjectsNoScripts", "CannotRecompileSelectObjectsNoPermission");
-
 		return true;
 	}
 };
 
-void handle_reset_selection(void*)
-{
-	LLFloaterResetQueue* queue = LLFloaterResetQueue::create();
-	queue_actions(queue, "CannotResetSelectObjectsNoScripts", "CannotResetSelectObjectsNoPermission");
-}
-
-void handle_set_run_selection(void*)
-{
-	LLFloaterRunQueue* queue = LLFloaterRunQueue::create();
-	queue_actions(queue, "CannotSetRunningSelectObjectsNoScripts", "CannotSerRunningSelectObjectsNoPermission");
-}
-
-void handle_set_not_run_selection(void*)
-{
-	LLFloaterNotRunQueue* queue = LLFloaterNotRunQueue::create();
-	queue_actions(queue, "CannotSetRunningNotSelectObjectsNoScripts", "CannotSerRunningNotSelectObjectsNoPermission");
-}
-
 void handle_selected_texture_info(void*)
 {
 	for (LLObjectSelection::valid_iterator iter = LLSelectMgr::getInstance()->getSelection()->valid_begin();
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 9448a00e68..33c21b4061 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -352,7 +352,8 @@ class LLFileEnableCloseWindow : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		bool new_value = gFloaterView->getFocusedFloater() != NULL || gSnapshotFloaterView->getFocusedFloater() != NULL;
+		bool new_value = NULL != LLFloater::getClosableFloaterFromFocus();
+
 		// horrendously opaque, this code
 		gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
 		return true;
@@ -937,6 +938,11 @@ void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType asset_ty
 						 LLAssetStorage::LLStoreAssetCallback callback,
 						 void *userdata)
 {
+	if(gDisconnected)
+	{
+		return ;
+	}
+
 	LLAssetID uuid = tid.makeAssetID(gAgent.getSecureSessionID());
 	
 	if( LLAssetType::AT_SOUND == asset_type )
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index eeedb98250..e38ef27cf1 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -203,7 +203,7 @@ struct LLFriendshipOffer
 void give_money(const LLUUID& uuid, LLViewerRegion* region, S32 amount, BOOL is_group,
 				S32 trx_type, const std::string& desc)
 {
-	if(0 == amount) return;
+	if(0 == amount || !region) return;
 	amount = abs(amount);
 	LL_INFOS("Messaging") << "give_money(" << uuid << "," << amount << ")"<< LL_ENDL;
 	if(can_afford_transaction(amount))
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 1fca77ec50..ef657a17cc 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -827,8 +827,15 @@ void LLViewerObjectList::removeDrawable(LLDrawable* drawablep)
 
 	for (S32 i = 0; i < drawablep->getNumFaces(); i++)
 	{
-		LLViewerObject* objectp = drawablep->getFace(i)->getViewerObject();
-		mSelectPickList.erase(objectp);
+		LLFace* facep = drawablep->getFace(i) ;
+		if(facep)
+		{
+			   LLViewerObject* objectp = facep->getViewerObject();
+			   if(objectp)
+			   {
+					   mSelectPickList.erase(objectp);
+			   }
+		}
 	}
 }
 
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp
index 7d0d16a100..fac01cbc46 100644
--- a/indra/newview/llviewerstats.cpp
+++ b/indra/newview/llviewerstats.cpp
@@ -759,8 +759,12 @@ void send_stats()
 	// misc["string_2"] = 
 // 	misc["int_1"] = LLFloaterDirectory::sOldSearchCount; // Steve: 1.18.6
 // 	misc["int_2"] = LLFloaterDirectory::sNewSearchCount; // Steve: 1.18.6
-	misc["int_1"] = LLSD::Integer(gSavedSettings.getU32("RenderQualityPerformance")); // Steve: 1.21
-	misc["int_2"] = LLSD::Integer(gFrameStalls); // Steve: 1.21
+// 	misc["int_1"] = LLSD::Integer(gSavedSettings.getU32("RenderQualityPerformance")); // Steve: 1.21
+// 	misc["int_2"] = LLSD::Integer(gFrameStalls); // Steve: 1.21
+	F32 unbaked_time = LLVOAvatar::sUnbakedTime / gFrameTime;
+	misc["int_1"] = LLSD::Integer(unbaked_time * 1000.f); // Steve: 1.22
+	F32 grey_time = LLVOAvatar::sGreyTime / gFrameTime;
+	misc["int_2"] = LLSD::Integer(grey_time * 1000.f); // Steve: 1.22
 	
 	LLViewerStats::getInstance()->addToMessage(body);
 
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index aa5f5e0ae0..c2c3e7e320 100644
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -616,7 +616,10 @@ BOOL LLViewerTextEditor::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* s
 		LLView *viewp = *child_iter;
 		S32 local_x = x - viewp->getRect().mLeft;
 		S32 local_y = y - viewp->getRect().mBottom;
-		if( viewp->handleToolTip(local_x, local_y, msg, sticky_rect_screen ) )
+		if( viewp->pointInView(local_x, local_y) 
+			&& viewp->getVisible() 
+			&& viewp->getEnabled()
+			&& viewp->handleToolTip(local_x, local_y, msg, sticky_rect_screen ) )
 		{
 			return TRUE;
 		}
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index edb339eab4..48b4a79afa 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -29,13 +29,13 @@
  * $/LicenseInfo$
  */
 
+#include "llviewerprecompiledheaders.h"
+
 // system library includes
 #include <stdio.h>
 #include <iostream>
 #include <fstream>
 
-#include "llviewerprecompiledheaders.h"
-
 #include "llpanellogin.h"
 #include "llviewerkeyboard.h"
 #include "llviewerwindow.h"
@@ -183,7 +183,6 @@
 #include "llviewernetwork.h"
 
 #if LL_WINDOWS
-#include "llwindebug.h"
 #include <tchar.h> // For Unicode conversion methods
 #endif
 
@@ -1436,12 +1435,12 @@ LLViewerWindow::LLViewerWindow(
 		!gNoRender,
 		ignore_pixel_depth,
 		gSavedSettings.getU32("RenderFSAASamples"));
-#if LL_WINDOWS
-	if (!LLWinDebug::checkExceptionHandler())
+
+	if (!LLAppViewer::instance()->restoreErrorTrap())
 	{
-		LL_WARNS("Window") << " Someone took over my exception handler (post createWindow)!" << LL_ENDL;
+		LL_WARNS("Window") << " Someone took over my signal/exception handler (post createWindow)!" << LL_ENDL;
 	}
-#endif
+
 
 	if (NULL == mWindow)
 	{
@@ -3588,7 +3587,7 @@ LLViewerObject* LLViewerWindow::cursorIntersect(S32 mouse_x, S32 mouse_y, F32 de
 	LLVector3 mouse_hud_end   = mouse_point_hud + LLVector3(depth, 0, 0);
 	
 	// world coordinates of mouse
-	LLVector3		mouse_direction_global = mouseDirectionGlobal(x,y);
+	LLVector3 mouse_direction_global = mouseDirectionGlobal(x,y);
 	LLVector3 mouse_point_global = LLViewerCamera::getInstance()->getOrigin();
 	LLVector3 mouse_world_start = mouse_point_global;
 	LLVector3 mouse_world_end   = mouse_point_global + mouse_direction_global * depth;
@@ -4620,12 +4619,10 @@ void LLViewerWindow::restoreGL(const std::string& progress_message)
 			setProgressString(progress_message);
 		}
 		llinfos << "...Restoring GL done" << llendl;
-#if LL_WINDOWS
-		if(!LLWinDebug::checkExceptionHandler())
+		if(!LLAppViewer::instance()->restoreErrorTrap())
 		{
-			llwarns << " Someone took over my exception handler (post restoreGL)!" << llendl;
+			llwarns << " Someone took over my signal/exception handler (post restoreGL)!" << llendl;
 		}
-#endif
 
 	}
 }
@@ -5232,7 +5229,7 @@ void LLPickInfo::fetchResults()
 	LLVector3 intersection, normal, binormal;
 	LLVector2 uv;
 
-	LLViewerObject* hit_object = gViewerWindow->cursorIntersect(-1, -1, 512.f,
+	LLViewerObject* hit_object = gViewerWindow->cursorIntersect(mMousePt.mX, mMousePt.mY, 512.f,
 									NULL, -1, mPickTransparent, &face_hit,
 									&intersection, &uv, &normal, &binormal);
 	
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index aec26fa6a1..109b816182 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -272,6 +272,7 @@ LLUUID LLVOAvatar::sStepSounds[LL_MCODE_END] =
 	LLUUID(SND_RUBBER_RUBBER)
 };
 
+// static
 S32 LLVOAvatar::sRenderName = RENDER_NAME_ALWAYS;
 BOOL LLVOAvatar::sRenderGroupTitles = TRUE;
 S32 LLVOAvatar::sNumVisibleChatBubbles = 0;
@@ -284,9 +285,10 @@ BOOL LLVOAvatar::sVisibleInFirstPerson = FALSE;
 F32 LLVOAvatar::sLODFactor = 1.f;
 BOOL LLVOAvatar::sUseImpostors = FALSE;
 BOOL LLVOAvatar::sJointDebug = FALSE;
-
 S32 LLVOAvatar::sCurJoint = 0;
 S32 LLVOAvatar::sCurVolume = 0;
+F32 LLVOAvatar::sUnbakedTime = 0.f;
+F32 LLVOAvatar::sGreyTime = 0.f;
 
 struct LLAvatarTexData
 {
@@ -1070,8 +1072,10 @@ void LLVOAvatar::deleteLayerSetCaches()
 }
 
 // static 
-BOOL LLVOAvatar::areAllNearbyInstancesBaked()
+BOOL LLVOAvatar::areAllNearbyInstancesBaked(S32& grey_avatars)
 {
+	BOOL res = TRUE;
+	grey_avatars = 0;
 	for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
 		iter != LLCharacter::sInstances.end(); ++iter)
 	{
@@ -1080,18 +1084,22 @@ BOOL LLVOAvatar::areAllNearbyInstancesBaked()
 		{
 			continue;
 		}
-		else
-		if( inst->getPixelArea() < MIN_PIXEL_AREA_FOR_COMPOSITE )
-		{
-			return TRUE;  // Assumes sInstances is sorted by pixel area.
-		}
+// 		else
+// 		if( inst->getPixelArea() < MIN_PIXEL_AREA_FOR_COMPOSITE )
+// 		{
+// 			return res;  // Assumes sInstances is sorted by pixel area.
+// 		}
 		else
 		if( !inst->isFullyBaked() )
 		{
-			return FALSE;
+			res = FALSE;
+			if (inst->mHasGrey)
+			{
+				++grey_avatars;
+			}
 		}
 	}
-	return TRUE;
+	return res;
 }
 
 // static 
@@ -1602,7 +1610,7 @@ BOOL LLVOAvatar::lineSegmentIntersect(const LLVector3& start, const LLVector3& e
 		)
 {
 
-	if (mIsSelf && !gAgent.needsRenderAvatar())
+	if (mIsSelf && !gAgent.needsRenderAvatar() || !LLPipeline::sPickAvatar)
 	{
 		return FALSE;
 	}
@@ -4523,6 +4531,7 @@ void LLVOAvatar::updateTextures(LLAgent &agent)
 
 	mMaxPixelArea = 0.f;
 	mMinPixelArea = 99999999.f;
+	mHasGrey = FALSE; // debug
 	for (U32 i = 0; i < getNumTEs(); i++)
 	{
 		LLViewerImage *imagep = getTEImage(i);
@@ -4681,22 +4690,35 @@ void LLVOAvatar::updateTextures(LLAgent &agent)
 void LLVOAvatar::addLocalTextureStats( LLVOAvatar::ELocTexIndex idx, LLViewerImage* imagep,
 									   F32 texel_area_ratio, BOOL render_avatar, BOOL covered_by_baked )
 {
-	if (!covered_by_baked &&
-		render_avatar && // always true if mIsSelf
-		mLocalTexture[ idx ].notNull() && mLocalTexture[idx]->getID() != IMG_DEFAULT_AVATAR)
-	{	
-		F32 desired_pixels;
-		if( mIsSelf )
+	if (!covered_by_baked && render_avatar) // render_avatar is always true if mIsSelf
+	{
+		if (mLocalTexture[ idx ].notNull() && mLocalTexture[idx]->getID() != IMG_DEFAULT_AVATAR)
 		{
-			desired_pixels = llmin(mPixelArea, (F32)LOCTEX_IMAGE_AREA_SELF );
-			imagep->setBoostLevel(LLViewerImage::BOOST_AVATAR_SELF);
+			F32 desired_pixels;
+			if( mIsSelf )
+			{
+				desired_pixels = llmin(mPixelArea, (F32)LOCTEX_IMAGE_AREA_SELF );
+				imagep->setBoostLevel(LLViewerImage::BOOST_AVATAR_SELF);
+			}
+			else
+			{
+				desired_pixels = llmin(mPixelArea, (F32)LOCTEX_IMAGE_AREA_OTHER );
+				imagep->setBoostLevel(LLViewerImage::BOOST_AVATAR);
+			}
+			imagep->addTextureStats( desired_pixels, texel_area_ratio );
+			if (imagep->getDiscardLevel() < 0)
+			{
+				mHasGrey = TRUE; // for statistics gathering
+			}
 		}
 		else
 		{
-			desired_pixels = llmin(mPixelArea, (F32)LOCTEX_IMAGE_AREA_OTHER );
-			imagep->setBoostLevel(LLViewerImage::BOOST_AVATAR);
+			if (mLocalTexture[idx]->getID() == IMG_DEFAULT_AVATAR)
+			{
+				// texture asset is missing
+				mHasGrey = TRUE; // for statistics gathering
+			}
 		}
-		imagep->addTextureStats( desired_pixels, texel_area_ratio );
 	}
 }
 
@@ -9126,10 +9148,17 @@ void LLVOAvatar::cullAvatarsByPixelArea()
 		}
 	}
 
-	if( LLVOAvatar::areAllNearbyInstancesBaked() )
+	S32 grey_avatars = 0;
+	if( LLVOAvatar::areAllNearbyInstancesBaked(grey_avatars) )
 	{
 		LLVOAvatar::deleteCachedImages();
 	}
+	else
+	{
+		sUnbakedTime += gFrameTimeSeconds;
+		if (grey_avatars > 0)
+			sGreyTime += gFrameTimeSeconds;
+	}
 }
 
 const LLUUID& LLVOAvatar::grabLocalTexture(ETextureIndex index)
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 74fdb72c84..9c2ffc2d77 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -913,6 +913,9 @@ public:
 	static BOOL		sJointDebug;
 	static ETextureIndex sBakedTextureIndices[BAKED_TEXTURE_COUNT];
 
+	static F32 		sUnbakedTime; // Total seconds with >=1 unbaked avatars
+	static F32 		sGreyTime; // Total seconds with >=1 grey avatars
+	
 	//--------------------------------------------------------------------
 	// Texture Layer Sets and Global Colors
 	//--------------------------------------------------------------------	
@@ -977,6 +980,7 @@ protected:
 	F32					mLastFadeDistance;
 	F32					mMinPixelArea; // debug
 	F32					mMaxPixelArea; // debug
+	BOOL				mHasGrey; // debug
 	
 	//--------------------------------------------------------------------
 	// Global Colors
@@ -1012,7 +1016,7 @@ protected:
 	
 	BOOL			isFullyBaked();
 	void			deleteLayerSetCaches();
-	static BOOL		areAllNearbyInstancesBaked();
+	static BOOL		areAllNearbyInstancesBaked(S32& grey_avatars);
 
 	static void		onBakedTextureMasksLoaded(BOOL success, LLViewerImage *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata);
 
diff --git a/indra/newview/llvosurfacepatch.cpp b/indra/newview/llvosurfacepatch.cpp
index e912a19f81..13741f0b79 100644
--- a/indra/newview/llvosurfacepatch.cpp
+++ b/indra/newview/llvosurfacepatch.cpp
@@ -945,45 +945,55 @@ BOOL LLVOSurfacePatch::lineSegmentIntersect(const LLVector3& start, const LLVect
 
 	//step one meter at a time until intersection point found
 
+	const LLVector3* ext = mDrawable->getSpatialExtents();
+	F32 rad = (delta*tdelta).magVecSquared();
+
 	F32 t = 0.f;
 	while ( t <= 1.f)
 	{
 		LLVector3 sample = origin + delta*t;
 		
-		F32 height = mRegionp->getLandHeightRegion(sample);
-		if (height > sample.mV[2])
-		{ //ray went below ground, positive intersection
-			//quick and dirty binary search to get impact point
-			tdelta = -tdelta*0.5f;
-			F32 err_dist = 0.001f;
-			F32 dist = fabsf(sample.mV[2] - height);
-
-			while (dist > err_dist && tdelta*tdelta > 0.0f)
-			{
-				t += tdelta;
-				sample = origin+delta*t;
-				height = mRegionp->getLandHeightRegion(sample);
-				if ((tdelta < 0 && height < sample.mV[2]) ||
-					(height > sample.mV[2] && tdelta > 0))
-				{ //jumped over intersection point, go back
-					tdelta = -tdelta;
+		if (AABBSphereIntersectR2(ext[0], ext[1], sample+mRegionp->getOriginAgent(), rad))
+		{
+			F32 height = mRegionp->getLandHeightRegion(sample);
+			if (height > sample.mV[2])
+			{ //ray went below ground, positive intersection
+				//quick and dirty binary search to get impact point
+				tdelta = -tdelta*0.5f;
+				F32 err_dist = 0.001f;
+				F32 dist = fabsf(sample.mV[2] - height);
+
+				while (dist > err_dist && tdelta*tdelta > 0.0f)
+				{
+					t += tdelta;
+					sample = origin+delta*t;
+					height = mRegionp->getLandHeightRegion(sample);
+					if ((tdelta < 0 && height < sample.mV[2]) ||
+						(height > sample.mV[2] && tdelta > 0))
+					{ //jumped over intersection point, go back
+						tdelta = -tdelta;
+					}
+					tdelta *= 0.5f;
+					dist = fabsf(sample.mV[2] - height);
 				}
-				tdelta *= 0.5f;
-				dist = fabsf(sample.mV[2] - height);
-			}
 
-			if (intersection)
-			{
-				sample.mV[2] = mRegionp->getLandHeightRegion(sample);
-				*intersection = sample + mRegionp->getOriginAgent();
-			}
+				if (intersection)
+				{
+					F32 height = mRegionp->getLandHeightRegion(sample);
+					if (fabsf(sample.mV[2]-height) < delta.length()*tdelta)
+					{
+						sample.mV[2] = mRegionp->getLandHeightRegion(sample);
+					}
+					*intersection = sample + mRegionp->getOriginAgent();
+				}
 
-			if (normal)
-			{
-				*normal = mRegionp->getLand().resolveNormalGlobal(mRegionp->getPosGlobalFromRegion(sample));
-			}
+				if (normal)
+				{
+					*normal = mRegionp->getLand().resolveNormalGlobal(mRegionp->getPosGlobalFromRegion(sample));
+				}
 
-			return TRUE;
+				return TRUE;
+			}
 		}
 
 		t += tdelta;
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 50cf336d07..6766898644 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1998,7 +1998,7 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& e
 			face_hit = volume->lineSegmentIntersect(v_start, v_end, i,
 													&p, &tc, &n, &bn);
 			
-			if (face_hit >= 0)
+			if (face_hit >= 0 && mDrawable->getNumFaces() > face_hit)
 			{
 				LLFace* face = mDrawable->getFace(face_hit);
 				if (pick_transparent || !face->getTexture() || face->getTexture()->getMask(face->surfaceToTexture(tc, p, n)))
diff --git a/indra/newview/llwatchdog.cpp b/indra/newview/llwatchdog.cpp
index 27a0155b14..c611aa0b91 100644
--- a/indra/newview/llwatchdog.cpp
+++ b/indra/newview/llwatchdog.cpp
@@ -35,6 +35,15 @@
 
 const U32 WATCHDOG_SLEEP_TIME_USEC = 1000000;
 
+void default_killer_callback()
+{
+#ifdef LL_WINDOWS
+	RaiseException(0,0,0,0);
+#else
+	raise(SIGQUIT);
+#endif
+}
+
 // This class runs the watchdog timing thread.
 class LLWatchdogTimerThread : public LLThread
 {
@@ -52,7 +61,7 @@ public:
 	void stop() 
 	{
 		mStopping = true; 
-		ms_sleep(1);
+		mSleepMsecs = 1;
 	}
     
 	/* virtual */ void run()
@@ -146,7 +155,8 @@ void LLWatchdogTimeout::ping(const std::string& state)
 LLWatchdog::LLWatchdog() :
 	mSuspectsAccessMutex(NULL),
 	mTimer(NULL),
-	mLastClockCount(0)
+	mLastClockCount(0),
+	mKillerCallback(&default_killer_callback)
 {
 }
 
@@ -168,8 +178,9 @@ void LLWatchdog::remove(LLWatchdogEntry* e)
 	unlockThread();
 }
 
-void LLWatchdog::init()
+void LLWatchdog::init(killer_event_callback func)
 {
+	mKillerCallback = func;
 	if(!mSuspectsAccessMutex && !mTimer)
 	{
 		mSuspectsAccessMutex = new LLMutex(NULL);
@@ -238,11 +249,7 @@ void LLWatchdog::run()
 			}
 
 			llinfos << "Watchdog detected error:" << llendl;
-#ifdef LL_WINDOWS
-			RaiseException(0,0,0,0);
-#else
-			raise(SIGQUIT);
-#endif
+			mKillerCallback();
 		}
 	}
 
diff --git a/indra/newview/llwatchdog.h b/indra/newview/llwatchdog.h
index 0bcf11c3a3..ba2eac47ba 100644
--- a/indra/newview/llwatchdog.h
+++ b/indra/newview/llwatchdog.h
@@ -32,6 +32,8 @@
 #ifndef LL_LLTHREADWATCHDOG_H
 #define LL_LLTHREADWATCHDOG_H
 
+#include <boost/function.hpp>
+
 #ifndef LL_TIMER_H					
 	#include "lltimer.h"
 #endif
@@ -85,7 +87,9 @@ public:
 	void add(LLWatchdogEntry* e);
 	void remove(LLWatchdogEntry* e);
 
-	void init();
+	typedef boost::function<void (void)> killer_event_callback;
+
+	void init(killer_event_callback func = NULL);
 	void run();
 	void cleanup();
     
@@ -98,6 +102,8 @@ private:
 	LLMutex* mSuspectsAccessMutex;
 	LLWatchdogTimerThread* mTimer;
 	U64 mLastClockCount;
+
+	killer_event_callback mKillerCallback;
 };
 
 #endif // LL_LLTHREADWATCHDOG_H
diff --git a/indra/newview/llwindebug.cpp b/indra/newview/llwindebug.cpp
index a1a3b1cf1a..08e30d81df 100644
--- a/indra/newview/llwindebug.cpp
+++ b/indra/newview/llwindebug.cpp
@@ -42,6 +42,7 @@
 #pragma warning(disable: 4200)	//nonstandard extension used : zero-sized array in struct/union
 #pragma warning(disable: 4100)	//unreferenced formal parameter
 
+
 /*
 LLSD Block for Windows Dump Information
 <llsd>
@@ -429,7 +430,7 @@ LLSD WINAPI Get_Exception_Info(PEXCEPTION_POINTERS pException)
 	FILETIME	Last_Write_Time;
 	FILETIME	Local_File_Time;
 	SYSTEMTIME	T;
-	
+
 	Str = new WCHAR[DUMP_SIZE_MAX];
 	Str_Len = 0;
 	if (!Str)
@@ -439,6 +440,7 @@ LLSD WINAPI Get_Exception_Info(PEXCEPTION_POINTERS pException)
 	
 	GetModuleFileName(NULL, Str, MAX_PATH);
 	info["Process"] = ll_convert_wide_to_string(Str);
+	info["ThreadID"] = (S32)GetCurrentThreadId();
 
 	// If exception occurred.
 	if (pException)
@@ -552,6 +554,58 @@ void LLMemoryReserve::release()
 
 static LLMemoryReserve gEmergencyMemoryReserve;
 
+#ifndef _M_IX86
+	#error "The following code only works for x86!"
+#endif
+LPTOP_LEVEL_EXCEPTION_FILTER WINAPI MyDummySetUnhandledExceptionFilter(
+	LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter)
+{
+	if(lpTopLevelExceptionFilter ==  gFilterFunc)
+		return gFilterFunc;
+
+	llinfos << "Someone tried to set the exception filter. Listing call stack modules" << llendl;
+	LLSD cs_info;
+	GetCallStackData(NULL, cs_info);
+	
+	if(cs_info.has("CallStack") && cs_info["CallStack"].isArray())
+	{
+		LLSD cs = cs_info["CallStack"];
+		for(LLSD::array_iterator i = cs.beginArray(); 
+			i != cs.endArray(); 
+			++i)
+		{
+			llinfos << "Module: " << (*i)["ModuleName"] << llendl;
+		}
+	}
+	
+	return gFilterFunc;
+}
+
+BOOL PreventSetUnhandledExceptionFilter()
+{
+	HMODULE hKernel32 = LoadLibrary(_T("kernel32.dll"));
+	if (hKernel32 == NULL) 
+		return FALSE;
+
+	void *pOrgEntry = GetProcAddress(hKernel32, "SetUnhandledExceptionFilter");
+	if(pOrgEntry == NULL) 
+		return FALSE;
+	
+	unsigned char newJump[ 100 ];
+	DWORD dwOrgEntryAddr = (DWORD)pOrgEntry;
+	dwOrgEntryAddr += 5; // add 5 for 5 op-codes for jmp far
+	void *pNewFunc = &MyDummySetUnhandledExceptionFilter;
+	DWORD dwNewEntryAddr = (DWORD) pNewFunc;
+	DWORD dwRelativeAddr = dwNewEntryAddr - dwOrgEntryAddr;
+
+	newJump[ 0 ] = 0xE9;  // JMP absolute
+	memcpy(&newJump[ 1 ], &dwRelativeAddr, sizeof(pNewFunc));
+	SIZE_T bytesWritten;
+	BOOL bRet = WriteProcessMemory(GetCurrentProcess(),
+	pOrgEntry, newJump, sizeof(pNewFunc) + 1, &bytesWritten);
+	return bRet;
+}
+
 // static
 void  LLWinDebug::initExceptionHandler(LPTOP_LEVEL_EXCEPTION_FILTER filter_func)
 {
@@ -602,6 +656,9 @@ void  LLWinDebug::initExceptionHandler(LPTOP_LEVEL_EXCEPTION_FILTER filter_func)
     LPTOP_LEVEL_EXCEPTION_FILTER prev_filter;
 	prev_filter = SetUnhandledExceptionFilter(filter_func);
 
+	// *REMOVE:Mani
+	//PreventSetUnhandledExceptionFilter();
+
 	if(prev_filter != gFilterFunc)
 	{
 		LL_WARNS("AppInit") 
@@ -737,3 +794,10 @@ void LLWinDebug::generateCrashStacks(struct _EXCEPTION_POINTERS *exception_infop
 	LLSDSerialize::toPrettyXML(info, out_file);
 	out_file.close();
 }
+
+void LLWinDebug::clearCrashStacks()
+{
+	LLSD info;
+	std::string dump_path = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "SecondLifeException.log");
+	LLFile::remove(dump_path);
+}
diff --git a/indra/newview/llwindebug.h b/indra/newview/llwindebug.h
index 6875b943ae..531b58033b 100644
--- a/indra/newview/llwindebug.h
+++ b/indra/newview/llwindebug.h
@@ -39,7 +39,6 @@ class LLWinDebug
 {
 public:
 
-
 	/** 
 	* @brief initialize the llwindebug exception filter callback
 	* 
@@ -66,6 +65,8 @@ public:
 	static bool checkExceptionHandler();
 
 	static void generateCrashStacks(struct _EXCEPTION_POINTERS *pExceptionInfo = NULL);
+	static void clearCrashStacks(); // Delete the crash stack file(s).
+
 	static void writeDumpToFile(MINIDUMP_TYPE type, MINIDUMP_EXCEPTION_INFORMATION *ExInfop, const std::string& filename);
 private:
 };
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 817331b990..376c712179 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -220,6 +220,7 @@ void display_update_camera();
 
 S32		LLPipeline::sCompiles = 0;
 
+BOOL	LLPipeline::sPickAvatar = TRUE;
 BOOL	LLPipeline::sDynamicLOD = TRUE;
 BOOL	LLPipeline::sShowHUDAttachments = TRUE;
 BOOL	LLPipeline::sRenderPhysicalBeacons = TRUE;
@@ -2342,7 +2343,7 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
 		}
 	}
 
-	
+	LLAppViewer::instance()->pingMainloopTimeout("Pipeline:ForceVBO");
 	
 	//by bao
 	//fake vertex buffer updating
@@ -2389,12 +2390,16 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
 	
 	U32 cur_type = 0;
 
+	LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderDrawPools");
+	
 	if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_PICKING))
 	{
+		LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderForSelect");
 		gObjectList.renderObjectsForSelect(camera, gViewerWindow->getVirtualWindowRect());
 	}
 	else if (gSavedSettings.getBOOL("RenderDeferred"))
 	{
+		LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderDeferred");
 		renderGeomDeferred();
 	}
 	else
@@ -2482,6 +2487,8 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
 			stop_glerror();
 		}
 	}
+	
+	LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderDrawPoolsEnd");
 
 	LLVertexBuffer::unbind();
 	LLGLState::checkStates();
@@ -2505,6 +2512,8 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
 	LLGLState::checkTextureChannels();
 	LLGLState::checkClientArrays();
 
+	LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderHighlights");
+
 	if (!sReflectionRender)
 	{
 		renderHighlights();
@@ -2514,6 +2523,8 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
 	// have touch-handlers.
 	mHighlightFaces.clear();
 
+	LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderDebug");
+	
 	renderDebug();
 
 	LLVertexBuffer::unbind();
@@ -2526,6 +2537,8 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
 		gObjectList.resetObjectBeacons();
 	}
 
+	LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderGeomEnd");
+
 	//HACK: preserve/restore matrices around HUD render
 	if (gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_HUD))
 	{
@@ -4022,6 +4035,8 @@ LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector3& start,
 
 	LLVector3 position;
 
+	sPickAvatar = LLToolMgr::getInstance()->inBuildMode() ? FALSE : TRUE;
+	
 	for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
 			iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
 	{
@@ -4048,6 +4063,31 @@ LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector3& start,
 			}
 		}
 	}
+	
+	if (!sPickAvatar)
+	{
+		if (!drawable || !drawable->getVObj()->isAttachment())
+		{ //check against avatars
+				sPickAvatar = TRUE;
+				for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+						iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+				{
+					LLViewerRegion* region = *iter;
+
+					LLSpatialPartition* part = region->getSpatialPartition(LLViewerRegion::PARTITION_BRIDGE);
+					if (part && hasRenderType(part->mDrawableType))
+					{
+						LLDrawable* hit = part->lineSegmentIntersect(start, local_end, pick_transparent, face_hit, &position, tex_coord, normal, bi_normal);
+						if (hit)
+						{
+							drawable = hit;
+							local_end = position;						
+						}
+					}
+				}
+			}
+		}
+
 
 	//check all avatar nametags (silly, isn't it?)
 	for (std::vector< LLCharacter* >::iterator iter = LLCharacter::sInstances.begin();
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index bacfed0aed..8e64b64cb7 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -319,7 +319,6 @@ public:
 // 		RENDER_DEBUG_FEATURE_HW_LIGHTING		= 0x0010,
 		RENDER_DEBUG_FEATURE_FLEXIBLE			= 0x0010,
 		RENDER_DEBUG_FEATURE_FOG				= 0x0020,
-		RENDER_DEBUG_FEATURE_PALETTE			= 0x0040,
 		RENDER_DEBUG_FEATURE_FR_INFO			= 0x0080,
 		RENDER_DEBUG_FEATURE_FOOT_SHADOWS		= 0x0100,
 	};
@@ -384,6 +383,7 @@ public:
 	static BOOL				sSkipUpdate; //skip lod updates
 	static BOOL				sWaterReflections;
 	static BOOL				sDynamicLOD;
+	static BOOL				sPickAvatar;
 	static BOOL				sReflectionRender;
 	static BOOL				sImpostorRender;
 	static BOOL				sUnderWaterRender;
diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml
new file mode 100644
index 0000000000..48ca5401ed
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_about.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_about" title="Om Second Life">
+	<text_editor name="credits_editor">
+		Second Life er gjort muligt for dig af Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ and many others.
+
+Tak til følgende beboerne for at bidrage til at sikre, at dette er den bedste version til dato: Aminom Marvin, ava ganache, Balthazar Fouroux, CrystalShard Foo, Davec Horsforth, Drew Dwi, Ellla McMahon, Gellan Glenelg, Harleen Gretzky, istephanija munro, Iustinian Tomsen, JC Glimmer, Joeseph Albanese, kelly young, Latif Khalifa, Lex Neva, McCabe Maxsted, Michi Lumin, moni duettmann, Moon Metty, motor loon, Opensource Obscure, Sky Hye, Soap Clawtooth, velveeta biedermann, zeebster colasanti
+
+  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)
+  DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
+  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.
+
+Alle rettigheder forbeholdes.  Se licenses.txt for detaljer.
+
+Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+
+
+We can only see a short distance ahead, but we can see plenty there that needs to be done. --Alan Turing
+	</text_editor>
+	<string name="you_are_at">
+		Du er ved [POSITION]
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml
new file mode 100644
index 0000000000..7163b149e8
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_about_land.xml
@@ -0,0 +1,431 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floaterland" title="Om Land">
+	<tab_container name="landtab">
+		<panel label="Generelt" name="land_general_panel">
+			<text length="1" name="Name:" type="string">
+				Navn:
+			</text>
+			<text length="1" name="Description:" type="string">
+				Beskrivelse:
+			</text>
+			<text length="1" name="Owner:" type="string">
+				Ejer:
+			</text>
+			<text length="1" name="OwnerText" type="string">
+				Leyla Linden
+			</text>
+			<button label="Profil..." label_selected="Profil..." name="Profile..."/>
+			<text length="1" name="Group:" type="string">
+				Gruppe:
+			</text>
+			<button label="Vælg..." label_selected="Vælg..." name="Set..."/>
+			<check_box label="Tillad dedikering til gruppe" name="check deed" tool_tip="En gruppe officer kan dedikere denne jord til gruppen, så det vil blive støttet af gruppen&apos;s jord tildeling."/>
+			<button label="Dediker..." label_selected="Dediker..." name="Deed..." tool_tip="Du kan kun dedikere jord, hvis du er en officer i den valgte gruppe."/>
+			<check_box label="Ejer giver bidrag med dedikering" name="check contrib" tool_tip="When the land is deeded to the group, the former owner contributes enough land allocation to support it."/>
+			<text length="1" name="For Sale:" type="string">
+				Til salg:
+			</text>
+			<text length="1" name="Not for sale." type="string">
+				Ikke til salg.
+			</text>
+			<text length="1" name="For Sale: Price L$[PRICE]." type="string">
+				Pris: L$[PRICE].
+			</text>
+			<button label="Sælg Land..." label_selected="Sælg Land..." name="Sell Land..."/>
+			<text length="1" name="For sale to" type="string">
+				Til salg til: [BUYER]
+			</text>
+			<text length="1" name="Sell with landowners objects in parcel." type="string">
+				Objekter er inkluderet i salget.
+			</text>
+			<text length="1" name="Selling with no objects in parcel." type="string">
+				Objekter er ikke inkluderet i salget.
+			</text>
+			<button label="Annuller Salg" label_selected="Annuller Salg" name="Cancel Land Sale"/>
+			<text length="1" name="Claimed:" type="string">
+				Købt:
+			</text>
+			<text length="1" name="DateClaimText" type="string">
+				Tue Aug 15 13:47:25 2006
+			</text>
+			<text length="1" name="PriceLabel" type="string">
+				Område:
+			</text>
+			<text length="1" name="PriceText" type="string">
+				4048 m2
+			</text>
+			<text length="1" name="Traffic:" type="string">
+				Traffik:
+			</text>
+			<text length="1" name="DwellText" type="string">
+				0
+			</text>
+			<button label="Køb Jord..." label_selected="Køb Jord..." name="Buy Land..."/>
+			<button label="Køb Jord til gruppe..." label_selected="Køb Jord til gruppe..." name="Buy For Group..."/>
+			<button label="Køb Adgang..." label_selected="Køb Adgang..." name="Buy Pass..." tool_tip="Dette giver dig midlertidigt adgang til dette område"/>
+			<button label="Forlad Jord..." label_selected="Forlad Jord..." name="Abandon Land..."/>
+			<button label="Genvind Jord..." label_selected="Genvind Jord..." name="Reclaim Land..."/>
+			<button label="Linden Salg..." label_selected="Linden Salg..." name="Linden Sale..." tool_tip="Jord skal være ejet, indstillet til indhold, og ikke være på auktion."/>
+			<string name="new users only">
+				Kun nye brugere
+			</string>
+			<string name="anyone">
+				Alle
+			</string>
+			<string name="area_text">
+				Område
+			</string>
+			<string name="area_size_text">
+				[AREA] m2
+			</string>
+			<string name="auction_id_text">
+				Auktions ID: [ID]
+			</string>
+			<string name="need_tier_to_modify">
+				Du skal godkende dit køb for at kunne ændre denne jord.
+			</string>
+			<string name="group_owned_text">
+				(Group Owned)
+			</string>
+			<string name="profile_text">
+				Profil...
+			</string>
+			<string name="info_text">
+				Info...
+			</string>
+			<string name="public_text">
+				(offentlig)
+			</string>
+			<string name="none_text">
+				(ingen)
+			</string>
+			<string name="sale_pending_text">
+				(Salg venter)
+			</string>
+			<string name="no_selection_text">
+				Intet parcel valgt.
+Gå til Verden&apos;s menuen&gt; Om Jord eller vælge et andet parcel for at vise detaljer.
+			</string>
+		</panel>
+		<panel label="Betingelser" name="land_covenant_panel">
+			<text length="1" name="covenant_timestamp_text" type="string">
+				Last Modified Wed Dec 31 16:00:00 1969
+			</text>
+			<text length="1" name="region_name_lbl" type="string">
+				Region:
+			</text>
+			<text length="1" name="region_name_text" type="string">
+				leyla
+			</text>
+			<text length="1" name="estate_name_lbl" type="string">
+				Estate:
+			</text>
+			<text length="1" name="estate_name_text" type="string">
+				hovedland
+			</text>
+			<text length="1" name="estate_owner_lbl" type="string">
+				Estate Ejer:
+			</text>
+			<text length="1" name="estate_owner_text" type="string">
+				(ingen)
+			</text>
+			<text length="1" name="resellable_clause" type="string">
+				Købt jord i denne region må ikke videresælges.
+			</text>
+			<text length="1" name="changeable_clause" type="string">
+				Købt jord i denne region må ikke samles/opdeles.
+			</text>
+			<text_editor length="1" name="covenant_editor" type="string">
+				Der er ingen betingelser i henhold til dette Estate.
+			</text_editor>
+			<string name="can_resell">
+				Købt jord i denne region kan videresælges.
+			</string>
+			<string name="can_not_resell">
+				Købt jord i denne region må ikke videresælges.
+			</string>
+			<string name="can_change">
+				Købt jord i denne region må gerne samles eller opdeles.
+			</string>
+			<string name="can_not_change">
+				Købt jord i denne region må ikke samles/opdeles.
+			</string>
+		</panel>
+		<panel label="Objekter" name="land_objects_panel">
+			<text length="1" name="parcel_object_bonus" type="string">
+				Region Objekt Bonus Faktor: [BONUS]
+			</text>
+			<text length="1" name="Simulator primitive usage:" type="string">
+				Prims brugt i denne Sim:
+			</text>
+			<text length="1" name="objects_available" type="string">
+				[COUNT] ud af [MAX] ([AVAILABLE] ledige)
+			</text>
+			<string name="objects_available_text">
+				[COUNT] ud af [MAX] ([AVAILABLE] ledige)
+			</string>
+			<string name="objects_deleted_text">
+				[COUNT] ud af [MAX] ([DELETED] bliver slettet)
+			</string>
+			<text length="1" name="Primitives parcel supports:" type="string">
+				Prims til rådighed:
+			</text>
+			<text length="1" name="object_contrib_text" type="string">
+				[COUNT]
+			</text>
+			<text length="1" name="Primitives on parcel:" type="string">
+				Prims brugt
+			</text>
+			<text length="1" name="total_objects_text" type="string">
+				[COUNT]
+			</text>
+			<text length="1" name="Owned by parcel owner:" type="string">
+				Ejet af Parcel ejer:
+			</text>
+			<text length="1" name="owner_objects_text" type="string">
+				[COUNT]
+			</text>
+			<button label="Vis" label_selected="Vis" name="ShowOwner"/>
+			<button label="Retunér..." label_selected="Retunér..." name="ReturnOwner..." tool_tip="Retunérer objekter til deres ejere."/>
+			<text length="1" name="Set to group:" type="string">
+				Sat til gruppe:
+			</text>
+			<text length="1" name="group_objects_text" type="string">
+				[COUNT]
+			</text>
+			<button label="Vis" label_selected="Vis" name="ShowGroup"/>
+			<button label="Retunér..." label_selected="Retunér..." name="ReturnGroup..." tool_tip="Retunér disse objekter til deres ejere."/>
+			<text length="1" name="Owned by others:" type="string">
+				Ejet af andre:
+			</text>
+			<text length="1" name="other_objects_text" type="string">
+				[COUNT]
+			</text>
+			<button label="Show" label_selected="Show" name="ShowOther"/>
+			<button label="Return..." label_selected="Return..." name="ReturnOther..." tool_tip="Return objects to their owners."/>
+			<text length="1" name="Selected / sat upon:" type="string">
+				Valgt / I Brug:
+			</text>
+			<text length="1" name="selected_objects_text" type="string">
+				[COUNT]
+			</text>
+			<text length="1" name="Autoreturn" type="string">
+				Autoreturnér andre&apos;s objekter efter (minutter, 0 = aldrig):
+			</text>
+			<line_editor name="clean other time"/>
+			<text length="1" name="Object Owners:" type="string">
+				Objekt Ejere:
+			</text>
+			<button label="Forny Liste" label_selected="Forny Liste" name="Refresh List"/>
+			<button label="Retunér objekter..." label_selected="Retunér objekter..." name="Return objects..."/>
+			<name_list name="owner list">
+				<column label="Type" name="type"/>
+				<column name="online_status"/>
+				<column label="Navn" name="name"/>
+				<column label="Antal" name="count"/>
+			</name_list>
+		</panel>
+		<panel label="Indstillinger" name="land_options_panel">
+			<text length="1" name="allow_label" type="string">
+				Tillad beboere at:
+			</text>
+			<check_box label="Redigere Terræn" name="edit land check" tool_tip="Hvis afkrydset kan alle forme jorden på dit land. Det anbefales ikke at give dem denne mulgihed, siden du altid selv kan redigere din jord."/>
+			<check_box label="Lave Landemærker" name="check landmark"/>
+			<check_box label="Flyve" name="check fly" tool_tip="Hvis afkrydset, kan beboere flyve på dit land. Hvis ikke afkrydset kan de kun flyve ind til eller over dit land."/>
+			<text length="1" name="allow_label2" type="string">
+				Lave objekter:
+			</text>
+			<check_box label="Alle Beboere" name="edit objects check"/>
+			<check_box label="Gruppen" name="edit group objects check"/>
+			<text length="1" name="allow_label3" type="string">
+				Indføre objekter:
+			</text>
+			<check_box label="Alle Beboere" name="all object entry check"/>
+			<check_box label="Gruppen" name="group object entry check"/>
+			<text length="1" name="allow_label4" type="string">
+				Køre Koder:
+			</text>
+			<check_box label="Alle Beboere" name="check other scripts"/>
+			<check_box label="Gruppen" name="check group scripts"/>
+			<text length="1" name="land_options_label" type="string">
+				Land Indstillinger:
+			</text>
+			<check_box label="Sikker (ingen skade)" name="check safe" tool_tip="Hvis dette er afkrydset, er landet sikkert, og man kan ikke skades. Hvis ryddet, kan man komme til skade."/>
+			<check_box label="Skub forbudt" name="PushRestrictCheck" tool_tip="Forhindrer koder fra skubbe. Afkrydsning af denne mulighed, kan være nyttigt for at forhindre forstyrrende adfærd på dit land."/>
+			<check_box label="Vis sted i søgning (L$30/uge) under" name="ShowDirectoryCheck" tool_tip="Lad dit parcel blive vist i søge resultaterne"/>
+			<combo_box name="land category">
+				<combo_item name="AnyCategory">
+					Alle Kategorier
+				</combo_item>
+				<combo_item name="LindenLocation">
+					Linden Lokation
+				</combo_item>
+				<combo_item name="Adult">
+					Voksent
+				</combo_item>
+				<combo_item name="Arts&amp;Culture">
+					Kunst &amp; Kultur
+				</combo_item>
+				<combo_item name="Business">
+					Firma
+				</combo_item>
+				<combo_item name="Educational">
+					Uddannelse
+				</combo_item>
+				<combo_item name="Gaming">
+					Spil
+				</combo_item>
+				<combo_item name="Hangout">
+					Afslapning
+				</combo_item>
+				<combo_item name="NewcomerFriendly">
+					Nybegynder venligt
+				</combo_item>
+				<combo_item name="Parks&amp;Nature">
+					Parker &amp; Natur
+				</combo_item>
+				<combo_item name="Residential">
+					Beboelse
+				</combo_item>
+				<combo_item name="Shopping">
+					Indkøb
+				</combo_item>
+				<combo_item name="Other">
+					Andet
+				</combo_item>
+			</combo_box>
+			<button label="?" label_selected="?" name="?"/>
+			<check_box label="Voksent Indhold" name="MatureCheck" tool_tip="Dit Parcel&apos;s information eller indhold anses for voksent."/>
+			<text length="1" name="Snapshot:" type="string">
+				Billede:
+			</text>
+			<texture_picker label="" name="snapshot_ctrl" tool_tip="Click to choose a picture"/>
+			<text length="1" name="landing_point" type="string">
+				Landings Zone: [LANDING]
+			</text>
+			<string name="landing_point_none">
+				(ingen)
+			</string>
+			<button label="Vælg" label_selected="Vælg" name="Set" tool_tip="Indstiller landings punkt, hvor de besøgende ankommer. Indstiller til din avatar placering inde i denne Parcel."/>
+			<button label="Slet" label_selected="Slet" name="Clear" tool_tip="Slet Landings Zonen."/>
+			<text length="1" name="Teleport Routing: " type="string">
+				Teleport Valg:
+			</text>
+			<combo_box name="landing type" tool_tip="Vælg hvordan du vil håndtere teleporteringer til dit land.">
+				<combo_item length="1" name="Blocked" type="string">
+					Blokeret
+				</combo_item>
+				<combo_item length="1" name="LandingPoint" type="string">
+					Landings Zonen
+				</combo_item>
+				<combo_item length="1" name="Anywhere" type="string">
+					Hvor som helst
+				</combo_item>
+			</combo_box>
+			<string name="push_restrict_text">
+				Skub forbudt
+			</string>
+			<string name="push_restrict_region_text">
+				Skub forbudt (Region Overskrivning)
+			</string>
+		</panel>
+		<panel label="Medier" name="land_media_panel">
+			<text length="1" name="with media:" type="string">
+				Medie Type:
+			</text>
+			<combo_box name="media type" tool_tip="Specificer om adressen er en film, hjemmeside eller et andet medie."/>
+			<text length="1" name="at URL:" type="string">
+				Medie URL:
+			</text>
+			<button label="Vælg..." label_selected="Vælg..." name="set_media_url"/>
+			<text length="1" name="Description:" type="string">
+				Beskrivelse:
+			</text>
+			<line_editor name="url_description" tool_tip="Text displayed next to play/load button"/>
+			<text length="1" name="Media texture:" type="string">
+				Erstat
+Tekstur:
+			</text>
+			<texture_picker label="" name="media texture" tool_tip="Klik for at vælge billede"/>
+			<text length="1" name="replace_texture_help" type="string">
+				(Genstande der har denne tekstur vil vise filmen eller
+web-siden, efter du klikker på play knappen.)
+			</text>
+			<text length="1" name="Options:" type="string">
+				Medie
+Indstillinger:
+			</text>
+			<check_box label="Auto Skalér" name="media_auto_scale" tool_tip="Vælg denne mulighed for at skalere indholdet for dette parcel automatisk. Det kan være lidt langsommere og have lavere kvalitet, men ingen anden tekstur skalering eller tilpasning vil være nødvendigt."/>
+			<check_box label="Gentag Medie" name="media_loop" tool_tip="Gentager automatisk medie, når det er færdigt med at spille starter det automatisk forfra."/>
+			<check_box label="Skjul Medie URL." name="hide_media_url" tool_tip="Klik her for at skjule Medie adressen så det kun er dig og evt. parcel gruppens ejer/officere der kan se den."/>
+			<check_box label="Skjul Musik URL" name="hide_music_url" tool_tip="Klik her for at skjule Musik adressen så det kun er dig og evt. parcel gruppens ejer/officere der kan se den."/>
+			<text length="1" name="media_size" tool_tip="Size to render Web media, leave 0 for default." type="string">
+				Medie Størrelse:
+			</text>
+			<spinner name="media_size_width" tool_tip="Størrelse på Web Medier, 0 for standard."/>
+			<spinner name="media_size_height" tool_tip="Størrelse på Web Medier, 0 for standard."/>
+			<text length="1" name="pixels" type="string">
+				pixels
+			</text>
+			<text length="1" name="MusicURL:" type="string">
+				Musik URL:
+			</text>
+			<text length="1" name="Sound:" type="string">
+				Lyd:
+			</text>
+			<check_box label="Begræns alle lyde til dette parcel." name="check sound local"/>
+			<text length="1" name="Voice settings:" type="string">
+				Stemme:
+			</text>
+			<radio_group name="parcel_voice_channel">
+				<radio_item length="1" name="Estate" type="string">
+					Bruger Estate kanalen
+				</radio_item>
+				<radio_item length="1" name="Private" type="string">
+					Bruger sin egen kanal
+				</radio_item>
+				<radio_item length="1" name="Disabled" type="string">
+					Deaktiver stemme chat
+				</radio_item>
+			</radio_group>
+		</panel>
+		<panel label="Adgang" name="land_access_panel">
+			<text length="1" name="Limit access to this parcel to:" type="string">
+				Adgang til dette parcel
+			</text>
+			<check_box label="Tillad offentlig adgang" name="public_access"/>
+			<text length="1" name="Only Allow" type="string">
+				Bloker adgang for:
+			</text>
+			<check_box label="Beboere der ikke har givet betalings oplysninger til Linden Lab" name="limit_payment" tool_tip="Ban unidentified residents."/>
+			<check_box label="Beboere der ikke er godkendt som voksne" name="limit_age_verified" tool_tip="Bloker beboere der ikke har verificeret deres alder. Se support.secondlife.com for mere information."/>
+			<string name="estate_override">
+				En eller flere af disse muligheder er indstillet på estate plan
+			</string>
+			<check_box label="Tillad denne gruppe adgang: [GROUP]" name="GroupCheck" tool_tip="Vælg Gruppe under generelt."/>
+			<check_box label="Sælg adgang til:" name="PassCheck" tool_tip="Giver midlertidigt adgang til parcellet"/>
+			<combo_box name="pass_combo">
+				<combo_item name="Anyone">
+					Alle
+				</combo_item>
+				<combo_item name="Group">
+					Gruppe
+				</combo_item>
+			</combo_box>
+			<spinner label="Pris i L$:" name="PriceSpin"/>
+			<spinner label="Timers adgang:" name="HoursSpin"/>
+			<text label="Always Allow" name="AllowedText">
+				Altid Godkendte Beboere
+			</text>
+			<name_list name="AccessList" tool_tip="([LISTED] listed, [MAX] max)"/>
+			<button label="Tilføj..." label_selected="Tilføj..." name="add_allowed"/>
+			<button label="Fjern" label_selected="Fjern" name="remove_allowed"/>
+			<text label="Ban" name="BanCheck">
+				Blokerede Beboere
+			</text>
+			<name_list name="BannedList" tool_tip="([LISTED] listed, [MAX] max)"/>
+			<button label="Tilføj..." label_selected="Tilføj..." name="add_banned"/>
+			<button label="Fjern" label_selected="Fjern" name="remove_banned"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_animation_preview.xml b/indra/newview/skins/default/xui/da/floater_animation_preview.xml
new file mode 100644
index 0000000000..ec0d14e270
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_animation_preview.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Animations Fremvisning" title="">
+	<text name="name_label">
+		Navn:
+	</text>
+	<text name="description_label">
+		Beskrivelse:
+	</text>
+	<spinner label="Prioritet" name="priority"
+	     tool_tip="Vælg hvilke andre animationer der har lavere prioritet end denne." />
+	<check_box label="Gentag" name="loop_check" tool_tip="Gentager animationen for evigt." />
+	<spinner label="Ind(%)" name="loop_in_point"
+	     tool_tip="Sætter punktet hvor gentagelsen hopper tilbage til." />
+	<spinner label="Ud(%)" name="loop_out_point"
+	     tool_tip="Sætter punktet i animationen der afslutter gentagelsen." />
+	<text name="hand_label">
+		Hånd posering
+	</text>
+	<combo_box label="" name="hand_pose_combo"
+	     tool_tip="Kontrollerer hvad hånden går i løbet af animationen.">
+		<combo_item name="Spread">
+			Spred
+		</combo_item>
+		<combo_item name="Relaxed">
+			Afslappet
+		</combo_item>
+		<combo_item name="PointBoth">
+			Peg Begge
+		</combo_item>
+		<combo_item name="Fist">
+			Knytnæve
+		</combo_item>
+		<combo_item name="RelaxedLeft">
+			Afslappet Venstre
+		</combo_item>
+		<combo_item name="PointLeft">
+			Peger Venstre
+		</combo_item>
+		<combo_item name="FistLeft">
+			Knyttet Venstre
+		</combo_item>
+		<combo_item name="RelaxedRight">
+			Afslappet Højre
+		</combo_item>
+		<combo_item name="PointRight">
+			Peger Højre
+		</combo_item>
+		<combo_item name="FistRight">
+			Knyttet Højre
+		</combo_item>
+		<combo_item name="SaluteRight">
+			Hils Højre
+		</combo_item>
+		<combo_item name="Typing">
+			Skriver
+		</combo_item>
+		<combo_item name="PeaceRight">
+			Fredstegn Højre
+		</combo_item>
+	</combo_box>
+	<text name="emote_label">
+		Ansigts Udtryk
+	</text>
+	<combo_box label="" name="emote_combo"
+	     tool_tip="Controls what face does during animation.">
+		<combo_item name="[None]">
+			[Intet]
+		</combo_item>
+		<combo_item name="Aaaaah">
+			Aaaaah
+		</combo_item>
+		<combo_item name="Afraid">
+			Bange
+		</combo_item>
+		<combo_item name="Angry">
+			Vred
+		</combo_item>
+		<combo_item name="BigSmile">
+			Stort Smil
+		</combo_item>
+		<combo_item name="Bored">
+			Keder Sig
+		</combo_item>
+		<combo_item name="Cry">
+			Græder
+		</combo_item>
+		<combo_item name="Disdain">
+			Foragt
+		</combo_item>
+		<combo_item name="Embarrassed">
+			Flov
+		</combo_item>
+		<combo_item name="Frown">
+			Skule
+		</combo_item>
+		<combo_item name="Kiss">
+			Kysse
+		</combo_item>
+		<combo_item name="Laugh">
+			Grine
+		</combo_item>
+		<combo_item name="Plllppt">
+			Plllppt
+		</combo_item>
+		<combo_item name="Repulsed">
+			Frastøde
+		</combo_item>
+		<combo_item name="Sad">
+			Ked af det
+		</combo_item>
+		<combo_item name="Shrug">
+			Skuldertræk
+		</combo_item>
+		<combo_item name="Smile">
+			Smile
+		</combo_item>
+		<combo_item name="Surprise">
+			Overrasket
+		</combo_item>
+		<combo_item name="Wink">
+			Blinke
+		</combo_item>
+		<combo_item name="Worry">
+			Bekymret
+		</combo_item>
+	</combo_box>
+	<text name="preview_label">
+		Fremvis:
+	</text>
+	<combo_box label="" name="preview_base_anim"
+	     tool_tip="Use this to test your animation behavior while your avatar performs common actions.">
+		<combo_item name="Standing">
+			Stående
+		</combo_item>
+		<combo_item name="Walking">
+			Gående
+		</combo_item>
+		<combo_item name="Sitting">
+			Siddende
+		</combo_item>
+		<combo_item name="Flying">
+			Flyvende
+		</combo_item>
+	</combo_box>
+	<spinner label="Flydende Start (sek)" name="ease_in_time"
+	     tool_tip="Tid i sekunder animationen bruger på at fade ind." />
+	<spinner label="Flydende Stop (sek)" name="ease_out_time"
+	     tool_tip="Tid i sekunder animationen bruger på at fade ind." />
+	<button label="" name="play_btn" tool_tip="Play/pause din animation." />
+	<button label="" name="stop_btn" tool_tip="Stop afspilning af animation" />
+	<slider label="" name="playback_slider" />
+	<text name="bad_animation_text">
+		Kan ikke læse animations fil.
+	
+	Vi anbefaler BVH filer der er exporteret fra Poser 4.
+	</text>
+	<button label="Annuller" name="cancel_btn" />
+	<button label="Upload (L$[AMOUNT])" name="ok_btn" />
+	<string name="failed_to_initialize">
+		Fejlede at starte bevægelse
+	</string>
+	<string name="anim_too_long">
+		Animations filen er [LENGTH] sekunder lang.
+
+Maksimal animations længde er [MAX_LENGTH] sekunder.
+	</string>
+	<string name="failed_file_read">
+		Kan ikke læse animations fil.
+
+[STATUS]
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_auction.xml b/indra/newview/skins/default/xui/da/floater_auction.xml
new file mode 100644
index 0000000000..4462d8eb03
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_auction.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_auction" title="Start Linden Jord Salg">
+	<check_box label="Vis også gult jord hegn" name="fence_check" />
+	<button label="Billede" label_selected="Billede" name="snapshot_btn" />
+	<button label="OK" label_selected="OK" name="ok_btn" />
+	<string name="already for sale">
+		Du kan ikke sætte jord på auktion der allerede er sat til salg.
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_avatar_picker.xml b/indra/newview/skins/default/xui/da/floater_avatar_picker.xml
new file mode 100644
index 0000000000..9dc117b399
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_avatar_picker.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="avatarpicker" title="Vælg Beboer">
+	<text name="instruct_search_resident_name">
+		Skriv en del eller hele navnet på beboeren:
+	</text>
+	<button label="Find" label_selected="Find" name="Find" />
+	<text name="Or select their calling card:">
+		Eller vælg deres kontakt kort:
+	</text>
+	<button label="Luk" label_selected="Luk" name="Close" />
+	<button label="Vælg" label_selected="Vælg" name="Select" />
+	<string name="NotFound">
+		&apos;[TEXT]&apos; ikke fundet
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
new file mode 100644
index 0000000000..0e0e6a1fa9
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="avatar_texture_debug" title="Figur Teksturer">
+	<text name="baked_label">
+		Baked Textures
+	</text>
+	<text name="composite_label">
+		Composite Textures
+	</text>
+	<texture_picker label="Hoved" name="baked_head" />
+	<texture_picker label="Makeup" name="head_bodypaint" />
+	<texture_picker label="Hår" name="hair" />
+	<button label="Drop" label_selected="Dump" name="Dump" />
+	<texture_picker label="Øjne" name="baked_eyes" />
+	<texture_picker label="Øje" name="eye_texture" />
+	<texture_picker label="Øvre Krop" name="baked_upper_body" />
+	<texture_picker label="Øvre Krops Tatovering" name="upper_bodypaint" />
+	<texture_picker label="Undertrøje" name="undershirt" />
+	<texture_picker label="Handsker" name="gloves" />
+	<texture_picker label="Trøje" name="shirt" />
+	<texture_picker label="Øvre Jakke" name="upper_jacket" />
+	<texture_picker label="Nedre Krop" name="baked_lower_body" />
+	<texture_picker label="Nedre Krops Tatovering" name="lower_bodypaint" />
+	<texture_picker label="Underbukser" name="underpants" />
+	<texture_picker label="Sokker" name="socks" />
+	<texture_picker label="Sko" name="shoes" />
+	<texture_picker label="Bukser" name="pants" />
+	<texture_picker label="Jakke" name="jacket" />
+	<texture_picker label="Nederdel" name="baked_skirt" />
+	<texture_picker label="Nederdel" name="skirt_texture" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_beacons.xml b/indra/newview/skins/default/xui/da/floater_beacons.xml
new file mode 100644
index 0000000000..4553a71050
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_beacons.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="beacons" title="Lyssøjler">
+	<panel name="beacons_panel">
+		<check_box label="Kun kodede objekter med &quot;rør&quot;" name="touch_only"/>
+		<check_box label="Kodede objekter" name="scripted"/>
+		<check_box label="Fysiske objekter" name="physical"/>
+		<check_box label="Lyd kilder" name="sounds"/>
+		<check_box label="Partikel Kilder" name="particles"/>
+		<check_box label="Render Highlights" name="highlights"/>
+		<check_box label="Render Lyssøjle" name="beacons"/>
+		<text name="beacon_width_label">
+			Lyssøjle bredde:
+		</text>
+		<slider name="beacon_width"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_build_options.xml b/indra/newview/skins/default/xui/da/floater_build_options.xml
new file mode 100644
index 0000000000..5590ffaa2e
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_build_options.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="build options floater" title="Gitter Indstillinger">
+	<spinner label="Gitter Enhed (meter)" name="GridResolution" />
+	<spinner label="Gitter Bredde (meter)" name="GridDrawSize" />
+	<check_box label="Aktiver Sub-Enheds magnet" name="GridSubUnit" />
+	<check_box label="Vis modsat akse" name="GridCrossSection" />
+	<slider label="Gitter synlighed" name="GridOpacity" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_bumps.xml b/indra/newview/skins/default/xui/da/floater_bumps.xml
new file mode 100644
index 0000000000..1194cb16fd
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_bumps.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_bumps" title="Bump, Skub &amp; Slag">
+	<string name="none_detected">
+		Ingen registreret
+	</string>
+	<string name="bump">
+		[TIME]  [FIRST] [LAST] ramte dig
+	</string>
+	<string name="llpushobject">
+		[TIME]  [FIRST] [LAST] skubbede dig med en kode
+	</string>
+	<string name="selected_object_collide">
+		[TIME]  [FIRST] [LAST] ramte dig med et objekt
+	</string>
+	<string name="scripted_object_collide">
+		[TIME]  [FIRST] [LAST] ramte dig med et kodet objekt
+	</string>
+	<string name="physical_object_collide">
+		[TIME]  [FIRST] [LAST] ramte dig med et fysisk objekt
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_buy_contents.xml b/indra/newview/skins/default/xui/da/floater_buy_contents.xml
new file mode 100644
index 0000000000..1ea43bd304
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_buy_contents.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_buy_contents" title="Køb Indhold">
+	<text name="contains_text">
+		[NAME] indeholder:
+	</text>
+	<text name="buy_text">
+		Køb for L$[AMOUNT] fra [NAME]?
+	</text>
+	<button label="Annuller" label_selected="Annuller" name="cancel_btn" />
+	<button label="Køb" label_selected="Køb" name="buy_btn" />
+	<check_box label="Påsæt med det samme" name="wear_check" />
+	<string name="no_copy_text">
+		(kopi nej)
+	</string>
+	<string name="no_modify_text">
+		(rediger nej)
+	</string>
+	<string name="no_transfer_text">
+		(videregiv nej)
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency.xml b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
new file mode 100644
index 0000000000..cc408de572
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="buy currency" title="K&#248;b Valuta">
+	<text name="info_buying">
+		K&#248;ber Valuta:
+	</text>
+	<text name="info_cannot_buy">
+		Kan ikke k&#248;be nu:
+	</text>
+	<text name="info_need_more">
+		Du har ikke penge nok:
+	</text>
+	<text name="error_message">
+		Noget er g&#229;et galt.
+	</text>
+	<button label="Go to website" name="error_web" />
+	<text name="contacting">
+		Kontakter LindeX...
+	</text>
+	<text name="buy_action_unknown">
+		K&#248;b L$ p&#229; LindeX Valuta marked
+	</text>
+	<text name="buy_action">
+		[NAME] L$ [PRICE]
+	</text>
+	<text name="currency_action">
+		K&#248;b L$
+	</text>
+	<line_editor name="currency_amt">
+		1234
+	</line_editor>
+	<text name="currency_est">
+		for omkring US$ [USD]
+	</text>
+	<text name="getting_data">
+		Henter data...
+	</text>
+	<text name="balance_label">
+		Du har i &#248;jeblikket
+	</text>
+	<text name="balance_amount">
+		L$ [AMT]
+	</text>
+	<text name="buying_label">
+		Du k&#248;ber
+	</text>
+	<text name="buying_amount">
+		L$ [AMT]
+	</text>
+	<text name="total_label">
+		Din balance bliver
+	</text>
+	<text name="total_amount">
+		L$ [AMT]
+	</text>
+	<text name="purchase_warning_repurchase">
+		Der er sket en fejl, og k&#248;bet er afbrudt. Fors&#248;g venligst igen.
+	</text>
+	<text name="purchase_warning_notenough">
+		Du k&#248;ber ikke nok valuta, tast et st&#248;rre bel&#248;b og pr&#248;v igen.
+	</text>
+	<button label="Annuller" name="cancel_btn" />
+	<button label="K&#248;b" name="buy_btn" />
+	<string name="buy_currency">
+		K&#248;b L$ [LINDENS] for omkring US$ [USD]
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_buy_land.xml b/indra/newview/skins/default/xui/da/floater_buy_land.xml
new file mode 100644
index 0000000000..69690fe055
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_buy_land.xml
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="buy land" title="K&#248;b Land">
+	<text name="region_name_label">
+		Region:
+	</text>
+	<text name="region_name_text">
+		(ukendt)
+	</text>
+	<text name="estate_name_label">
+		Estate:
+	</text>
+	<text name="estate_name_text">
+		(ukendt)
+	</text>
+	<text name="estate_owner_label">
+		Estate Owner:
+	</text>
+	<text name="estate_owner_text">
+		(ukendt)
+	</text>
+	<text name="resellable_changeable_label">
+		K&#248;bt land i denne region:
+	</text>
+	<text name="resellable_clause">
+		K&#248;bt land i denne region kan eller kan ikke videres&#230;lges.
+	</text>
+	<text name="changeable_clause">
+		kan eller kan ikke samles eller opdeles.
+	</text>
+	<text name="covenant_text">
+		Du skal acceptere Estate betingelserne:
+	</text>
+	<text_editor name="covenant_editor">
+		Indl&#230;ser...
+	</text_editor>
+	<check_box label="Jeg acceptere betingelserne der er beskrevet." name="agree_covenant" />
+	<text name="info_parcel_label">
+		Parcel:
+	</text>
+	<text name="info_parcel">
+		Scotopteryx 138,204
+	</text>
+	<text name="info_size_label">
+		St&#248;rrelse:
+	</text>
+	<text name="info_size">
+		1024 m2
+	</text>
+	<text name="info_price_label">
+		Pris:
+	</text>
+	<text name="info_price">
+		L$ 1500, objekter inkluderet
+	</text>
+	<text name="info_action">
+		K&#248;b af land vil:
+	</text>
+	<text name="error_message">
+		Noget er ikke rigtigt.
+	</text>
+	<button label="G&#229; til hjemmesiden" name="error_web" />
+	<text name="account_action">
+		Opgrader dig til premium medlemsskab.
+	</text>
+	<text name="account_reason">
+		Kun premium medlemmer kan k&#248;be land.
+	</text>
+	<combo_box name="account_level">
+		<combo_item name="US$9.95/month,billedmonthly">
+			US$9.95/md, m&#229;nedlig afregning
+		</combo_item>
+		<combo_item name="US$7.50/month,billedquarterly">
+			US$7.50/md, kvartalsvis afregning
+		</combo_item>
+		<combo_item name="US$6.00/month,billedannually">
+			US$6.00/md, &#229;rlig afregning
+		</combo_item>
+	</combo_box>
+	<text name="land_use_action">
+		For&#248;g dine m&#229;nedlige arealanvendelse gebyrer til US $ 40/month.
+	</text>
+	<text name="land_use_reason">
+		Du har 1.309 kvadratmeter jord. 
+Dette parcel er p&#229; 512 kvadratmeter jord.
+	</text>
+	<text name="purchase_action">
+		Betal Joe Resident L $ 4000 dette areal
+	</text>
+	<text name="currency_reason">
+		Du har L$2,100.
+	</text>
+	<text name="currency_action">
+		K&#248;b yderligere L$
+	</text>
+	<line_editor name="currency_amt">
+		1000
+	</line_editor>
+	<text name="currency_est">
+		for omkring US$ [AMOUNT2]
+	</text>
+	<text name="currency_balance">
+		Du har L$2,100.
+	</text>
+	<check_box label="Fjern [AMOUNT] kvadratmeter af bidrag fra gruppe."
+	     name="remove_contribution" />
+	<button label="K&#248;b" name="buy_btn" />
+	<button label="Annuller" name="cancel_btn" />
+	<string name="can_resell">
+		Kan videres&#230;lges.
+	</string>
+	<string name="can_not_resell">
+		Kan ikke videres&#230;lges.
+	</string>
+	<string name="can_change">
+		Kan samles eller opdeles.
+	</string>
+	<string name="can_not_change">
+		Kan ikke samles eller opdeles.
+	</string>
+	<string name="cant_buy_for_group">
+		Du har ikke tilladelse til at k&#248;be land for din aktive gruppe.
+	</string>
+	<string name="no_land_selected">
+		Intet land er valgt.
+	</string>
+	<string name="multiple_parcels_selected">
+		Flere forskellige parceller er valgt. 
+Pr&#248;v at v&#230;lge et mindre omr&#229;de.
+	</string>
+	<string name="no_permission">
+		Du har ikke tilladelse til at k&#248;be jord for din aktive gruppe.
+	</string>
+	<string name="parcel_not_for_sale">
+		Det udvalgte parcel er ikke til salg.
+	</string>
+	<string name="group_already_owns">
+		Gruppen ejer allerede parcellet.
+	</string>
+	<string name="you_already_own">
+		Du ejer allerede parcellet.
+	</string>
+	<string name="set_to_sell_to_other">
+		Det udvalgte parcel er sat til salg til en anden.
+	</string>
+	<string name="no_public_land">
+		Det valgte omr&#229;de har ingen offentlige arealer.
+	</string>
+	<string name="not_owned_by_you">
+		Jord, der ejes af en anden bruger er valgt. 
+Pr&#248;v at v&#230;lge et mindre omr&#229;de.
+	</string>
+	<string name="processing">
+		Forarbejder dit k&#248;b...
+ 
+(Dette kan tage et minut eller to.)
+	</string>
+	<string name="fetching_error">
+		Der er sket en fejl under hentning af jord k&#248;bs oplysninger.
+	</string>
+	<string name="buying_will">
+		K&#248;b af dette areal vil:
+	</string>
+	<string name="buying_for_group">
+		K&#248;b jord til gruppe:
+	</string>
+	<string name="cannot_buy_now">
+		Kan ikke k&#248;be nu:
+	</string>
+	<string name="not_for_sale">
+		Not for sale:
+	</string>
+	<string name="none_needed">
+		ikke n&#248;dvendigt
+	</string>
+	<string name="must_upgrade">
+		Din konto skal v&#230;re opgraderet for at eje jord.
+	</string>
+	<string name="cant_own_land">
+		Din konto kan eje jord.
+	</string>
+	<string name="land_holdings">
+		Du har [BUYER] kvadratmeter jord.
+	</string>
+	<string name="pay_to_for_land">
+		Betal L$ [AMOUNT] til [SELLER] for dette stykke jord
+	</string>
+	<string name="buy_for_US">
+		K&#248;b L$ [AMOUNT] for omkring US$ [AMOUNT2] ,
+	</string>
+	<string name="parcel_meters">
+		Dette parcel er  [AMOUNT] kvadratmeter.
+	</string>
+	<string name="premium_land">
+		Dette stykke jord er premium, og vil t&#230;lle som [AMOUNT] kvadratmeter.
+	</string>
+	<string name="discounted_land">
+		Dette stykke jord er p&#229; tilbud, og vil t&#230;lle som [AMOUNT] kvadratmeter.
+	</string>
+	<string name="meters_supports_object">
+		[AMOUNT] m2
+indeholder [AMOUNT2] objekter
+	</string>
+	<string name="sold_with_objects">
+		solgt med objekter
+	</string>
+	<string name="insufficient_land_credits">
+		Gruppen [GROUP] skal bruge nok tildelt jord brugs 
+kredit for at d&#230;kke dette parcel f&#248;r k&#248;bet vil blive 
+gennemf&#248;rt.
+	</string>
+	<string name="have_enough_lindens">
+		Du har L$ [AMOUNT], hvilket er nok til at k&#248;be denne jord.
+	</string>
+	<string name="not_enough_lindens">
+		Du har kun L$ [AMOUNT], og har brug for yderligere L$ [AMOUNT2].
+	</string>
+	<string name="balance_left">
+		Efter k&#248;bet, vil du have L$ [AMOUNT] tilbage.
+	</string>
+	<string name="balance_needed">
+		Du skal k&#248;be mindst L$ [AMOUNT] for at have r&#229;d til denne jord.
+	</string>
+	<string name="no_parcel_selected">
+		(intet parcel er valgt)
+	</string>
+	<string name="buy_currency">
+		K&#248;b L$ [LINDENS] for omkring US$ [USD]
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_buy_object.xml b/indra/newview/skins/default/xui/da/floater_buy_object.xml
new file mode 100644
index 0000000000..06f23d0d26
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_buy_object.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="contents" title="K&#248;b kopi af objekt">
+	<text name="contents_text">
+		og dets indhold:
+	</text>
+	<text name="buy_text">
+		K&#248;b for L$[AMOUNT] fra [NAME]?
+	</text>
+	<button label="Annuller" label_selected="Annuller" name="cancel_btn" />
+	<button label="K&#248;b" label_selected="K&#248;b" name="buy_btn" />
+	<string name="title_buy_text">
+		K&#248;b
+	</string>
+	<string name="title_buy_copy_text">
+		K&#248;b en kopi af
+	</string>
+	<string name="no_copy_text">
+		(kan ej kopieres)
+	</string>
+	<string name="no_modify_text">
+		(kan ej redigeres)
+	</string>
+	<string name="no_transfer_text">
+		(kan ikke videregives)
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_camera.xml b/indra/newview/skins/default/xui/da/floater_camera.xml
new file mode 100644
index 0000000000..9ce857f76a
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_camera.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="move floater" title="">
+	<string name="rotate_tooltip">
+		Roter kamera omkring fokus
+	</string>
+	<string name="zoom_tooltip">
+		Zoom kamera mod fokus
+	</string>
+	<string name="move_tooltip">
+		Flyt kamera op og ned, til venstre og h&#248;jre
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_choose_group.xml b/indra/newview/skins/default/xui/da/floater_choose_group.xml
new file mode 100644
index 0000000000..063db6c3d1
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_choose_group.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="groups" title="Grupper">
+	<text name="groupdesc">
+		Vælg en gruppe:
+	</text>
+	<button label="OK" label_selected="OK" name="OK" />
+	<button label="Annuller" label_selected="Cancel" name="Cancel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_color_picker.xml b/indra/newview/skins/default/xui/da/floater_color_picker.xml
new file mode 100644
index 0000000000..46b4d55aa5
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_color_picker.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="ColorPicker" title="Farve Vælger">
+	<text name="r_val_text">
+		Rød:
+	</text>
+	<text name="g_val_text">
+		Grøn:
+	</text>
+	<text name="b_val_text">
+		Blå:
+	</text>
+	<text name="h_val_text">
+		Farve:
+	</text>
+	<text name="s_val_text">
+		Mætning:
+	</text>
+	<text name="l_val_text">
+		Lysstyrke:
+	</text>
+	<check_box label="Anvend straks" name="apply_immediate" />
+	<button label="" label_selected="" name="color_pipette" />
+	<button label="Annuller" label_selected="Annuller" name="cancel_btn" />
+	<button label="Vælg" label_selected="Vælg" name="select_btn" />
+	<text name="Current color:">
+		Nuværende Farve:
+	</text>
+	<text name="(Drag below to save.)">
+		(Træk ned og gem.)
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_critical.xml b/indra/newview/skins/default/xui/da/floater_critical.xml
new file mode 100644
index 0000000000..e501130ade
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_critical.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container" title="">
+	<button label="Fortsæt" label_selected="Fortsæt" name="Continue" />
+	<button label="Annuller" label_selected="Annuller" name="Cancel" />
+	<text name="tos_heading">
+		Læs venligst den følgende besked grundigt.
+	</text>
+	<text_editor name="tos_text">
+		TOS_TEXT
+	</text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_customize.xml b/indra/newview/skins/default/xui/da/floater_customize.xml
new file mode 100644
index 0000000000..f9ad3d4bfa
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_customize.xml
@@ -0,0 +1,455 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater customize" title="Udseende">
+	<tab_container name="customize tab container">
+		<panel label="Krops Dele" name="body_parts_placeholder" />
+		<panel label="Figur" name="Shape">
+			<button label="Annuller" label_selected="Annuller" name="Revert" />
+			<button label="Krop" label_selected="Krop" name="Body" />
+			<button label="Hoved" label_selected="Hoved" name="Head" />
+			<button label="&#216;jne" label_selected="&#216;jne" name="Eyes" />
+			<button label="&#216;rer" label_selected="&#216;rer" name="Ears" />
+			<button label="N&#230;se" label_selected="N&#230;se" name="Nose" />
+			<button label="Mund" label_selected="Mund" name="Mouth" />
+			<button label="Kinder" label_selected="Kinder" name="Chin" />
+			<button label="Overkrop" label_selected="Overkrop" name="Torso" />
+			<button label="Ben" label_selected="Ben" name="Legs" />
+			<radio_group name="sex radio">
+				<radio_item type="string" length="1" name="radio">
+					Kvinde
+				</radio_item>
+				<radio_item type="string" length="1" name="radio2">
+					Mand
+				</radio_item>
+			</radio_group>
+			<button label="Tilf&#230;ldig" label_selected="Tilf&#230;ldig" name="Randomize" />
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: Kan ikke redigeres
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: indl&#230;ser...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: ikke b&#229;ret
+			</text>
+			<text type="string" length="1" name="path">
+				Fundet i [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Put on a new shape by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Du har ikke rettigheder til at redigere denne del.
+			</text>
+			<button label="Lav Ny Figur" label_selected="Lav Ny Figur" name="Create New" />
+			<button label="Aftag" label_selected="Aftag" name="Take Off" />
+			<button label="Gem" label_selected="Gem" name="Save" />
+			<button label="Gem Som" label_selected="Gem Som" name="Save As" />
+		</panel>
+		<panel label="Hud" name="Skin">
+			<button label="Hudfarve" label_selected="Hudfarve" name="Skin Color" />
+			<button label="Detaljer" label_selected="Detaljer" name="Face Detail" />
+			<button label="Sminke" label_selected="Sminke" name="Makeup" />
+			<button label="Krops Detaljer" label_selected="Krops Detaljer" name="Body Detail" />
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: Kan ikke redigeres
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: indl&#230;ser...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: ikke b&#229;ret
+			</text>
+			<text type="string" length="1" name="path">
+				Fundet i [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Put on a new skin by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Du har ikke rettigheder til at redigere denne del.
+			</text>
+			<texture_picker label="Hoved Tatoveringer" name="Hoved Tatoveringer" tool_tip="Click to choose a picture" />
+			<texture_picker label="&#216;vre Tatoveringer" name="&#216;vre Tatoveringer" tool_tip="Click to choose a picture" />
+			<texture_picker label="Nedre Tatoveringer" name="Nedre Tatoveringer" tool_tip="Click to choose a picture" />
+			<button label="Tilf&#230;ldig" label_selected="Tilf&#230;ldig" name="Randomize" />
+			<button label="Lav Ny Hud" label_selected="Lav Ny Hud" name="Create New" />
+			<button label="Aftag" label_selected="Aftag" name="Take Off" />
+			<button label="Gem" label_selected="Gem" name="Save" />
+			<button label="Gem Som" label_selected="Gem Som" name="Save As" />
+			<button label="Annuller" label_selected="Annuller" name="Revert" />
+		</panel>
+		<panel label="H&#229;r" name="Hair">
+			<button label="Farve" label_selected="Farve" name="Color" />
+			<button label="Stil" label_selected="Stil" name="Style" />
+			<button label="&#216;jenbryn" label_selected="&#216;jenbryn" name="Eyebrows" />
+			<button label="Sk&#230;g" label_selected="Sk&#230;g" name="Facial" />
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: Kan ikke redigeres
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: indl&#230;ser...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: ikke b&#229;ret
+			</text>
+			<text type="string" length="1" name="path">
+				Fundet i [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Put on a new hair by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Du har ikke rettigheder til at redigere denne del.
+			</text>
+			<texture_picker label="Tekstur" name="Tekstur" tool_tip="Klik for at v&#230;lge billede" />
+			<button label="Tilf&#230;ldig" label_selected="Tilf&#230;ldig" name="Randomize" />
+			<button label="Lav Nyt H&#229;r" label_selected="Lav Nyt H&#229;r" name="Create New" />
+			<button label="Aftag" label_selected="Aftag" name="Take Off" />
+			<button label="Gem" label_selected="Gem" name="Save" />
+			<button label="Gem Som" label_selected="Gem Som" name="Save As" />
+			<button label="Annuller" label_selected="Annuller" name="Revert" />
+		</panel>
+		<panel label="&#216;jne" name="Eyes">
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: Kan ikke redigeres
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: indl&#230;ser...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: ikke b&#229;ret
+			</text>
+			<text type="string" length="1" name="path">
+				Fundet i [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Put on a new eyes by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Du har ikke rettigheder til at redigere denne del.
+			</text>
+			<texture_picker label="Iris" name="Iris" tool_tip="Click to choose a picture" />
+			<button label="Tilf&#230;ldig" label_selected="Tilf&#230;ldig" name="Randomize" />
+			<button label="Lav Nye &#216;jne" label_selected="Lav Nye &#216;jne" name="Create New" />
+			<button label="Aftag" label_selected="Aftag" name="Take Off" />
+			<button label="Gem" label_selected="Gem" name="Save" />
+			<button label="Gem Som" label_selected="Gem Som" name="Save As" />
+			<button label="Annuller" label_selected="Annuller" name="Revert" />
+		</panel>
+		<panel label="T&#248;j" name="clothes_placeholder" />
+		<panel label="Tr&#248;je" name="Shirt">
+			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at v&#230;lge et billede" />
+			<color_swatch label="Farve" name="Farve" tool_tip="Klik her for at v&#230;lge farve" />
+			<button label="Lav Ny Tr&#248;je" label_selected="Lav Ny Tr&#248;je" name="Create New" />
+			<button label="Aftag" label_selected="Aftag" name="Take Off" />
+			<button label="Gem" label_selected="Gem" name="Save" />
+			<button label="Gem Som" label_selected="Gem Som" name="Save As" />
+			<button label="Annuller" label_selected="Annuller" name="Revert" />
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: Kan ikke redigeres
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: indl&#230;ser...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: ikke b&#229;ret
+			</text>
+			<text type="string" length="1" name="path">
+				Fundet i [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Put on a new shirt by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Du har ikke rettigheder til at redigere denne del.
+			</text>
+		</panel>
+		<panel label="Bukser" name="Pants">
+			<texture_picker label="Stof" name="Stof" tool_tip="Klik for at v&#230;lge et billede" />
+			<color_swatch label="Farve" name="Farve" tool_tip="Klik her for at v&#230;lge farve" />
+			<button label="Lav Nye Bukser" label_selected="Lav Nye Bukser" name="Create New" />
+			<button label="Aftag" label_selected="Aftag" name="Take Off" />
+			<button label="Gem" label_selected="Gem" name="Save" />
+			<button label="Gem Som" label_selected="Gem Som" name="Save As" />
+			<button label="Annuller" label_selected="Annuller" name="Revert" />
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: Kan ikke redigeres
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: indl&#230;ser...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: ikke b&#229;ret
+			</text>
+			<text type="string" length="1" name="path">
+				Fundet i [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Put on a new pants by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Du har ikke rettigheder til at redigere denne del.
+			</text>
+		</panel>
+		<panel label="Sko" name="Shoes">
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: Kan ikke redigeres
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: indl&#230;ser...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: ikke b&#229;ret
+			</text>
+			<text type="string" length="1" name="path">
+				Fundet i [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Put on a new shoes by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Du har ikke rettigheder til at redigere denne del.
+			</text>
+			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at v&#230;lge et billede" />
+			<color_swatch label="Farve" name="Farve" tool_tip="Klik her for at v&#230;lge farve" />
+			<button label="Lav Nye Sko" label_selected="Lav Nye Sko" name="Create New" />
+			<button label="Aftag" label_selected="Aftag" name="Take Off" />
+			<button label="Gem" label_selected="Gem" name="Save" />
+			<button label="Gem Som" label_selected="Gem Som" name="Save As" />
+			<button label="Annuller" label_selected="Annuller" name="Revert" />
+		</panel>
+		<panel label="Sokker" name="Socks">
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: Kan ikke redigeres
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: indl&#230;&#230;ser...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: ikke b&#229;ret
+			</text>
+			<text type="string" length="1" name="path">
+				Fundet i [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Put on a new socks by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Du har ikke rettigheder til at redigere denne del.
+			</text>
+			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at v&#230;lge et billede" />
+			<color_swatch label="Farve" name="Farve" tool_tip="Klik her for at v&#230;lge farve" />
+			<button label="Lav Nye Sokker" label_selected="Lav Nye Sokker" name="Create New" />
+			<button label="Aftag" label_selected="Aftag" name="Take Off" />
+			<button label="Gem" label_selected="Gem" name="Save" />
+			<button label="Gem Som" label_selected="Gem Som" name="Save As" />
+			<button label="Annuller" label_selected="Annuller" name="Revert" />
+		</panel>
+		<panel label="Jakke" name="Jacket">
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: Kan ikke redigeres
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: indl&#230;ser...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: ikke b&#229;ret
+			</text>
+			<text type="string" length="1" name="path">
+				Fundet i [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Put on a new jacket by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Du har ikke rettigheder til at redigere denne del.
+			</text>
+			<texture_picker label="&#216;vre Stof" name="&#216;vre Stof" tool_tip="Klik for at v&#230;lge et billede" />
+			<texture_picker label="Nedre Stof" name="Nedre Stof" tool_tip="Klik for at v&#230;lge et billede" />
+			<color_swatch label="Farve" name="Farve" tool_tip="Klik her for at v&#230;lge farve" />
+			<button label="Lav Ny Jakke" label_selected="Lav Ny Jakke" name="Create New" />
+			<button label="Aftag" label_selected="Aftag" name="Take Off" />
+			<button label="Gem" label_selected="Gem" name="Save" />
+			<button label="Gem Som" label_selected="Gem Som" name="Save As" />
+			<button label="Annuller" label_selected="Annuller" name="Revert" />
+		</panel>
+		<panel label="Handsker" name="Gloves">
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: Kan ikke redigeres
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: indl&#230;ser...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: ikke b&#229;ret
+			</text>
+			<text type="string" length="1" name="path">
+				Fundet i [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Put on a new gloves by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Du har ikke rettigheder til at redigere denne del.
+			</text>
+			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at v&#230;lge et billede" />
+			<color_swatch label="Farve" name="Farve" tool_tip="Klik her for at v&#230;lge farve" />
+			<button label="Lav Nye Handsker" label_selected="Create New Gloves" name="Create New" />
+			<button label="Aftag" label_selected="Aftag" name="Take Off" />
+			<button label="Gem" label_selected="Gem" name="Save" />
+			<button label="Gem Som" label_selected="Gem Som" name="Save As" />
+			<button label="Annuller" label_selected="Annuller" name="Revert" />
+		</panel>
+		<panel label="Undertr&#248;je" name="Undershirt">
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: Kan ikke redigeres
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: indl&#230;ser...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: ikke b&#229;ret
+			</text>
+			<text type="string" length="1" name="path">
+				Fundet i [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Put on a new undershirt by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Du har ikke rettigheder til at redigere denne del.
+			</text>
+			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at v&#230;lge et billede" />
+			<color_swatch label="Farve" name="Farve" tool_tip="Klik her for at v&#230;lge farve" />
+			<button label="Lav Ny Undertr&#248;je" label_selected="Lav Ny Undertr&#248;je"
+			     name="Create New" />
+			<button label="Aftag" label_selected="Aftag" name="Take Off" />
+			<button label="Gem" label_selected="Gem" name="Save" />
+			<button label="Gem Som" label_selected="Gem Som" name="Save As" />
+			<button label="Annuller" label_selected="Annuller" name="Revert" />
+		</panel>
+		<panel label="Underbukser" name="Underpants">
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: Kan ikke redigeres
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: indl&#230;ser...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: ikke b&#229;ret
+			</text>
+			<text type="string" length="1" name="path">
+				Fundet i [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Put on a new underpants by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Du har ikke rettigheder til at redigere denne del.
+			</text>
+			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at v&#230;lge et billede" />
+			<color_swatch label="Farve" name="Farve" tool_tip="Klik her for at v&#230;lge farve" />
+			<button label="Lav Nye Underbukser" label_selected="Lav Nye Underbukser"
+			     name="Create New" />
+			<button label="Aftag" label_selected="Aftag" name="Take Off" />
+			<button label="Gem" label_selected="Gem" name="Save" />
+			<button label="Gem Som" label_selected="Gem Som" name="Save As" />
+			<button label="Annuller" label_selected="Annuller" name="Revert" />
+		</panel>
+		<panel label="Nederdel" name="Skirt">
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: Kan ikke redigeres
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: indl&#230;ser...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: ikke b&#229;ret
+			</text>
+			<text type="string" length="1" name="path">
+				Fundet i [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Put on a new skirt by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Du har ikke rettigheder til at redigere denne del.
+			</text>
+			<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at v&#230;lge et billede" />
+			<color_swatch label="Farve" name="Farve" tool_tip="Klik her for at v&#230;lge farve" />
+			<button label="Lav Ny Nederdel" label_selected="Lav Ny Nederdel" name="Create New" />
+			<button label="Aftag" label_selected="Aftag" name="Take Off" />
+			<button label="Gem" label_selected="Gem" name="Save" />
+			<button label="Gem Som" label_selected="Gem Som" name="Save As" />
+			<button label="Annuller" label_selected="Annuller" name="Revert" />
+		</panel>
+	</tab_container>
+	<button label="Luk" label_selected="Luk" name="Close" />
+	<button label="Gem Alt" label_selected="Gem Alt" name="Save All" />
+	<button label="Lav S&#230;t" label_selected="Lav S&#230;t" name="Make Outfit" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/da/floater_day_cycle_options.xml
new file mode 100644
index 0000000000..a1f1f00252
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_day_cycle_options.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Dags Cyklus" title="Day Cycle Editor">
+	<tab_container name="Day Cycle Tabs">
+		<panel label="Day Cycle" name="Day Cycle">
+			<button label="?" name="WLDayCycleHelp" />
+			<multi_slider label="" name="WLTimeSlider" />
+			<multi_slider label="" name="WLDayCycleKeys" />
+			<text type="string" length="1" name="WL12am">
+				00:00
+			</text>
+			<text type="string" length="1" name="WL3am">
+				3:00
+			</text>
+			<text type="string" length="1" name="WL6am">
+				6:00
+			</text>
+			<text type="string" length="1" name="WL9amHash">
+				9:00
+			</text>
+			<text type="string" length="1" name="WL12pmHash">
+				12:00
+			</text>
+			<text type="string" length="1" name="WL3pm">
+				15:00
+			</text>
+			<text type="string" length="1" name="WL6pm">
+				18:00
+			</text>
+			<text type="string" length="1" name="WL9pm">
+				21:00
+			</text>
+			<text type="string" length="1" name="WL12am2">
+				00:00
+			</text>
+			<text type="string" length="1" name="WL12amHash">
+				|
+			</text>
+			<text type="string" length="1" name="WL3amHash">
+				I
+			</text>
+			<text type="string" length="1" name="WL6amHash">
+				|
+			</text>
+			<text type="string" length="1" name="WL9amHash2">
+				I
+			</text>
+			<text type="string" length="1" name="WL12pmHash2">
+				|
+			</text>
+			<text type="string" length="1" name="WL3pmHash">
+				I
+			</text>
+			<text type="string" length="1" name="WL6pmHash">
+				|
+			</text>
+			<text type="string" length="1" name="WL9pmHash">
+				I
+			</text>
+			<text type="string" length="1" name="WL12amHash2">
+				|
+			</text>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_device_settings.xml b/indra/newview/skins/default/xui/da/floater_device_settings.xml
new file mode 100644
index 0000000000..d683251030
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_device_settings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_device_settings" title="Stemme chat indstillinger" />
diff --git a/indra/newview/skins/default/xui/da/floater_inventory.xml b/indra/newview/skins/default/xui/da/floater_inventory.xml
new file mode 100644
index 0000000000..0c4db6c23d
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_inventory.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Beholdning" title="Inventory">
+	<search_editor label="Skriv her for at s&#248;ge" name="inventory search editor" />
+	<tab_container name="inventory filter tabs">
+		<inventory_panel label="Alting" name="All Items" />
+		<inventory_panel label="Nye Ting" name="Recent Items" />
+	</tab_container>
+	<menu_bar name="Inventory Menu">
+		<menu label="Filer" name="File">
+			<menu_item_call label="&#197;ben" name="Open" />
+			<menu_item_call label="Nyt Vindue" name="New Window" />
+			<menu_item_call label="Vis Filtre" name="Show Filters" />
+			<menu_item_call label="Nulstil Filtre" name="Reset Current" />
+			<menu_item_call label="Luk alle mapper" name="Close All Folders" />
+			<menu_item_call label="T&#248;m papirkurv" name="Empty Trash" />
+		</menu>
+		<menu label="Lav" name="Create">
+			<menu_item_call label="Ny Mappe" name="New Folder" />
+			<menu_item_call label="Ny Kode" name="New Script" />
+			<menu_item_call label="Ny Note" name="New Note" />
+			<menu_item_call label="Ny Hilsen" name="New Gesture" />
+			<menu name="Nyt T&#248;j">
+				<menu_item_call label="Ny Tr&#248;je" name="New Shirt" />
+				<menu_item_call label="Nye Bukser" name="New Pants" />
+				<menu_item_call label="Nye Sko" name="New Shoes" />
+				<menu_item_call label="Nye Sokker" name="New Socks" />
+				<menu_item_call label="Ny Jakke" name="New Jacket" />
+				<menu_item_call label="Ny Nederdel" name="New Skirt" />
+				<menu_item_call label="Nye Handsker" name="New Gloves" />
+				<menu_item_call label="Ny Undertr&#248;je" name="New Undershirt" />
+				<menu_item_call label="Nye Underbukser" name="New Underpants" />
+			</menu>
+			<menu name="Nye Krops Dele">
+				<menu_item_call label="Ny Figur" name="New Shape" />
+				<menu_item_call label="Ny Hud" name="New Skin" />
+				<menu_item_call label="Nyt H&#229;r" name="New Hair" />
+				<menu_item_call label="Nye &#216;jne" name="New Eyes" />
+			</menu>
+		</menu>
+		<menu label="Sorter" name="Sort">
+			<menu_item_check label="Efter Navn" name="By Name" />
+			<menu_item_check label="Efter Dato" name="By Date" />
+			<menu_item_check label="Altid Mapper Efter Navn" name="Folders Always By Name" />
+			<menu_item_check label="System Mapper i Toppen" name="System Folders To Top" />
+		</menu>
+	</menu_bar>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
new file mode 100644
index 0000000000..fdd8c2272e
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="item properties" title="Egenskaber for Objekt i Beholdning">
+	<text name="LabelItemNameTitle">
+		Navn:
+	</text>
+	<text name="LabelItemDescTitle">
+		Beskrivelse:
+	</text>
+	<text name="LabelCreatorTitle">
+		Skaber:
+	</text>
+	<text name="LabelCreatorName">
+		Nicole Linden
+	</text>
+	<button label="Profil..." label_selected="" name="BtnCreator" />
+	<text name="LabelOwnerTitle">
+		Ejer:
+	</text>
+	<text name="LabelOwnerName">
+		Thrax Linden
+	</text>
+	<button label="Profil..." label_selected="" name="BtnOwner" />
+	<text name="LabelAcquiredTitle">
+		Erhvervet:
+	</text>
+	<text name="LabelAcquiredDate">
+		Wed May 24 12:50:46 2006
+	</text>
+	<text name="OwnerLabel">
+		Du kan:
+	</text>
+	<check_box label="Redigere" name="CheckOwnerModify" />
+	<check_box label="Kopiere" name="CheckOwnerCopy" />
+	<check_box label="S&#230;lge/Give V&#230;k" name="CheckOwnerTransfer" />
+	<text name="BaseMaskDebug">
+		B:
+	</text>
+	<text name="OwnerMaskDebug">
+		O:
+	</text>
+	<text name="GroupMaskDebug">
+		G:
+	</text>
+	<text name="EveryoneMaskDebug">
+		E:
+	</text>
+	<text name="NextMaskDebug">
+		N:
+	</text>
+	<check_box label="Del med Gruppe" name="CheckShareWithGroup" />
+	<check_box label="Tillad alle at kopiere" name="CheckEveryoneCopy" />
+	<text name="NextOwnerLabel">
+		N&#230;ste ejer kan:
+	</text>
+	<check_box label="Redigere" name="CheckNextOwnerModify" />
+	<check_box label="Kopiere" name="CheckNextOwnerCopy" />
+	<check_box label="S&#230;lge/Give v&#230;k" name="CheckNextOwnerTransfer" />
+	<text name="SaleLabel">
+		Marker Ting:
+	</text>
+	<check_box label="Til Salg" name="CheckPurchase" />
+	<radio_group name="RadioSaleType">
+		<radio_item name="radio">
+			Original
+		</radio_item>
+		<radio_item name="radio2">
+			Kopi
+		</radio_item>
+	</radio_group>
+	<text name="TextPrice">
+		Pris:  L$
+	</text>
+	<string name="unknown">
+		(ukendt)
+	</string>
+	<string name="public">
+		(offentlig)
+	</string>
+	<string name="you_can">
+		Du kan:
+	</string>
+	<string name="owner_can">
+		Ejer kan:
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_joystick.xml b/indra/newview/skins/default/xui/da/floater_joystick.xml
new file mode 100644
index 0000000000..c9a7c29032
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_joystick.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Joystick" title="Joystick Configuration">
+	<check_box name="enable_joystick">
+		Aktiver Joystick:
+	</check_box>
+	<spinner label="X Axis Mapping" name="JoystickAxis1" />
+	<spinner label="Y Axis Mapping" name="JoystickAxis2" />
+	<spinner label="Z Axis Mapping" name="JoystickAxis0" />
+	<spinner label="Pitch Mapping" name="JoystickAxis4" />
+	<spinner label="Yaw Mapping" name="JoystickAxis5" />
+	<spinner label="Roll Mapping" name="JoystickAxis3" />
+	<spinner label="Zoom Mapping" name="JoystickAxis6" />
+	<check_box label="Direkte Zoom" name="ZoomDirect" />
+	<check_box label="3D Cursor" name="Cursor3D" />
+	<check_box label="Auto Level" name="AutoLeveling" />
+	<text type="string" length="1" name="Control Modes:">
+		Kontrol:
+	</text>
+	<check_box name="JoystickAvatarEnabled">
+		Figur
+	</check_box>
+	<check_box name="JoystickBuildEnabled">
+		Byg
+	</check_box>
+	<check_box name="JoystickFlycamEnabled">
+		Flyvekamera
+	</check_box>
+	<text name="XScale">
+		X Scale
+	</text>
+	<text name="YScale">
+		Y Scale
+	</text>
+	<text name="ZScale">
+		Z Scale
+	</text>
+	<text name="PitchScale">
+		Pitch Scale
+	</text>
+	<text name="YawScale">
+		Yaw Scale
+	</text>
+	<text name="RollScale">
+		Roll Scale
+	</text>
+	<text name="XDeadZone">
+		X Dead Zone
+	</text>
+	<text name="YDeadZone">
+		Y Dead Zone
+	</text>
+	<text name="ZDeadZone">
+		Z Dead Zone
+	</text>
+	<text name="PitchDeadZone">
+		Pitch Dead Zone
+	</text>
+	<text name="YawDeadZone">
+		Yaw Dead Zone
+	</text>
+	<text name="RollDeadZone">
+		Roll Dead Zone
+	</text>
+	<text name="Feathering">
+		Feathering
+	</text>
+	<slider label="" name="AvatarFeathering" />
+	<slider label="" name="BuildFeathering" />
+	<slider label="" name="FlycamFeathering" />
+	<text name="ZoomScale2">
+		Zoom Scale
+	</text>
+	<spinner label="" name="FlycamAxisScale6" />
+	<text name="ZoomDeadZone">
+		Zoom Dead Zone
+	</text>
+	<spinner label="" name="FlycamAxisDeadZone6" />
+	<button label="SpaceNavigator Defaults" name="SpaceNavigatorDefaults" />
+	<string name="JoystickMonitor">
+		Joystick Overvågning
+	</string>
+	<string name="Axis">
+		Axis [NUM]
+	</string>
+	<string name="NoDevice">
+		intet joystick fundet
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_lagmeter.xml b/indra/newview/skins/default/xui/da/floater_lagmeter.xml
new file mode 100644
index 0000000000..91acaff45f
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_lagmeter.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_lagmeter" title="Lag Meter">
+	<button label="" label_selected="" name="client_lagmeter" tool_tip="Klient lag status" />
+	<text name="client">
+		Klient
+	</text>
+	<text name="client_text">
+		Normal
+	</text>
+	<button label="" label_selected="" name="network_lagmeter"
+	     tool_tip="Netværks lag status" />
+	<text name="network">
+		Netværk:
+	</text>
+	<text name="network_text">
+		Normal
+	</text>
+	<button label="" label_selected="" name="server_lagmeter" tool_tip="Server lag status" />
+	<text name="server">
+		Server:
+	</text>
+	<text name="server_text">
+		Normal
+	</text>
+	<button label="?" name="server_help" />
+	<button label="&gt;&gt;" name="minimize" />
+	<string name="max_title_msg">
+		Lag Meter
+	</string>
+	<string name="max_width_px">
+		360
+	</string>
+	<string name="min_title_msg">
+		Lag
+	</string>
+	<string name="min_width_px">
+		90
+	</string>
+	<string name="client_text_msg">
+		Klient
+	</string>
+	<string name="client_frame_rate_critical_fps">
+		10
+	</string>
+	<string name="client_frame_rate_warning_fps">
+		15
+	</string>
+	<string name="client_frame_time_window_bg_msg">
+		Normal, vindue i baggrund
+	</string>
+	<string name="client_frame_time_critical_msg">
+		Klient frame rate er under [CLIENT_FRAME_RATE_CRITICAL]
+	</string>
+	<string name="client_frame_time_warning_msg">
+		Klient frame rate er mellem [CLIENT_FRAME_RATE_CRITICAL] og [CLIENT_FRAME_RATE_WARNING]
+	</string>
+	<string name="client_frame_time_normal_msg">
+		Normal
+	</string>
+	<string name="client_draw_distance_cause_msg">
+		Kan skyldes: Visuel afstand sat for høj
+	</string>
+	<string name="client_texture_loading_cause_msg">
+		Kan skyldes: Billede indlæses
+	</string>
+	<string name="client_texture_memory_cause_msg">
+		Kan skyldes: For mange billeder i hukommelse
+	</string>
+	<string name="client_complex_objects_cause_msg">
+		Kan skyldes: Alt for mange komplekse objekter i scene
+	</string>
+	<string name="network_text_msg">
+		Netværk
+	</string>
+	<string name="network_packet_loss_critical_pct">
+		10
+	</string>
+	<string name="network_packet_loss_warning_pct">
+		5
+	</string>
+	<string name="network_packet_loss_critical_msg">
+		Forbindelsen mister over [NETWORK_PACKET_LOSS_CRITICAL]% pakker
+	</string>
+	<string name="network_packet_loss_warning_msg">
+		Forbindelsen mister [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% pakker
+	</string>
+	<string name="network_performance_normal_msg">
+		Normal
+	</string>
+	<string name="network_ping_critical_ms">
+		600
+	</string>
+	<string name="network_ping_warning_ms">
+		300
+	</string>
+	<string name="network_ping_critical_msg">
+		Forbindelsens ping tider er over [NETWORK_PING_CRITICAL] ms
+	</string>
+	<string name="network_ping_warning_msg">
+		Forbindelsens ping tider er [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
+	</string>
+	<string name="network_packet_loss_cause_msg">
+		Muligvis dårlig forbindelse eller &apos;Båndbredde&apos; grafik sat for højt.
+	</string>
+	<string name="network_ping_cause_msg">
+		Muligvis dårlig forbindelse eller fil delings program.
+	</string>
+	<string name="server_text_msg">
+		Server
+	</string>
+	<string name="server_frame_rate_critical_fps">
+		20
+	</string>
+	<string name="server_frame_rate_warning_fps">
+		30
+	</string>
+	<string name="server_single_process_max_time_ms">
+		20
+	</string>
+	<string name="server_frame_time_critical_msg">
+		Simulator framerate er under [SERVER_FRAME_RATE_CRITICAL]
+	</string>
+	<string name="server_frame_time_warning_msg">
+		Simulator framerate er mellem [SERVER_FRAME_RATE_CRITICAL] og [SERVER_FRAME_RATE_WARNING]
+	</string>
+	<string name="server_frame_time_normal_msg">
+		Normal
+	</string>
+	<string name="server_physics_cause_msg">
+		Kan skyldes: For mange fysiske objekter
+	</string>
+	<string name="server_scripts_cause_msg">
+		Kan skyldes: For mange kodede objekter
+	</string>
+	<string name="server_net_cause_msg">
+		Kan skyldes: For meget netværks traffik
+	</string>
+	<string name="server_agent_cause_msg">
+		Kan skyldes: For mange omvandrende folk i regionen
+	</string>
+	<string name="server_images_cause_msg">
+		Kan skyldes: For mange billed udregninger
+	</string>
+	<string name="server_generic_cause_msg">
+		Kan skyldes: Simulator belastning for tung
+	</string>
+	<string name="smaller_label">
+		&gt;&gt;
+	</string>
+	<string name="bigger_label">
+		&lt;&lt;
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_land_holdings.xml b/indra/newview/skins/default/xui/da/floater_land_holdings.xml
new file mode 100644
index 0000000000..4b5bee1b68
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_land_holdings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="land holdings floater" title="Mit Land">
+	<scroll_list name="parcel list">
+		<column label="Navn" name="name" />
+		<column label="Lokation" name="location" />
+		<column label="Område" name="area" />
+		<column label="" name="hidden" />
+	</scroll_list>
+	<button label="Teleporter" label_selected="Teleporter" name="Teleport"
+	     tool_tip="Teleporter til midten af dette land." />
+	<button label="Vis på kort" label_selected="Vis på kort" name="Show on Map"
+	     tool_tip="Vis dette land på verdenskortet." />
+	<text name="contrib_label">
+		Bidrag til dine grupper:
+	</text>
+	<scroll_list name="grant list">
+		<column label="Gruppe" name="group" />
+		<column label="Område" name="area" />
+	</scroll_list>
+	<text name="allowed_label">
+		Tilladt land ifølge nuværende betalingsaftale:
+	</text>
+	<text name="allowed_text">
+		[AREA] m2
+	</text>
+	<text name="current_label">
+		Current land holdings:
+	</text>
+	<text name="current_text">
+		[AREA] m2
+	</text>
+	<text name="available_label">
+		Antal m2 der kan købes:
+	</text>
+	<text name="available_text">
+		[AREA] m2
+	</text>
+	<string name="area_string">
+		[AREA] m2
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml
new file mode 100644
index 0000000000..2f47f2be8b
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script ed float" title="Kode: Ny Kode">
+	<button label="Nulstil" label_selected="Nulstil" name="Reset"/>
+	<check_box label="Kører" name="running"/>
+	<check_box label="Mono" name="mono"/>
+	<string name="not_allowed">
+		Du har ikke tilladelse til at se denne kode.
+	</string>
+	<string name="script_running">
+		Kører
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
new file mode 100644
index 0000000000..511c43ebd8
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script ed float" title="LSL Wiki">
+	<check_box label="Følg Markøreren" name="lock_check" />
+	<combo_box label="Lås" name="history_combo" />
+	<button label="Tilbage" name="back_btn" />
+	<button label="Frem" name="fwd_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_media_browser.xml b/indra/newview/skins/default/xui/da/floater_media_browser.xml
new file mode 100644
index 0000000000..4267bbca76
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_media_browser.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_about" title="Medie Vælger">
+	<layout_stack name="stack1">
+		<layout_panel name="nav_controls">
+			<button label="Tilbage" name="back" />
+			<button label="Frem" name="forward" />
+			<button label="Opdater" name="reload" />
+			<button label="Gå til" name="go" />
+		</layout_panel>
+		<layout_panel name="parcel_owner_controls">
+			<button label="Send nuværende URL til Parcel" name="assign" />
+		</layout_panel>
+		<layout_panel name="external_controls">
+			<button label="Åben i min browser" name="open_browser" />
+			<check_box label="Åben altid i min browser" name="open_always" />
+			<button label="Luk" name="close" />
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_moveview.xml b/indra/newview/skins/default/xui/da/floater_moveview.xml
new file mode 100644
index 0000000000..dd966efefd
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_moveview.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="move floater" title="">
+	<button label="" label_selected="" name="turn left btn" tool_tip="Drej til venstre" />
+	<button label="" label_selected="" name="turn right btn" tool_tip="Drej til højre" />
+	<button label="" label_selected="" name="move up btn" tool_tip="Hop eller flyv op" />
+	<button label="" label_selected="" name="move down btn" tool_tip="Duk eller flyv ned" />
+	<joystick_slide name="slide left btn" tool_tip="Gå til venstre" />
+	<joystick_slide name="slide right btn" tool_tip="Gå til højre" />
+	<joystick_turn name="forward btn" tool_tip="Gå fremad" />
+	<joystick_turn name="backward btn" tool_tip="Gå bagud" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_mute_object.xml b/indra/newview/skins/default/xui/da/floater_mute_object.xml
new file mode 100644
index 0000000000..38565d0d4a
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_mute_object.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="mute by name" title="Bloker Objekt via navn">
+	<text name="message">
+		Blokering via navn har ikke betydning for lyde.
+		Du skal skrive det præcise navn på objektet.
+	</text>
+	<line_editor name="object_name">
+		Objekt Navn
+	</line_editor>
+	<button label="Ok" name="OK" />
+	<button label="Annuller" name="Cancel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_my_friends.xml b/indra/newview/skins/default/xui/da/floater_my_friends.xml
new file mode 100644
index 0000000000..53aa90c976
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_my_friends.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_my_friends" title="Kontakter">
+	<tab_container name="friends_and_groups">
+		<panel label="Venner" name="friends_panel" />
+		<panel label="Grupper" name="groups_panel" />
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_openobject.xml b/indra/newview/skins/default/xui/da/floater_openobject.xml
new file mode 100644
index 0000000000..b6b8ec3efb
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_openobject.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="objectcontents" title="Objekt Indhold">
+	<text type="string" length="1" name="object_name">
+		[DESC]:
+	</text>
+	<button label="Kopier til Beholdning" label_selected="Kopier til Beholdning"
+	     name="copy_to_inventory_button" />
+	<button label="Kopier og tag på" label_selected="Kopier og tag på"
+	     name="copy_and_wear_button" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_pay.xml b/indra/newview/skins/default/xui/da/floater_pay.xml
new file mode 100644
index 0000000000..3a9d350227
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_pay.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Give Money" title="">
+	<button label="L$1" label_selected="L$1" name="fastpay 1" />
+	<button label="L$5" label_selected="L$5" name="fastpay 5" />
+	<button label="L$10" label_selected="L$10" name="fastpay 10" />
+	<button label="L$20" label_selected="L$20" name="fastpay 20" />
+	<button label="Betal" label_selected="Betal" name="pay btn" />
+	<button label="Annuller" label_selected="Annuller" name="cancel btn" />
+	<text type="string" length="1" name="payee_label">
+		Betal Beboer:
+	</text>
+	<text type="string" length="1" name="payee_name">
+		[FIRST] [LAST]
+	</text>
+	<text type="string" length="1" name="fastpay text">
+		Hurtig Betal:
+	</text>
+	<text type="string" length="1" name="amount text">
+		Beløb:
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_pay_object.xml b/indra/newview/skins/default/xui/da/floater_pay_object.xml
new file mode 100644
index 0000000000..2327202551
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_pay_object.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Give Money" title="">
+	<text type="string" length="1" name="payee_group">
+		Betal Gruppe:
+	</text>
+	<text type="string" length="1" name="payee_resident">
+		Betal Beboer:
+	</text>
+	<text type="string" length="1" name="payee_name">
+		[FIRST] [LAST]
+	</text>
+	<text type="string" length="1" name="object_name_label">
+		Via Objekt:
+	</text>
+	<text type="string" length="1" name="object_name_text">
+		...
+	</text>
+	<text type="string" length="1" name="fastpay text">
+		Hurtig Betal:
+	</text>
+	<text type="string" length="1" name="amount text">
+		Beløb:
+	</text>
+	<button label="L$1" label_selected="L$1" name="fastpay 1" />
+	<button label="L$5" label_selected="L$5" name="fastpay 5" />
+	<button label="L$10" label_selected="L$10" name="fastpay 10" />
+	<button label="L$20" label_selected="L$20" name="fastpay 20" />
+	<button label="Betal" label_selected="Betal" name="pay btn" />
+	<button label="Annuller" label_selected="Annuller" name="cancel btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_postcard.xml b/indra/newview/skins/default/xui/da/floater_postcard.xml
new file mode 100644
index 0000000000..87a801ea02
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_postcard.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Postcard" title="E-mail Billede">
+	<text name="to_label">
+		Modtager&apos;s E-mail:
+	</text>
+	<text name="from_label">
+		Din E-mail:
+	</text>
+	<text name="name_label">
+		Dit navn:
+	</text>
+	<text name="subject_label">
+		Emne:
+	</text>
+	<line_editor label="Skriv dit emne her." name="subject_form"/>
+	<text name="msg_label">
+		Besked:
+	</text>
+	<text_editor name="msg_form">
+		Skriv din besked her.
+	</text_editor>
+	<text name="fine_print">
+		Hvis din modtager opretter en konto i SL, vil du få en henvisnings bonus.
+	</text>
+	<button label="Annuller" name="cancel_btn"/>
+	<button label="Send" name="send_btn"/>
+	<string name="default_subject">
+		Postkort fra Second Life.
+	</string>
+	<string name="default_message">
+		Tjek det her ud!
+	</string>
+	<string name="upload_message">
+		&quot;Sender...&quot;
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_preferences.xml b/indra/newview/skins/default/xui/da/floater_preferences.xml
new file mode 100644
index 0000000000..b071f3eabc
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_preferences.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Preferences" title="Preferences">
+	<button label="OK" label_selected="OK" name="OK" />
+	<button label="Annuller" label_selected="Annuller" name="Cancel" />
+	<button label="Anvend" label_selected="Anvend" name="Apply" />
+	<button label="Om" label_selected="Om" name="About..." />
+	<button label="Hj&#230;lp" label_selected="Hj&#230;lp" name="Help" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_animation.xml b/indra/newview/skins/default/xui/da/floater_preview_animation.xml
new file mode 100644
index 0000000000..f31d989131
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_preview_animation.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview_anim">
+	<text type="string" length="1" name="desc txt">
+		Beskrivelse:
+	</text>
+	<button label="Afspil i Verden" label_selected="Stop" name="Anim play btn"
+	     tool_tip="Afspil denne animation s&#229; andre kan se den." />
+	<button label="Afspil Lokalt" label_selected="Stop" name="Anim audition btn"
+	     tool_tip="Afspil denne animation s&#229; kun du kan se den." />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_classified.xml b/indra/newview/skins/default/xui/da/floater_preview_classified.xml
new file mode 100644
index 0000000000..626f9ac709
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_preview_classified.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="classified_preview" title="Annonce Information" />
diff --git a/indra/newview/skins/default/xui/da/floater_preview_event.xml b/indra/newview/skins/default/xui/da/floater_preview_event.xml
new file mode 100644
index 0000000000..2d48c66584
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_preview_event.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="event_preview" title="Begivenheds Information" />
diff --git a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
new file mode 100644
index 0000000000..e53b8faa90
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="gesture_preview">
+	<string name="stop_txt">
+		Stop
+	</string>
+	<string name="preview_txt">
+		Fremvis
+	</string>
+	<string name="none_text">
+		-- Intet --
+	</string>
+	<text name="desc_label">
+		Beskrivelse:
+	</text>
+	<text name="trigger_label">
+		Udløser:
+	</text>
+	<text name="replace_text"
+	     tool_tip="Udskift udløser ordet/ordene med dette/disse ord. Eksempelvis, udløser &apos;hallo&apos; udskift med &apos;hejsa&apos; vil ændre &apos;Jeg ville bare sige hallo &apos; ud med &apos;Jeg ville bare sig hejsa&apos; samt afspille hilsenen!">
+		Udskift med:
+	</text>
+	<line_editor name="replace_editor"
+	     tool_tip="Udskift udløser ordet/ordene med dette/disse ord. Eksempelvis, udløser &apos;hallo&apos; udskift med &apos;hejsa&apos; vil ændre &apos;Jeg ville bare sige hallo &apos; ud med &apos;Jeg ville bare sig hejsa&apos; samt afspille hilsenen!" />
+	<text name="key_label">
+		Genvejs Tast:
+	</text>
+	<combo_box label="None" name="modifier_combo" />
+	<combo_box label="None" name="key_combo" />
+	<text name="library_label">
+		Type:
+	</text>
+	<text name="steps_label">
+		Trin:
+	</text>
+	<button label="Tilføj &gt;&gt;" name="add_btn" />
+	<button label="Flyt op" name="up_btn" />
+	<button label="Flyt ned" name="down_btn" />
+	<button label="Fjern" name="delete_btn" />
+	<text name="help_label">
+		Alle trin vil ske samtidigt,
+medmindre du tilføjer vente trin.
+	</text>
+	<radio_group name="animation_trigger_type">
+		<radio_item name="start">
+			Start
+		</radio_item>
+		<radio_item name="stop">
+			Stop
+		</radio_item>
+	</radio_group>
+	<check_box label="Indtil animation er færdig" name="wait_anim_check" />
+	<check_box label="Tid i sekunder" name="wait_time_check" />
+	<check_box label="Aktiv" name="active_check"
+	     tool_tip="Aktiv hilsener kan blive udløst ved chat, deres sætninger eller ved at trykke på deres hot keys. Hilsener bliver normalt inaktive, når der er en genvejstast konflikt.." />
+	<button label="Fremvis" name="preview_btn" />
+	<button label="Gem" name="save_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
new file mode 100644
index 0000000000..3855e053b3
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview notecard" title="Note:">
+	<button label="Gem" label_selected="Gem" name="Save" />
+	<text type="string" length="1" name="desc txt">
+		Beskrivelse:
+	</text>
+	<text_editor type="string" length="1" name="Notecard Editor">
+		Indl&#230;ser...
+	</text_editor>
+	<string name="no_object">
+		Ikke i stand til at finde objekt med denne note.
+	</string>
+	<string name="not_allowed">
+		Du har ikke tilladelse til at l&#230;se denne note.
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_sound.xml b/indra/newview/skins/default/xui/da/floater_preview_sound.xml
new file mode 100644
index 0000000000..1caca9785f
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_preview_sound.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview_sound">
+	<text type="string" length="1" name="desc txt">
+		Beskrivelse:
+	</text>
+	<button label="Afspil Lokalt" label_selected="Afspil Lokalt" name="Sound audition btn"
+	     tool_tip="Afspil denne lyd så kun du kan høre den." />
+	<button label="Afspil i verden" label_selected="Afspil i verden" name="Sound play btn"
+	     tool_tip="Afspil denne lyd så alle kan høre den." />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_texture.xml b/indra/newview/skins/default/xui/da/floater_preview_texture.xml
new file mode 100644
index 0000000000..bb1ce77182
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_preview_texture.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview_texture">
+	<text type="string" length="1" name="desc txt">
+		Beskrivelse:
+	</text>
+	<text type="string" length="1" name="dimensions">
+		Størrelse: [WIDTH] x [HEIGHT] pixels
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_report_abuse.xml b/indra/newview/skins/default/xui/da/floater_report_abuse.xml
new file mode 100644
index 0000000000..81ee5dc923
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_report_abuse.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_report_abuse" title="Rapporter Misbrug">
+	<texture_picker label="" name="screenshot"/>
+	<check_box label="Inkluder Billede" name="screen_check"/>
+	<text name="reporter_title">
+		Anmelder:
+	</text>
+	<text name="reporter_field">
+		Loremipsum Dolorsitamut
+	</text>
+	<text name="sim_title">
+		Region:
+	</text>
+	<text name="sim_field">
+		Region Navn
+	</text>
+	<text name="pos_title">
+		Position:
+	</text>
+	<text name="pos_field">
+		{128.1, 128.1, 15.4}
+	</text>
+	<text name="select_object_label">
+		Klik på knappen derefter objektet:
+	</text>
+	<button label="" label_selected="" name="pick_btn" tool_tip="Objekt Vælger - Identificer et objekt denne rapport omhandler"/>
+	<text name="object_name_label">
+		Navn:
+	</text>
+	<text name="object_name">
+		Consetetur Sadipscing
+	</text>
+	<text name="owner_name_label">
+		Ejer:
+	</text>
+	<text name="owner_name">
+		Hendrerit Vulputate
+	</text>
+	<combo_box name="category_combo" tool_tip="Kategori -- Vælg en kategori der passer bedst på denne rapport">
+		<combo_item name="Select_category">
+			Vælg kategori
+		</combo_item>
+		<combo_item name="Age__Age_play">
+			Alder &gt; Falsk alder
+		</combo_item>
+		<combo_item name="Age__Adult_resident_on_Teen_Second_Life">
+			Alder &gt; Voksen Beboer på Teen Second Life
+		</combo_item>
+		<combo_item name="Age__Underage_resident_on_Adult_Second_Life">
+			Alder &gt; Mindreårig beboer på Voksent Second Life
+		</combo_item>
+		<combo_item name="Assault__Combat_sandbox___unsafe_area">
+			Angreb &gt; Kamp Sandkasse / Usikkert Område
+		</combo_item>
+		<combo_item name="Assault__Safe_area">
+			Angreb &gt; Sikkert Område
+		</combo_item>
+		<combo_item name="Assault__Weapons_testing_sandbox">
+			Angreb &gt; Våben testning i sandkasse
+		</combo_item>
+		<combo_item name="Commerce__Failure_to_deliver_product_or_service">
+			Salg/Service &gt; Ikke muligt at levere produkt eller service
+		</combo_item>
+		<combo_item name="Disclosure__Real_world_information">
+			Oplysning &gt; Virkelig verdens information
+		</combo_item>
+		<combo_item name="Disclosure__Remotely_monitoring chat">
+			Oplysning &gt; Fjern aflytning chat
+		</combo_item>
+		<combo_item name="Disclosure__Second_Life_information_chat_IMs">
+			Oplysning &gt; Second Life information/chat/PB&apos;er
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
+			Forstyrrelse af fred &gt; Unfair brug af region ressourcer
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
+			Forstyrrelse af fred &gt; Overdreven brug af kodede objekter
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Object_littering">
+			Forstyrrelse af fred &gt; Object littering
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Repetitive_spam">
+			Forstyrring af fred &gt; Gentagen spam
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
+			Forstyrrelse af fred &gt; Uønsket reklame spam
+		</combo_item>
+		<combo_item name="Fraud__L$">
+			Bedrageri &gt; L$
+		</combo_item>
+		<combo_item name="Fraud__Land">
+			Bedrageri &gt; Land
+		</combo_item>
+		<combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
+			Bedrageri &gt; Pyramide spil eller kædebreve
+		</combo_item>
+		<combo_item name="Fraud__US$">
+			Bedrageri &gt; US$
+		</combo_item>
+		<combo_item name="Harassment__Advert_farms___visual_spam">
+			Chikane &gt; reklame farm / billedeligt spam
+		</combo_item>
+		<combo_item name="Harassment__Defaming_individuals_or_groups">
+			Chikane &gt; Injurier enkeltpersoner eller grupper
+		</combo_item>
+		<combo_item name="Harassment__Impeding_movement">
+			Chikane &gt; Besværliggør bevægelse
+		</combo_item>
+		<combo_item name="Harassment__Sexual_harassment">
+			Chikane &gt; Sex chikane
+		</combo_item>
+		<combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
+			Chikane &gt; Opfordrer/Kræver at andre overtræder DAB
+		</combo_item>
+		<combo_item name="Harassment__Verbal_abuse">
+			Chikane &gt; Verbalt misbrug
+		</combo_item>
+		<combo_item name="Indecency__Broadly_offensive_content_or_conduct">
+			Uanstændig &gt; Meget stødende indhold eller adfærd
+		</combo_item>
+		<combo_item name="Indecency__Broadly_visible_mature_content">
+			Uanstændigt &gt; Meget synligt voksent indhold
+		</combo_item>
+		<combo_item name="Indecency__Inappropriate_avatar_name">
+			Uanstændigt &gt; Upassende figur navn
+		</combo_item>
+		<combo_item name="Indecency__Mature_content_in_PG_region">
+			Uanstændigt &gt; Voksent indhold i PG region
+		</combo_item>
+		<combo_item name="Intellectual_property_infringement_Content_Removal">
+			Krænkelse af intellektuelle ejendomsrettigheder &gt; Indholds fjernelse
+		</combo_item>
+		<combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
+			Krænkelse af intellektuelle ejendomsrettigheder &gt; CopyBot or Rettigheds Udnyttelse
+		</combo_item>
+		<combo_item name="Intolerance">
+			Intolerance
+		</combo_item>
+		<combo_item name="Land__Abuse_of_sandbox_resources">
+			Land &gt; Misbrug af Sandkasse resourcer
+		</combo_item>
+		<combo_item name="Land__Encroachment__Objects_textures">
+			Land &gt; Indgreb &gt; Objekter/teksturer
+		</combo_item>
+		<combo_item name="Land__Encroachment__Particles">
+			Land &gt; Indgreb &gt; Partikler
+		</combo_item>
+		<combo_item name="Land__Encroachment__Trees_plants">
+			Land &gt; Indgreb &gt; Træer/Planter
+		</combo_item>
+		<combo_item name="Wagering_gambling">
+			Væddemål/gambling
+		</combo_item>
+		<combo_item name="Other">
+			Andet
+		</combo_item>
+	</combo_box>
+	<text name="abuser_name_title">
+		Udøvers Navn:
+	</text>
+	<button label="Vælg Beboer" label_selected="" name="select_abuser" tool_tip="Vælg navnet på udøveren fra denne liste"/>
+	<check_box label="Kender ikke misbrugers navn" name="omit_abuser_name" tool_tip="Afkryds hvis du ikke er i stand til at give misbrugerens navn"/>
+	<text name="abuser_name_title2">
+		Sted for Overfaldet:
+	</text>
+	<text name="sum_title">
+		Opsummering:
+	</text>
+	<text name="dscr_title">
+		Detaljer:
+	</text>
+	<text name="bug_aviso">
+		Vær venligst præcis omkring dato, sted, overfaldets natur, relevant chat/PB og vælg objekt hvis muligt.
+	</text>
+	<text name="incomplete_title">
+		Note: Ufuldstændige rapportet vil ikke blive undersøgt.
+	</text>
+	<button label="Annuller" label_selected="Annuller" name="cancel_btn"/>
+	<button label="Rapporter Misbrug" label_selected="Rapporter Misbrug" name="send_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_script_debug.xml b/indra/newview/skins/default/xui/da/floater_script_debug.xml
new file mode 100644
index 0000000000..33e8022efb
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_script_debug.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater name="script debug floater" title="Kodnings Advarsel/Fejl">
+	<tab_container name="Preview Tabs">
+		<floater label="Kode" name="all_scripts" title="[All scripts]" />
+	</tab_container>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/da/floater_script_preview.xml b/indra/newview/skins/default/xui/da/floater_script_preview.xml
new file mode 100644
index 0000000000..e779ebf4f0
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_script_preview.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview lsl text" title="Kode: Rotations Kode">
+	<text type="string" length="1" name="desc txt">
+		Beskrivelse:
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_script_queue.xml b/indra/newview/skins/default/xui/da/floater_script_queue.xml
new file mode 100644
index 0000000000..b551d8d023
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_script_queue.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="queue" title="Reset Progress">
+	<button label="Luk" label_selected="Luk" name="close" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_script_search.xml b/indra/newview/skins/default/xui/da/floater_script_search.xml
new file mode 100644
index 0000000000..0eb1a850e3
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_script_search.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script search" title="Kode Søgning">
+	<check_box label="Små bogstaver" name="case_text" />
+	<button label="Søg" label_selected="Søg" name="search_btn" />
+	<button label="Erstat" label_selected="Erstat" name="replace_btn" />
+	<button label="Erstat Alle" label_selected="Erstat Alle" name="replace_all_btn" />
+	<text type="string" length="1" name="txt">
+		Søg
+	</text>
+	<text type="string" length="1" name="txt2">
+		Erstat
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_select_key.xml b/indra/newview/skins/default/xui/da/floater_select_key.xml
new file mode 100644
index 0000000000..c2e7e1966f
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_select_key.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container" title="">
+	<button label="Annuller" label_selected="Annuller" name="Cancel" />
+	<text type="string" length="1" name="Save item as:">
+		Tryk på en tast for at vælge
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_sell_land.xml b/indra/newview/skins/default/xui/da/floater_sell_land.xml
new file mode 100644
index 0000000000..7dbd2eb20c
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_sell_land.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="sell land" title="Sælg Land">
+	<text name="info_parcel_label">
+		Parcel:
+	</text>
+	<text name="info_parcel">
+		PARCEL NAME
+	</text>
+	<text name="info_size_label">
+		Størrelse:
+	</text>
+	<text name="info_size">
+		[AREA] m2
+	</text>
+	<text name="info_action">
+		Sælg dette parcel:
+	</text>
+	<text name="price_label">
+		Sæt en pris:
+	</text>
+	<text name="price_text">
+		Vælg en fornuftig pris for jorden.
+	</text>
+	<text name="price_ld">
+		L$
+	</text>
+	<text name="price_per_m">
+		(L$[PER_METER] pr. kvadratmeter)
+	</text>
+	<text name="sell_to_label">
+		Sælg denne jord til:
+	</text>
+	<text name="sell_to_text">
+		Vælg om du vil sælge til hvem som helst eller en specifik køber.
+	</text>
+	<combo_box name="sell_to">
+		<combo_item name="--selectone--">
+			-- Vælg --
+		</combo_item>
+		<combo_item name="Anyone">
+			Alle
+		</combo_item>
+		<combo_item name="Specificuser:">
+			Specifik Beboer:
+		</combo_item>
+	</combo_box>
+	<button label="Vælg..." name="sell_to_select_agent" />
+	<text name="sell_objects_label">
+		Sælg objekter sammen med jorden?
+	</text>
+	<text name="sell_objects_text">
+		Jord Ejer&apos;s objekter der kan videregives sælges med jorden.
+	</text>
+	<radio_group name="sell_objects">
+		<radio_item name="no">
+			Nej, behold ejerskab over objekterne
+		</radio_item>
+		<radio_item name="yes">
+			Ja, sælg dem med jorden
+		</radio_item>
+	</radio_group>
+	<button label="Show Objects" name="show_objects" />
+	<text name="nag_message_label">
+		HUSK: Alle salg er endegyldige.
+	</text>
+	<button label="Sæt land til salg" name="sell_btn" />
+	<button label="Annuller" name="cancel_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_settings_debug.xml b/indra/newview/skins/default/xui/da/floater_settings_debug.xml
new file mode 100644
index 0000000000..86c817f5f2
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_settings_debug.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="settings_debug" title="Fejlret Indstillinger">
+	<combo_box name="boolean_combo">
+		<combo_item name="TRUE">
+			TRUE
+		</combo_item>
+		<combo_item name="FALSE">
+			FALSE
+		</combo_item>
+	</combo_box>
+	<color_swatch label="Farve" name="color_swatch" />
+	<spinner label="x" name="val_spinner_1" />
+	<spinner label="x" name="val_spinner_2" />
+	<spinner label="x" name="val_spinner_3" />
+	<spinner label="x" name="val_spinner_4" />
+	<button label="Nulstil til standard" name="default_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_snapshot.xml b/indra/newview/skins/default/xui/da/floater_snapshot.xml
new file mode 100644
index 0000000000..2dd0f9d916
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_snapshot.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Snapshot" title="Snapshot Preview">
+	<text name="type_label">
+		Billede sti
+	</text>
+	<radio_group label="Snapshot type" name="snapshot_type_radio">
+		<radio_item name="postcard">
+			Send via e-mail
+		</radio_item>
+		<radio_item name="texture">
+			Gem til beholdning (L$10)
+		</radio_item>
+		<radio_item name="local">
+			Gem på din computer
+		</radio_item>
+	</radio_group>
+	<text name="file_size_label">
+		Fil Størrelse: [SIZE] KB
+	</text>
+	<button label="Tag nyt Billede" name="new_snapshot_btn"/>
+	<button label="Send" name="send_btn"/>
+	<button label="Gem (L$10)" name="upload_btn"/>
+	<flyout_button label="Gem" name="save_btn" tool_tip="Gem billede til fil">
+		<flyout_button_item name="save_item">
+			Gem
+		</flyout_button_item>
+		<flyout_button_item name="saveas_item">
+			Gem som...
+		</flyout_button_item>
+	</flyout_button>
+	<button label="Annuller" name="discard_btn"/>
+	<button label="Normal &gt;&gt;" name="more_btn" tool_tip="Advanced Options"/>
+	<button label="&lt;&lt; Avanceret" name="less_btn" tool_tip="Advanced Options"/>
+	<text name="type_label2">
+		Størrelse
+	</text>
+	<text name="format_label">
+		Format
+	</text>
+	<combo_box label="Resolution" name="postcard_size_combo">
+		<combo_item name="CurrentWindow">
+			Aktuelle vindue
+		</combo_item>
+		<combo_item name="640x480">
+			640x480
+		</combo_item>
+		<combo_item name="800x600">
+			800x600
+		</combo_item>
+		<combo_item name="1024x768">
+			1024x768
+		</combo_item>
+		<combo_item name="Custom">
+			Manuel
+		</combo_item>
+	</combo_box>
+	<combo_box label="Resolution" name="texture_size_combo">
+		<combo_item name="CurrentWindow">
+			Aktuelle Vindue
+		</combo_item>
+		<combo_item name="Small(128x128)">
+			Lille (128x128)
+		</combo_item>
+		<combo_item name="Medium(256x256)">
+			Mellem (256x256)
+		</combo_item>
+		<combo_item name="Large(512x512)">
+			Stor (512x512)
+		</combo_item>
+		<combo_item name="Custom">
+			Manuel
+		</combo_item>
+	</combo_box>
+	<combo_box label="Opløsning" name="local_size_combo">
+		<combo_item name="CurrentWindow">
+			Aktuelle Vindue
+		</combo_item>
+		<combo_item name="320x240">
+			320x240
+		</combo_item>
+		<combo_item name="640x480">
+			640x480
+		</combo_item>
+		<combo_item name="800x600">
+			800x600
+		</combo_item>
+		<combo_item name="1024x768">
+			1024x768
+		</combo_item>
+		<combo_item name="1280x1024">
+			1280x1024
+		</combo_item>
+		<combo_item name="1600x1200">
+			1600x1200
+		</combo_item>
+		<combo_item name="Custom">
+			Manuel
+		</combo_item>
+	</combo_box>
+	<combo_box label="Format" name="local_format_combo">
+		<combo_item name="PNG">
+			PNG
+		</combo_item>
+		<combo_item name="JPEG">
+			JPEG
+		</combo_item>
+		<combo_item name="BMP">
+			BMP
+		</combo_item>
+	</combo_box>
+	<spinner label="Bredde" name="snapshot_width"/>
+	<spinner label="Højde" name="snapshot_height"/>
+	<check_box label="Låst størrelse" name="keep_aspect_check"/>
+	<slider label="Billedkvalitet" name="image_quality_slider"/>
+	<text name="layer_type_label">
+		Fang:
+	</text>
+	<combo_box label="Image Layers" name="layer_types">
+		<combo_item name="Colors">
+			Farver
+		</combo_item>
+		<combo_item name="Depth">
+			Dybde
+		</combo_item>
+		<combo_item name="ObjectMattes">
+			Materinger
+		</combo_item>
+	</combo_box>
+	<check_box label="Vis grænseflade i billedet" name="ui_check"/>
+	<check_box label="Vis HUD objekter i billedet" name="hud_check"/>
+	<check_box label="Hold denne menu åben" name="keep_open_check"/>
+	<check_box label="Frys billede (Fuldskærms visning )" name="freeze_frame_check"/>
+	<check_box label="Auto-opdater" name="auto_snapshot_check"/>
+	<string name="unknown">
+		unknown
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_sound_preview.xml b/indra/newview/skins/default/xui/da/floater_sound_preview.xml
new file mode 100644
index 0000000000..e284fc3251
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_sound_preview.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Navn/Beskrivelse" title="sound.wav">
+	<text name="name_label">
+		Navn:
+	</text>
+	<text name="description_label">
+		Beskrivelse:
+	</text>
+	<button label="Annuller" label_selected="Annuller" name="cancel_btn" />
+	<button label="Upload (L$10)" label_selected="Upload (L$10)" name="ok_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_telehub.xml b/indra/newview/skins/default/xui/da/floater_telehub.xml
new file mode 100644
index 0000000000..dba133e594
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_telehub.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Telehub" title="Telehub">
+	<text name="status_text_connected">
+		Telehub forbundet til objekt [OBJECT]
+	</text>
+	<text name="status_text_not_connected">
+		Ingen telehub forbundet.
+	</text>
+	<text name="help_text_connected">
+		Fjern, tryk Afslut.
+	</text>
+	<text name="help_text_not_connected">
+		Vælg objekt og klik forbind TeleHub.
+	</text>
+	<button label="Forbind Telehub" name="connect_btn" />
+	<button label="Afslut" name="disconnect_btn" />
+	<text name="spawn_points_text">
+		Ankomst Punkter (positioner, ikke objekter):
+	</text>
+	<button label="Tilføj Ankomst" name="add_spawn_point_btn" />
+	<button label="Fjern Ankomst" name="remove_spawn_point_btn" />
+	<text name="spawn_point_help">
+		Vælg objekt og klik på Tilføj for at angive position.
+Du kan derefter flytte eller slette objektet.
+Positioner er i forhold til telehub Center.
+Vælg emne i listen for at vise position i verden.
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml
new file mode 100644
index 0000000000..aaa6fd253a
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="texture picker" title="Vælg: Tekstur">
+	<string name="choose_picture">
+		Vælg et billede
+	</string>
+	<text type="string" length="1" name="Multiple">
+		Flere
+	</text>
+	<text type="string" length="1" name="unknown">
+		Størrelse: [DIMENSIONS]
+	</text>
+	<button label="Standard" label_selected="Standard" name="Default" />
+	<button label="Ingen" label_selected="Ingen" name="None" />
+	<button label="Blank" label_selected="Blank" name="Blank" />
+	<check_box label="Vis Mapper" name="show_folders_check" />
+	<search_editor label="Skriv her for at søge" name="inventory search editor" />
+	<check_box label="Anvend Omgående" name="apply_immediate_check" />
+	<button label="" label_selected="" name="Pipette" />
+	<button label="Annuller" label_selected="Annuller" name="Cancel" />
+	<button label="Vælg" label_selected="Vælg" name="Select" />
+	<string name="pick title">
+		Vælg:
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_tools.xml b/indra/newview/skins/default/xui/da/floater_tools.xml
new file mode 100644
index 0000000000..2ef753f87a
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_tools.xml
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="toolbox floater" title="">
+	<button label="" label_selected="" name="button focus" tool_tip="Fokus" />
+	<button label="" label_selected="" name="button move" tool_tip="Flyt" />
+	<button label="" label_selected="" name="button edit" tool_tip="Rediger" />
+	<button label="" label_selected="" name="button create" tool_tip="Byg" />
+	<button label="" label_selected="" name="button land" tool_tip="Jord" />
+	<check_box label="Zoom" name="radio zoom" />
+	<check_box label="Kredsløb (Ctrl)" name="radio orbit" />
+	<check_box label="Panorering (Ctrl-Shift)" name="radio pan" />
+	<check_box label="Flyt" name="radio move" />
+	<check_box label="Løft (Ctrl)" name="radio lift" />
+	<check_box label="Snur (Ctrl-Shift)" name="radio spin" />
+	<check_box label="Position" name="radio position" />
+	<check_box label="Rotér (Ctrl)" name="radio rotate" />
+	<check_box label="Stræk (Ctrl-Shift)" name="radio stretch" />
+	<check_box label="Vælg Tekstur" name="radio select face" />
+	<check_box label="Rediger samlede dele" name="checkbox edit linked parts" />
+	<text name="text ruler mode">
+		Lineal Tilstand:
+	</text>
+	<combo_box name="combobox grid mode">
+		<combo_item name="World">
+			Verden
+		</combo_item>
+		<combo_item name="Local">
+			Lokal
+		</combo_item>
+		<combo_item name="Reference">
+			Reference
+		</combo_item>
+	</combo_box>
+	<check_box label="Stræk begge sider" name="checkbox uniform" />
+	<check_box label="Stræk teksturer" name="checkbox stretch textures" />
+	<check_box label="Brug Net" name="checkbox snap to grid" />
+	<button label="Funktioner..." label_selected="Funktioner..." name="Options..." />
+	<text name="text status">
+		Træk for at flytte, Shift-Flyt for at kopiere
+	</text>
+	<button label="" label_selected="" name="ToolCube" tool_tip="Rør" />
+	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisme" />
+	<button label="" label_selected="" name="ToolPyramid" tool_tip="Pyramide" />
+	<button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tetrahedron" />
+	<button label="" label_selected="" name="ToolCylinder" tool_tip="Cylinder" />
+	<button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Halvcylinder" />
+	<button label="" label_selected="" name="ToolCone" tool_tip="Kegle" />
+	<button label="" label_selected="" name="ToolHemiCone" tool_tip="HalvKegle" />
+	<button label="" label_selected="" name="ToolSphere" tool_tip="Bold" />
+	<button label="" label_selected="" name="ToolHemiSphere" tool_tip="Halv Bold" />
+	<button label="" label_selected="" name="ToolTorus" tool_tip="Tønde" />
+	<button label="" label_selected="" name="ToolTube" tool_tip="Rør" />
+	<button label="" label_selected="" name="ToolRing" tool_tip="Ring" />
+	<button label="" label_selected="" name="ToolTree" tool_tip="Træ" />
+	<button label="" label_selected="" name="ToolGrass" tool_tip="Gras" />
+	<check_box label="Hold værktøj valgt" name="checkbox sticky" />
+	<check_box label="Kopier det valgte" name="checkbox copy selection" />
+	<check_box label="Centér Kopi" name="checkbox copy centers" />
+	<check_box label="Rotér Kopi" name="checkbox copy rotates" />
+	<check_box label="Vælg Jord" name="radio select land" />
+	<check_box label="Tromle Jord" name="radio flatten" />
+	<check_box label="Højne Jord" name="radio raise" />
+	<check_box label="Sænke Jord" name="radio lower" />
+	<check_box label="Udglat Jord" name="radio smooth" />
+	<check_box label="Grov Jord" name="radio noise" />
+	<check_box label="Nulstil Jord" name="radio revert" />
+	<combo_box name="combobox brush size">
+		<combo_item name="Small">
+			Lille
+		</combo_item>
+		<combo_item name="Medium">
+			Mellem
+		</combo_item>
+		<combo_item name="Large">
+			Stor
+		</combo_item>
+	</combo_box>
+	<text name="Strength:">
+		Styrke:
+	</text>
+	<button label="Tilføj til valgte" label_selected="Tilføj til valgte"
+	     name="button apply to selection" tool_tip="Rediger det valgte land" />
+	<check_box label="Vis Ejere" name="checkbox show owners" />
+	<button label="Mere &gt;&gt;" name="button more" tool_tip="Avancerede Funktioner" />
+	<button label="&lt;&lt; Mindre" name="button less" tool_tip="Avancerede Funktioner" />
+	<tab_container name="Object Info Tabs">
+		<panel label="Generelt" name="General">
+			<text name="Name:">
+				Navn:
+			</text>
+			<text name="Description:">
+				Beskrivelse:
+			</text>
+			<text name="Creator:">
+				Skaber:
+			</text>
+			<text name="Creator Name">
+				Thrax Linden
+			</text>
+			<button label="Profil..." label_selected="Profil..." name="button creator profile" />
+			<text name="Owner:">
+				Ejer:
+			</text>
+			<text name="Owner Name">
+				Thrax Linden
+			</text>
+			<button label="Profile..." label_selected="Profile..." name="button owner profile" />
+			<text name="Group:">
+				Gruppe:
+			</text>
+			<text name="Group Name Proxy">
+				The Lindens
+			</text>
+			<button label="Set..." label_selected="Set..." name="button set group" />
+			<text name="prim info">
+				1 Objekt, 1 Prim
+			</text>
+			<text name="Permissions:">
+				Rettigheder:
+			</text>
+			<text name="perm_modify">
+				Du kan redigere objektet.
+			</text>
+			<check_box label="Del med gruppe" name="checkbox share with group"
+			     tool_tip="Tillad gruppe medlemmer at flytte, redigere og slette." />
+			<string name="text deed continued">
+				Dedikér...
+			</string>
+			<string name="text deed">
+				Dedikér
+			</string>
+			<button label="Dedikér..." label_selected="Dedikér..." name="button deed"
+			     tool_tip="Gruppe delte objekter kan blive dedikéret af en gruppe officér." />
+			<check_box label="Tillad alle at flytte" name="checkbox allow everyone move" />
+			<check_box label="Tillad alle at kopiere" name="checkbox allow everyone copy" />
+			<check_box label="Vis i søgning" name="search_check"
+			     tool_tip="Lad folk se dette objekter i søge resultaterne" />
+			<check_box label="Til Salg" name="checkbox for sale" />
+			<text name="Price:  L$">
+				Pris:  L$
+			</text>
+			<radio_group name="sale type">
+				<radio_item name="Original">
+					Original
+				</radio_item>
+				<radio_item name="Copy">
+					Kopi
+				</radio_item>
+				<radio_item name="Contents">
+					Indhold
+				</radio_item>
+			</radio_group>
+			<text name="Next owner can:">
+				Næste ejer kan:
+			</text>
+			<check_box label="Redigere" name="checkbox next owner can modify" />
+			<check_box label="Kopiere" name="checkbox next owner can copy" />
+			<check_box label="Sælge/Give væk" name="checkbox next owner can transfer" />
+			<text name="label click action">
+				Ved venstre klik:
+			</text>
+			<combo_box name="clickaction">
+				<combo_item name="Touch/grab(default)">
+					Rør ved/Tag fat (standard)
+				</combo_item>
+				<combo_item name="Sitonobject">
+					Sid på objekt
+				</combo_item>
+				<combo_item name="Buyobject">
+					Køb objekt
+				</combo_item>
+				<combo_item name="Payobject">
+					Betal objekt
+				</combo_item>
+				<combo_item name="Open">
+					Åben
+				</combo_item>
+				<combo_item name="Play">
+					Afspil parcel medie
+				</combo_item>
+				<combo_item name="Opemmedia">
+					Åben parcel medie
+				</combo_item>
+			</combo_box>
+			<text name="B:">
+				B:
+			</text>
+			<text name="O:">
+				O:
+			</text>
+			<text name="G:">
+				G:
+			</text>
+			<text name="E:">
+				E:
+			</text>
+			<text name="N:">
+				N:
+			</text>
+			<text name="F:">
+				F:
+			</text>
+			<string name="Cost Default">
+				Pris:           L$
+			</string>
+			<string name="Cost Total">
+				Total Pris:  L$
+			</string>
+			<string name="Cost Per Unit">
+				Pris pr:     L$
+			</string>
+			<string name="Cost Mixed">
+				Blandet pris
+			</string>
+			<string name="Sale Mixed">
+				Blandet Salg
+			</string>
+		</panel>
+		<panel name="Object">
+			<check_box label="Spejl" name="sculpt mirror control" tool_tip="Vipper moduleret prim på X aksen."/>
+			<check_box label="Vrangen ud" name="sculpt invert control" tool_tip="Invereterer den modelerede prims normaler, så den vender med vrangen ud."/>
+
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_tos.xml b/indra/newview/skins/default/xui/da/floater_tos.xml
new file mode 100644
index 0000000000..181b59e611
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_tos.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="modal container" title="">
+	<button label="Fortsæt" label_selected="Continue" name="Continue"/>
+	<button label="Annuller" label_selected="Cancel" name="Cancel"/>
+	<check_box label="Jeg accepterer vilkårene for brug af tjenesten" name="agree_chk"/>
+	<text name="tos_heading">
+		Læs venligst de almindelige bestemmelser igennem, for at fortsætte til Second Life skal du acceptere betingelserne.
+	</text>
+	<text_editor name="tos_text">
+		TOS_TEXT
+	</text_editor>
+	<string name="real_url">
+		http://secondlife.com/app/tos/
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml
new file mode 100644
index 0000000000..79ee40ced9
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container" title="">
+	<button label="Gem" label_selected="Gem" name="Save" />
+	<button label="Annuller" label_selected="Annuller" name="Cancel" />
+	<text type="string" length="1" name="Save item as:">
+		Gem Ting Som:
+	</text>
+	<line_editor name="name ed">
+		Ny [DESC]
+	</line_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_world_map.xml b/indra/newview/skins/default/xui/da/floater_world_map.xml
new file mode 100644
index 0000000000..fed18daef3
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_world_map.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="worldmap" title="Verdenskort">
+	<tab_container name="maptab">
+		<panel label="Objects" name="objects_mapview" />
+		<panel label="Terrain" name="terrain_mapview" />
+	</tab_container>
+	<text name="land_for_sale_label">
+		Land til Salg
+	</text>
+	<text name="auction_label">
+		Auktion
+	</text>
+	<text name="you_label">
+		Dig
+	</text>
+	<text name="home_label">
+		Hjem
+	</text>
+	<button label="Tag Hjem" label_selected="Tag Hjem" name="Go Home"
+	     tool_tip="Teleporter til dit hjem" />
+	<text name="classifieds_label">
+		Annoncer
+	</text>
+	<check_box label=" " name="class_chk" />
+	<text name="person_label">
+		Person
+	</text>
+	<check_box label=" " name="people_chk" />
+	<text name="infohub_label">
+		Infohub
+	</text>
+	<check_box label="" name="infohub_chk" />
+	<text name="telehub_label">
+		Telehub
+	</text>
+	<check_box label="" name="telehubchk" />
+	<text name="land_for_sale_label2">
+		Land til salg
+	</text>
+	<check_box label="" name="land_for_sale_chk" />
+	<text name="events_label">
+		Begivenheder
+	</text>
+	<check_box label="" name="event_chk" />
+	<text name="events_mature_label">
+		Begivenheder (V)
+	</text>
+	<check_box label="" name="event_mature_chk" />
+	<combo_box label="Online Friends" name="friend combo" tool_tip="Ven der skal vises p� kortet">
+		<combo_item name="none_selected">
+			Online Venner
+		</combo_item>
+	</combo_box>
+	<combo_box label="Landmarks" name="landmark combo" tool_tip="Landem�rke der skal vises p� kortet">
+		<combo_item name="none_selected">
+			Landem�rker
+		</combo_item>
+	</combo_box>
+	<line_editor label="Search by Region Name" name="location"
+	     tool_tip="Skriv navnet p� en region" />
+	<button label="Search" name="DoSearch" tool_tip="Search for region" />
+	<text name="search_label">
+		S�ge resultater:
+	</text>
+	<scroll_list name="search_results">
+		<column label="" name="icon" />
+		<column label="" name="sim_name" />
+	</scroll_list>
+	<text name="location_label">
+		Lokation:
+	</text>
+	<spinner name="spin x" tool_tip="X coordinate of location to show on map" />
+	<spinner name="spin y" tool_tip="Y coordinate of location to show on map" />
+	<spinner name="spin z" tool_tip="Z coordinate of location to show on map" />
+	<button label="Teleporter" label_selected="Teleporter" name="Teleport"
+	     tool_tip="Teleporter til valgte lokation" />
+	<button label="Vis Destination" label_selected="Vis Destination"
+	     name="Show Destination" tool_tip="Centrer kortet p� valgte lokation" />
+	<button label="Slet alt" label_selected="Slet alt" name="Clear" tool_tip="Stop s�gning" />
+	<button label="Vis min Lokation" label_selected="Vis min Lokation"
+	     name="Show My Location"
+	     tool_tip="Centrer kortet p� din avatar&apos;s lokation" />
+	<button label="Kopier SLURL til udklipsholder" name="copy_slurl"
+	     tool_tip="Kopierer den nuv�rende lokation som et SLURL, s� det kan bruges p� nettet." />
+	<slider label="Zoom" name="zoom slider" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/menu_inventory.xml b/indra/newview/skins/default/xui/da/menu_inventory.xml
new file mode 100644
index 0000000000..8c070d919d
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/menu_inventory.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu name="Popup">
+	<menu_item_call label="K&#248;b" name="Task Buy" />
+	<menu_item_call label="&#197;ben" name="Task Open" />
+	<menu_item_call label="Afspil" name="Task Play" />
+	<menu_item_call label="Egenskaber" name="Task Properties" />
+	<menu_item_call label="Omd&#248;b" name="Task Rename" />
+	<menu_item_call label="Slet" name="Task Remove" />
+	<menu_item_call label="T&#248;m Papirkurv" name="Empty Trash" />
+	<menu_item_call label="T&#248;m Tabt og Fundet" name="Empty Lost And Found" />
+	<menu_item_call label="Ny Mappe" name="New Folder" />
+	<menu_item_call label="Ny Kode" name="New Script" />
+	<menu_item_call label="Ny Note" name="New Note" />
+	<menu_item_call label="Ny Hilsen" name="New Gesture" />
+	<menu name="Nyt T&#248;j">
+		<menu_item_call label="Ny Tr&#248;je" name="New Shirt" />
+		<menu_item_call label="Nye Bukser" name="New Pants" />
+		<menu_item_call label="Nye Sko" name="New Shoes" />
+		<menu_item_call label="Nye Sokker" name="New Socks" />
+		<menu_item_call label="Ny Jakke" name="New Jacket" />
+		<menu_item_call label="Ny Nederdel" name="New Skirt" />
+		<menu_item_call label="Nye Handsker" name="New Gloves" />
+		<menu_item_call label="Ny Undertr&#248;je" name="New Undershirt" />
+		<menu_item_call label="Nye Underbukser" name="New Underpants" />
+	</menu>
+	<menu name="Nye Krops Dele">
+		<menu_item_call label="Ny Figur" name="New Shape" />
+		<menu_item_call label="Ny Hud" name="New Skin" />
+		<menu_item_call label="Nyt H&#229;r" name="New Hair" />
+		<menu_item_call label="Nye &#216;jne" name="New Eyes" />
+	</menu>
+	<menu_item_call label="Teleporter" name="Landmark Open" />
+	<menu_item_call label="&#197;ben" name="Animation Open" />
+	<menu_item_call label="&#197;ben" name="Sound Open" />
+	<menu_item_call label="Slet Ting" name="Purge Item" />
+	<menu_item_call label="Genskab Ting" name="Restore Item" />
+	<menu_item_call label="&#197;ben" name="Open" />
+	<menu_item_call label="Egenskaber" name="Properties" />
+	<menu_item_call label="Omd&#248;b" name="Rename" />
+	<menu_item_call label="Kopier Asset UUID" name="Copy Asset UUID" />
+	<menu_item_call label="Kopier" name="Copy" />
+	<menu_item_call label="Inds&#230;t" name="Paste" />
+	<menu_item_call label="Slet" name="Delete" />
+	<menu_item_call label="Aftag Objekter" name="Take Off Items" />
+	<menu_item_call label="Tilf&#248;j til P&#229;kl&#230;dning" name="Add To Outfit" />
+	<menu_item_call label="Erstat P&#229;kl&#230;dning" name="Replace Outfit" />
+	<menu_item_call label="Start konference Chat" name="Conference Chat Folder" />
+	<menu_item_call label="Afspil" name="Sound Play" />
+	<menu_item_call label="Om Landem&#230;rke" name="Teleport To Landmark" />
+	<menu_item_call label="Play in World" name="Animation Play" />
+	<menu_item_call label="Play Locally" name="Animation Audition" />
+	<menu_item_call label="Send Privat Besked" name="Send Instant Message" />
+	<menu_item_call label="Tilbyd Teleport..." name="Offer Teleport..." />
+	<menu_item_call label="Start konference Chat" name="Conference Chat" />
+	<menu_item_call label="Aktiver" name="Activate" />
+	<menu_item_call label="Deaktiver" name="Deactivate" />
+	<menu_item_call label="Aftag fra dig selv" name="Detach From Yourself" />
+	<menu_item_call label="Tag p&#229;" name="Object Wear" />
+	<menu label="S&#230;t p&#229;" name="Attach To" />
+	<menu label="S&#230;t p&#229; HUD" name="Attach To HUD" />
+	<menu_item_call label="Rediger" name="Wearable Edit" />
+	<menu_item_call label="Tag p&#229;" name="Wearable Wear" />
+	<menu_item_call label="Aftag" name="Take Off" />
+	<menu_item_call label="--ingen muligheder--" name="--no options--" />
+</menu>
diff --git a/indra/newview/skins/default/xui/da/menu_login.xml b/indra/newview/skins/default/xui/da/menu_login.xml
new file mode 100644
index 0000000000..92d5e0e7a5
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/menu_login.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu_bar name="Login Menu">
+	<menu label="Filer" name="File">
+		<menu_item_call label="Afslut" name="Quit" />
+	</menu>
+	<menu label="Rediger" name="Edit">
+		<menu_item_call label="Indstillinger..." name="Preferences..." />
+	</menu>
+	<menu label="Hjælp" name="Help">
+		<menu_item_call label="Second Life Hjælp" name="Second Life Help" />
+		<menu_item_call label="Om Second Life..." name="About Second Life..." />
+	</menu>
+</menu_bar>
diff --git a/indra/newview/skins/default/xui/da/menu_slurl.xml b/indra/newview/skins/default/xui/da/menu_slurl.xml
new file mode 100644
index 0000000000..bdbfed27ba
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/menu_slurl.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu name="Popup">
+	<menu_item_call label="Om URL" name="about_url" />
+	<menu_item_call label="Teleporter til URL" name="teleport_to_url" />
+	<menu_item_call label="Vis p&#229; Kort" name="show_on_map" />
+</menu>
diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml
new file mode 100644
index 0000000000..196051e4cb
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/menu_viewer.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu_bar name="Main Menu">
+	<menu label="Filer" name="File">
+		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+		<menu_item_call label="Upload Billede (L$[COST])..." name="Upload Image"/>
+		<menu_item_call label="Upload Lyd (L$[COST])..." name="Upload Sound"/>
+		<menu_item_call label="Upload Animation (L$[COST])..." name="Upload Animation"/>
+		<menu_item_call label="Upload Flere (L$[COST] per file)..." name="Bulk Upload"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Luk Vindue" name="Close Window"/>
+		<menu_item_call label="Luk Alle Vinduer" name="Close All Windows"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Gem Billede Som..." name="Save Texture As..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Tag Billede" name="Take Snapshot"/>
+		<menu_item_call label="Billede til disk" name="Snapshot to Disk"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Quit" name="Quit"/>
+	</menu>
+	<menu label="Rediger" name="Edit">
+		<menu_item_call label="Fortryd" name="Undo"/>
+		<menu_item_call label="Gentag" name="Redo"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Klip" name="Cut"/>
+		<menu_item_call label="Kopier" name="Copy"/>
+		<menu_item_call label="Sæt Ind" name="Paste"/>
+		<menu_item_call label="Slet" name="Delete"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Søg..." name="Search..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Marker Alt" name="Select All"/>
+		<menu_item_call label="Market Intet" name="Deselect"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Klon" name="Duplicate"/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu label="Påsæt Objekt" name="Attach Object"/>
+		<menu label="Aftag Objekt" name="Detach Object"/>
+		<menu label="Aftag Påklædning" name="Take Off Clothing">
+			<menu_item_call label="Trøje" name="Shirt"/>
+			<menu_item_call label="Bukser" name="Pants"/>
+			<menu_item_call label="Sko" name="Shoes"/>
+			<menu_item_call label="Sokker" name="Socks"/>
+			<menu_item_call label="Jakke" name="Jacket"/>
+			<menu_item_call label="Handsker" name="Gloves"/>
+			<menu_item_call label="Undertrøje" name="Menu Undershirt"/>
+			<menu_item_call label="Underbukser" name="Menu Underpants"/>
+			<menu_item_call label="Nederdel" name="Skirt"/>
+			<menu_item_call label="Alt Tøj" name="All Clothes"/>
+		</menu>
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call label="Hilsener..." name="Gestures..."/>
+		<menu_item_call label="Profil..." name="Profile..."/>
+		<menu_item_call label="Udseende..." name="Appearance..."/>
+		<menu_item_separator label="-----------" name="separator7"/>
+		<menu_item_check label="Venner..." name="Friends..."/>
+		<menu_item_call label="Grupper..." name="Groups..."/>
+		<menu_item_separator label="-----------" name="separator8"/>
+		<menu_item_call label="Indstillinger..." name="Preferences..."/>
+	</menu>
+	<menu label="Vis" name="View">
+		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+		<menu_item_call label="Første person" name="Mouselook"/>
+		<menu_item_check label="Byg" name="Build"/>
+		<menu_item_call label="Nulstil Kamera" name="Reset View"/>
+		<menu_item_call label="Se på sidste chatter" name="Look at Last Chatter"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_check label="Værktøjslinje" name="Toolbar"/>
+		<menu_item_check label="Lokal Chat" name="Chat History"/>
+		<menu_item_check label="Kommuniker" name="Instant Message"/>
+		<menu_item_call label="Beholdning" name="Inventory"/>
+		<menu_item_check label="Aktive Talere" name="Active Speakers"/>
+		<menu_item_check label="Blok Liste" name="Mute List"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_check label="Kamera Kontrol" name="Camera Controls"/>
+		<menu_item_check label="Bevægelses Kontrol" name="Movement Controls"/>
+		<menu_item_check label="Verdens Kort" name="World Map"/>
+		<menu_item_check label="Lokalt Kort" name="Mini-Map"/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_check label="Teknisk Info" name="Statistics Bar"/>
+		<menu_item_check label="Grund linjer" name="Property Lines"/>
+		<menu_item_check label="Vis Grundejere" name="Land Owners"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu label="Hover Tips" name="Hover Tips">
+			<menu_item_check label="Vis Tips" name="Show Tips"/>
+			<menu_item_separator label="-----------" name="separator"/>
+			<menu_item_check label="Grund Tips" name="Land Tips"/>
+			<menu_item_check label="Tips på alle objekter" name="Tips On All Objects"/>
+		</menu>
+		<menu_item_check label="Fremhæv Gennemsigtige" name="Highlight Transparent"/>
+		<menu_item_check label="Lyssøjler" name="beacons"/>
+		<menu_item_check label="Skjul Partikler" name="Hide Particles"/>
+		<menu_item_check label="Vis HUD Tilføjelser" name="Show HUD Attachments"/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu_item_call label="Zoom Ind" name="Zoom In"/>
+		<menu_item_call label="Zoom Standard" name="Zoom Default"/>
+		<menu_item_call label="Zoom Ud" name="Zoom Out"/>
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call label="Fuld Skærm/Vindue" name="Toggle Fullscreen"/>
+		<menu_item_call label="Sæt UI Størrelse til Standard" name="Set UI Size to Default"/>
+	</menu>
+	<menu label="Verden" name="World">
+		<menu_item_call label="Chat" name="Chat"/>
+		<menu_item_check label="Løb" name="Always Run"/>
+		<menu_item_check label="Flyv" name="Fly"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Opret Landemærke Her" name="Create Landmark Here"/>
+		<menu_item_call label="Sæt til Hjem" name="Set Home to Here"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Teleporter Hjem" name="Teleport Home"/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Ikke til stede" name="Set Away"/>
+		<menu_item_call label="Optaget" name="Set Busy"/>
+		<menu_item_call label="Frigiv taster" name="Release Keys"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Konto Historik..." name="Account History..."/>
+		<menu_item_call label="Vedligehold min Konto..." name="Manage My Account..."/>
+		<menu_item_call label="Køb L$..." name="Buy and Sell L$..."/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu_item_call label="Mit Land..." name="My Land..."/>
+		<menu_item_call label="Om Land..." name="About Land..."/>
+		<menu_item_call label="Køb Land..." name="Buy Land..."/>
+		<menu_item_call label="Region/Estate..." name="Region/Estate..."/>
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu label="Sol Indstillinger" name="Environment Settings">
+			<menu_item_call label="Solopgang" name="Sunrise"/>
+			<menu_item_call label="Middag" name="Noon"/>
+			<menu_item_call label="Solnedgang" name="Sunset"/>
+			<menu_item_call label="Midnat" name="Midnight"/>
+			<menu_item_call label="Gendan Region Standard" name="Revert to Region Default"/>
+			<menu_item_separator label="-----------" name="separator"/>
+			<menu_item_call label="Rediger Atmosfære" name="Environment Editor"/>
+		</menu>
+	</menu>
+	<menu label="Funktioner" name="Tools">
+		<menu label="Select Tool" name="Select Tool">
+			<menu_item_call label="Fokus" name="Focus"/>
+			<menu_item_call label="Flyt" name="Move"/>
+			<menu_item_call label="Rediger" name="Edit"/>
+			<menu_item_call label="Byg" name="Create"/>
+			<menu_item_call label="Land" name="Land"/>
+		</menu>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_check label="Vælg kun mine objekter" name="Select Only My Objects"/>
+		<menu_item_check label="Vælg kun flytbare objekter" name="Select Only Movable Objects"/>
+		<menu_item_check label="Vælg ud fra omgivelser" name="Select By Surrounding"/>
+		<menu_item_check label="Vis skjulte objekter" name="Show Hidden Selection"/>
+		<menu_item_check label="Vis lys radius for valgte" name="Show Light Radius for Selection"/>
+		<menu_item_check label="Vis objekt guidelys" name="Show Selection Beam"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_check label="Lås til Gitter" name="Snap to Grid"/>
+		<menu_item_call label="Lås Objekts XY til Gitter" name="Snap Object XY to Grid"/>
+		<menu_item_call label="Brug valgte til felt" name="Use Selection for Grid"/>
+		<menu_item_call label="Gitter Indstillinger..." name="Grid Options..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_check label="Rediger Lænkede Dele" name="Edit Linked Parts"/>
+		<menu_item_call label="Lænk" name="Link"/>
+		<menu_item_call label="Aflænk" name="Unlink"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Fokus på Valgte" name="Focus on Selection"/>
+		<menu_item_call label="Zoom til Valgte" name="Zoom to Selection"/>
+		<menu_item_call label="Take" name="Menu Object Take"/>
+		<menu_item_call label="Tag Kopi" name="Take Copy"/>
+		<menu_item_call label="Gem ændringer på prim i beholdning" name="Save Object Back to My Inventory"/>
+		<menu_item_call label="Gem ændringer på prim i dens beholdning" name="Save Object Back to Object Contents"/>
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call name="Show Script Warning/Error Window"/>
+		<menu name="Recompile Scripts in Selection">
+			<menu_item_call label="Mono" name="Mono"/>
+			<menu_item_call label="LSL" name="LSL"/>
+		</menu>
+		<menu_item_call label="Nulstil valgte koder" name="Reset Scripts in Selection"/>
+		<menu_item_call label="Sæt valgte koder aktive" name="Set Scripts to Running in Selection"/>
+		<menu_item_call label="Sæt valgte koder inaktive" name="Set Scripts to Not Running in Selection"/>
+	</menu>
+	<menu label="Hjælp" name="Help">
+		<menu_item_call label="Second Life Hjælp" name="Second Life Help"/>
+		<menu_item_call label="Tutorial" name="Tutorial"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Officiel Linden Blog..." name="Official Linden Blog..."/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Kodnings Portal..." name="Scripting Portal..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Rapporter Misbrug..." name="Report Abuse..."/>
+		<menu_item_call label="Kollisioner, Skub &amp; Slag..." name="Bumps, Pushes &amp;amp; Hits..."/>
+		<menu_item_call label="Lag Meter" name="Lag Meter"/>
+		<menu_item_separator label="-----------" name="separator7"/>
+		<menu label="Fejl Rapportering" name="Bug Reporting">
+			<menu_item_call label="Offentlig hændelses Sæger..." name="Public Issue Tracker..."/>
+			<menu_item_call label="Offentlig hændelses Sæger hjælp..." name="Publc Issue Tracker Help..."/>
+			<menu_item_separator label="-----------" name="separator7"/>
+			<menu_item_call label="Fejl Rapportering 101..." name="Bug Reporing 101..."/>
+			<menu_item_call label="Sikkerheds Hændelser..." name="Security Issues..."/>
+			<menu_item_call label="QA Wiki..." name="QA Wiki..."/>
+			<menu_item_separator label="-----------" name="separator9"/>
+			<menu_item_call label="Rapporter Fejl..." name="Report Bug..."/>
+		</menu>
+		<menu_item_call label="Om Second Life..." name="About Second Life..."/>
+	</menu>
+</menu_bar>
diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml
new file mode 100644
index 0000000000..701f37e2c6
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_login.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_login">
+	<text name="first_name_text">
+		Fornavn:
+	</text>
+	<text name="last_name_text">
+		Efternavn:
+	</text>
+	<text name="password_text">
+		Kodeord:
+	</text>
+	<text name="start_location_text">
+		Start Placering:
+	</text>
+	<combo_box name="start_location_combo">
+		<combo_item name="MyHome">
+			Mit Hjem
+		</combo_item>
+		<combo_item name="MyLastLocation">
+			Min Sidste Placering
+		</combo_item>
+		<combo_item name="Typeregionname">
+			&lt;Skriv Navn På Region&gt;
+		</combo_item>
+	</combo_box>
+	<check_box label="Husk Kodeord" name="remember_check"/>
+	<button label="Log Ind" label_selected="Log Ind" name="connect_btn"/>
+	<text name="create_new_account_text">
+		Tilmeld konto
+	</text>
+	<text name="forgot_password_text">
+		Glemt Kodeord?
+	</text>
+	<text name="channel_text">
+		[CHANNEL] [VERSION]
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
new file mode 100644
index 0000000000..0b516eac65
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Tekst Chat" name="chat">
+	<text length="1" name="text_box" type="string">
+		Chat Skrift Størrelse:
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item name="radio">
+			Lille
+		</radio_item>
+		<radio_item name="radio2">
+			Mellem
+		</radio_item>
+		<radio_item name="radio3">
+			Stor
+		</radio_item>
+	</radio_group>
+	<text length="1" name="text_box2" type="string">
+		Chat Farve:
+	</text>
+	<color_swatch label="Dig" name="user"/>
+	<color_swatch label="Andre" name="agent"/>
+	<color_swatch label="IM" name="im"/>
+	<color_swatch label="System" name="system"/>
+	<color_swatch label="Fejl" name="script_error"/>
+	<color_swatch label="Objekter" name="objects"/>
+	<color_swatch label="Ejer" name="owner"/>
+	<color_swatch label="Bobler" name="background"/>
+	<color_swatch label="URLs" name="links"/>
+	<text length="1" name="text_box8" type="string">
+		Kodnings fejl:
+	</text>
+	<check_box label="Vis kodnings fejl og advarsler i almindelig chat" name="script_errors_as_chat"/>
+	<text length="1" name="text_box3" type="string">
+		Chat Vindue:
+	</text>
+	<spinner label="Fade chat efter" name="fade_chat_time"/>
+	<text length="1" name="text_box4" type="string">
+		(sekunder)
+	</text>
+	<text length="1" name="text_box5" type="string">
+		(# linjer)
+	</text>
+	<slider label="Opacitet" name="console_opacity"/>
+	<check_box label="Brug fuldskærms bredde  (Kræver genstart)" name="chat_full_width_check"/>
+	<text length="1" name="text_box6" type="string">
+		Chat Indstillinger:
+	</text>
+	<check_box label="Luk chat efter tryk på enter" name="close_chat_on_return_check"/>
+	<check_box label="Piletaster flytter altid figur under chat" name="arrow_keys_move_avatar_check"/>
+	<check_box label="Vis klokkeslæt i lokal chat" name="show_timestamps_check"/>
+	<check_box label="Afspil skrive animation ved chat" name="play_typing_animation"/>
+	<text length="1" name="text_box7" type="string">
+		Chat Bobler:
+	</text>
+	<check_box label="Vis chat bobler" name="bubble_text_chat"/>
+	<slider label="Opacitet" name="bubble_chat_opacity"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_general.xml b/indra/newview/skins/default/xui/da/panel_preferences_general.xml
new file mode 100644
index 0000000000..5411230a69
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_preferences_general.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Generelt" name="general_panel">
+	<radio_group name="default_start_location">
+		<radio_item name="MyHome" tool_tip="Log ind til min hjemme lokation som standard.">
+			Mit Hjem
+		</radio_item>
+		<radio_item name="MyLastLocation" tool_tip="Log ind til min sidste lokation som standard.">
+			Min sidste lokation
+		</radio_item>
+	</radio_group>
+	<check_box label="Vis start lokation på login skærmen" name="show_location_checkbox"/>
+	<combo_box name="fade_out_combobox">
+		<combo_item name="Never">
+			Aldrig
+		</combo_item>
+		<combo_item name="Show Temporarily">
+			Vis midlertidigt
+		</combo_item>
+		<combo_item name="Always">
+			Altid
+		</combo_item>
+	</combo_box>
+	<check_box label="Små figur navne" name="small_avatar_names_checkbox"/>
+	<check_box label="Skjul mit navn på min skærm" name="show_my_name_checkbox"/>
+	<text length="1" name="group_titles_textbox" type="string">
+		Gruppe titler:
+	</text>
+	<check_box label="Skjul alle gruppe titler" name="show_all_title_checkbox"/>
+	<check_box label="Gem min gruppe titel" name="show_my_title_checkbox"/>
+	<color_swatch label="" name="effect_color_swatch" tool_tip="Click to open Color Picker"/>
+	<text length="1" name="UI Size:" type="string">
+		UI Størrelse:
+	</text>
+	<check_box label="Brug opløsnings uafhængig skala" name="ui_auto_scale"/>
+	<spinner label="Away Timeout:" name="afk_timeout_spinner"/>
+	<check_box label="Roter det Lokale Kort" name="rotate_mini_map_checkbox"/>
+	<check_box label="Giv besked når Linden dollars (L$) bliver brugt eller modtaget" name="notify_money_change_checkbox"/>
+	<check_box label="Brug standard farve vælger" name="use_system_color_picker_checkbox" tool_tip="Brug dit systems standard farve vælger i stedet for den der er indbygget i Second Life."/>
+	<check_box label="Vis Søg i øverste højre hjørne" name="show_search_panel" tool_tip="Vis indbygget søgepanel."/>
+	<text length="1" name="start_location_textbox" type="string">
+		Start Lokation:
+	</text>
+	<text length="1" name="show_names_textbox" type="string">
+		Vis navne:
+	</text>
+	<text length="1" name="effects_color_textbox" type="string">
+		Farve til mine effekter:
+	</text>
+	<text length="1" name="seconds_textbox" type="string">
+		sekunder
+	</text>
+	<text length="1" name="crash_report_textbox" type="string">
+		Nedbrugsrapporter:
+	</text>
+	<text length="1" name="language_textbox" type="string">
+		Sprog:
+	</text>
+	<text length="1" name="language_textbox2" type="string">
+		(Kræver genstart for at virke optimalt)
+	</text>
+	<string name="region_name_prompt">
+		&lt;Skriv regions navn&gt;
+	</string>
+	<combo_box name="crash_behavior_combobox">
+		<combo_item length="1" name="Askbeforesending" type="string">
+			Bed om bekræftigelse
+		</combo_item>
+		<combo_item length="1" name="Alwayssend" type="string">
+			Send Altid
+		</combo_item>
+		<combo_item length="1" name="Neversend" type="string">
+			Send Aldrig
+		</combo_item>
+	</combo_box>
+	<combo_box name="language_combobox">
+		<combo_item length="1" name="System Default Language" type="string">
+			System Standard
+		</combo_item>
+		<combo_item length="1" name="English" type="string">
+			English (Engelsk)
+		</combo_item>
+		<combo_item length="1" name="Chinese" type="string">
+			汉语/漢語 (Kinesisk) - Beta
+		</combo_item>
+		<combo_item length="1" name="Deutsch(German)" type="string">
+			Deutsch (Tysk) - Beta
+		</combo_item>
+		<combo_item length="1" name="French" type="string">
+			Français (Fransk) - Beta
+		</combo_item>
+		<combo_item length="1" name="(Japanese)" type="string">
+			日本語 (Japansk) - Beta
+		</combo_item>
+		<combo_item length="1" name="(Korean)" type="string">
+			한국어 (Koreansk) - Beta
+		</combo_item>
+		<combo_item length="1" name="Danish" type="string">
+			Dansk - Beta
+		</combo_item>
+		<combo_item length="1" name="Portugese" type="string">
+			Portugués (Portugesisk) - Beta
+		</combo_item>
+		<combo_item length="1" name="Spanish" type="string">
+			Español (Spansk) - Beta
+		</combo_item>
+	</combo_box>
+	<check_box label="Del sprog med objekter" name="language_is_public" tool_tip="Dette lader objekter i verden vise hvad dit foretrukne sprog er."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
new file mode 100644
index 0000000000..57f4a69b00
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Grafik" name="Display panel">
+	<button label="?" name="GraphicsPreferencesHelpButton" />
+	<check_box label="K&#248;r Second Life i et vindue" name="windowed mode" />
+	<text_editor type="string" length="1" name="FullScreenInfo">
+		Hvis denne ikke er valgt k&#248;rer Second Life i Fuld sk&#230;rm.
+	</text_editor>
+	<text type="string" length="1" name="WindowSizeLabel">
+		Opl&#248;sning:
+	</text>
+	<combo_box name="windowsize combo">
+		<combo_item type="string" length="1" name="640x480">
+			640x480
+		</combo_item>
+		<combo_item type="string" length="1" name="800x600">
+			800x600
+		</combo_item>
+		<combo_item type="string" length="1" name="720x480">
+			720x480 (NTSC)
+		</combo_item>
+		<combo_item type="string" length="1" name="768x576">
+			768x576 (PAL)
+		</combo_item>
+		<combo_item type="string" length="1" name="1024x768">
+			1024x768
+		</combo_item>
+	</combo_box>
+	<text type="string" length="1" name="DisplayResLabel">
+		Sk&#230;rm opl&#248;sning:
+	</text>
+	<text type="string" length="1" name="AspectRatioLabel1" tool_tip="width / height">
+		Format:
+	</text>
+	<combo_box name="aspect_ratio" tool_tip="width / height">
+		<combo_item type="string" length="1" name="4:3(StandardCRT)">
+			4:3 (Standard CRT)
+		</combo_item>
+		<combo_item type="string" length="1" name="5:4(1280x1024LCD)">
+			5:4 (1280x1024 LCD)
+		</combo_item>
+		<combo_item type="string" length="1" name="8:5(Widescreen)">
+			8:5 (Widescreen)
+		</combo_item>
+		<combo_item type="string" length="1" name="16:9(Widescreen)">
+			16:9 (Widescreen)
+		</combo_item>
+	</combo_box>
+	<check_box label="Auto-detect ratio" name="aspect_auto_detect" />
+	<text type="string" length="1" name="HigherText">
+		Kvalitet og
+	</text>
+	<text type="string" length="1" name="QualityText">
+		Ydelse:
+	</text>
+	<text type="string" length="1" name="FasterText">
+		Hurtigere
+	</text>
+	<text type="string" length="1" name="ShadersPrefText">
+		Lav
+	</text>
+	<text type="string" length="1" name="ShadersPrefText2">
+		Mel
+	</text>
+	<text type="string" length="1" name="ShadersPrefText3">
+		H&#248;j
+	</text>
+	<text type="string" length="1" name="ShadersPrefText4">
+		Ultra
+	</text>
+	<text type="string" length="1" name="HigherText2">
+		H&#248;jere
+	</text>
+	<text type="string" length="1" name="QualityText2">
+		Kvalitet
+	</text>
+	<slider label="" name="QualityPerformanceSelection" />
+	<check_box label="Manuelt" name="CustomSettings" />
+	<text type="string" length="1" name="ShadersText">
+		Overflader:
+	</text>
+	<check_box label="Glatte flader og Sk&#230;r" name="BumpShiny" />
+	<check_box label="Grundliggende Overflader" name="BasicShaders"
+	     tool_tip="Disabling this option may prevent some graphics card drivers from crashing." />
+	<check_box label="Atmosf&#230;re Overflader" name="WindLightUseAtmosShaders" />
+	<check_box label="Vand Reflektioner" name="Reflections" />
+	<text type="string" length="1" name="ReflectionDetailText">
+		Spejlnings Detaljer:
+	</text>
+	<radio_group name="ReflectionDetailRadio">
+		<radio_item type="string" length="1" name="0">
+			Terr&#230;n og Tr&#230;er
+		</radio_item>
+		<radio_item type="string" length="1" name="1">
+			Alle statiske objekter
+		</radio_item>
+		<radio_item type="string" length="1" name="2">
+			Alle figurer og objekter
+		</radio_item>
+		<radio_item type="string" length="1" name="3">
+			Alt
+		</radio_item>
+	</radio_group>
+	<text type="string" length="1" name="AvatarRenderingText">
+		Figur Gengivelse:
+	</text>
+	<check_box label="Avatar Impostors" name="AvatarImpostors" />
+	<check_box label="Hardware Skinning" name="AvatarVertexProgram" />
+	<check_box label="Avatar Cloth" name="AvatarCloth" />
+	<text type="string" length="1" name="DrawDistanceMeterText1">
+		m
+	</text>
+	<text type="string" length="1" name="DrawDistanceMeterText2">
+		m
+	</text>
+	<slider label="Vis afstand:" name="DrawDistance" />
+	<slider label="Max. Antal partikler:" name="MaxParticleCount" />
+	<slider label="F&#248;r Proces Kvalitet:" name="RenderPostProcess" />
+	<text type="string" length="1" name="MeshDetailText">
+		Mesh Detail:
+	</text>
+	<slider label="  Objekter:" name="ObjectMeshDetail" />
+	<slider label="  Flexiprims:" name="FlexibleMeshDetail" />
+	<slider label="  Tr&#230;er:" name="TreeMeshDetail" />
+	<slider label="  Figurer:" name="AvatarMeshDetail" />
+	<slider label="  Terr&#230;n:" name="TerrainMeshDetail" />
+	<slider label="  Himmel:" name="SkyMeshDetail" />
+	<text type="string" length="1" name="PostProcessText">
+		Lav
+	</text>
+	<text type="string" length="1" name="ObjectMeshDetailText">
+		Lav
+	</text>
+	<text type="string" length="1" name="FlexibleMeshDetailText">
+		Lav
+	</text>
+	<text type="string" length="1" name="TreeMeshDetailText">
+		Lav
+	</text>
+	<text type="string" length="1" name="AvatarMeshDetailText">
+		Lav
+	</text>
+	<text type="string" length="1" name="TerrainMeshDetailText">
+		Lav
+	</text>
+	<text type="string" length="1" name="SkyMeshDetailText">
+		Lav
+	</text>
+	<text type="string" length="1" name="LightingDetailText">
+		Lys Detaljer:
+	</text>
+	<radio_group name="LightingDetailRadio">
+		<radio_item type="string" length="1" name="SunMoon">
+			Kun Sol og M&#229;ne
+		</radio_item>
+		<radio_item type="string" length="1" name="LocalLights">
+			Lys i n&#230;rheden
+		</radio_item>
+	</radio_group>
+	<text type="string" length="1" name="TerrainDetailText">
+		Terr&#230;n Detaljer:
+	</text>
+	<radio_group name="TerrainDetailRadio">
+		<radio_item type="string" length="1" name="0">
+			Lav
+		</radio_item>
+		<radio_item type="string" length="1" name="2">
+			H&#248;j
+		</radio_item>
+	</radio_group>
+	<button label="Anbefalede Indstillinger" name="Defaults" />
+	<button label="Hardware Funktioner" label_selected="Hardware Options"
+	     name="GraphicsHardwareButton" />
+	<string name="resolution_format">
+		[RES_X] x [RES_Y]
+	</string>
+	<string name="aspect_ratio_text">
+		[NUM]:[DEN]
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
new file mode 100644
index 0000000000..296df40087
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+	<string name="LoginFailedNoNetwork">
+		Netværks fejl: Kunne ikke oprette forbindelse, tjek venligst din netværksforbindelse.
+	</string>
+	<!-- Disconnection -->
+	<string name="AgentLostConnection">
+		Denne region kan have problemer. Tjek venligst din forbindelse til internettet.
+	</string>
+	<string name="TooltipMustSingleDrop">
+		Kun en enkelt ting kan trækkes hertil
+	</string>
+	<string name="ReleaseNotes">
+		Udgivelses Noter
+	</string>
+	<string name="texture_loading">
+		Indlæser...
+	</string>
+	<!-- Chat -->
+	<string name="whisper">
+		hvisker:
+	</string>
+	<string name="shout">
+		råber:
+	</string>
+</strings>
diff --git a/indra/newview/skins/default/xui/da/xui_version.xml b/indra/newview/skins/default/xui/da/xui_version.xml
new file mode 100644
index 0000000000..ee2a0be745
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/xui_version.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xui_version>
+	1.0
+</xui_version>
diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml
index b75eeba248..ecb7875112 100644
--- a/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_about_land.xml
@@ -1,287 +1,259 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floaterland" title="Land-Info">
 	<tab_container name="landtab">
 		<panel label="Allgemein" name="land_general_panel">
-			<text type="string" length="1" name="Name:">
+			<text name="Name:">
 				Name:
 			</text>
-			<text type="string" length="1" name="Description:">
+			<text name="Description:">
 				Beschreibung:
 			</text>
-			<text type="string" length="1" name="Owner:">
+			<text name="Owner:">
 				Eigentümer:
 			</text>
-			<text type="string" length="1" name="OwnerText">
+			<text name="OwnerText">
 				Leyla Linden
 			</text>
-			<button label="Profil..." label_selected="Profil..." name="Profile..." />
-			<text type="string" length="1" name="Group:">
+			<button label="Profil..." label_selected="Profil..." name="Profile..."/>
+			<text name="Group:">
 				Gruppe:
 			</text>
-			<button label="Einstellen..." label_selected="Einstellen..." name="Set..." />
-			<check_box label="Übertragung an Gruppe zulassen" name="check deed"
-			     tool_tip="Ein Gruppen-Officer kann dieses Land der Gruppe übertragen. Das Land wird dann über die Landzuteilung der Gruppe verwaltet." />
-			<button label="Übertragen..." label_selected="Übertragen..." name="Deed..."
-			     tool_tip="Sie können Land nur übertragen, wenn Sie in der ausgewählten Gruppe Officer sind." />
-			<check_box label="Eigentümer leistet Beitrag durch Übertragung" name="check contrib"
-			     tool_tip="Wenn das Land an die Gruppe übertragen wird, trägt der frühere Eigentümer ausreichend Landnutzungsrechte bei, um es zu halten." />
-			<text type="string" length="1" name="For Sale:">
+			<button label="Einstellen..." label_selected="Einstellen..." name="Set..."/>
+			<check_box label="Übertragung an Gruppe zulassen" name="check deed" tool_tip="Ein Gruppen-Officer kann dieses Land der Gruppe übertragen. Das Land wird dann über die Landzuteilung der Gruppe verwaltet."/>
+			<button label="Übertragen..." label_selected="Übertragen..." name="Deed..." tool_tip="Sie können Land nur übertragen, wenn Sie in der ausgewählten Gruppe Officer sind."/>
+			<check_box label="Eigentümer leistet Beitrag durch Übertragung" name="check contrib" tool_tip="Wenn das Land an die Gruppe übertragen wird, trägt der frühere Eigentümer ausreichend Landnutzungsrechte bei, um es zu halten."/>
+			<text name="For Sale:">
 				Zum Verkauf:
 			</text>
-			<text type="string" length="1" name="Not for sale.">
+			<text name="Not for sale.">
 				Nicht zu verkaufen.
 			</text>
-			<text type="string" length="1" name="For Sale: Price L$[PRICE].">
+			<text name="For Sale: Price L$[PRICE].">
 				Preis: [PRICE] L$.
 			</text>
-			<button label="Land verkaufen..." label_selected="Land verkaufen..."
-			     name="Sell Land..." />
-			<text type="string" length="1" name="For sale to">
+			<button label="Land verkaufen..." label_selected="Land verkaufen..." name="Sell Land..." bottom="-200"/>
+			<text name="For sale to">
 				Zum Verkauf an: [BUYER]
 			</text>
-			<text type="string" length="1" name="Sell with landowners objects in parcel.">
+			<text name="Sell with landowners objects in parcel." width="210">
 				Objekte sind im Verkauf eingeschlossen.
 			</text>
-			<text type="string" length="1" name="Selling with no objects in parcel.">
+			<text name="Selling with no objects in parcel." width="237">
 				Objekte sind im Verkauf nicht eingeschlossen.
 			</text>
-			<button label="Landverkauf abbrechen" label_selected="Landverkauf abbrechen"
-			     name="Cancel Land Sale" />
-			<text type="string" length="1" name="Claimed:">
+			<button label="Landverkauf abbrechen" label_selected="Landverkauf abbrechen" name="Cancel Land Sale" bottom="-204"/>
+			<text name="Claimed:">
 				Gekauft am:
 			</text>
-			<text type="string" length="1" name="DateClaimText">
+			<text name="DateClaimText">
 				Dienstag, 15. Aug. 2006, 13:47:25
 			</text>
-			<text type="string" length="1" name="PriceLabel">
+			<text name="PriceLabel">
 				Gebiet:
 			</text>
-			<text type="string" length="1" name="PriceText">
+			<text name="PriceText">
 				4048 qm
 			</text>
-			<text type="string" length="1" name="Traffic:">
+			<text name="Traffic:">
 				Traffic:
 			</text>
-			<text type="string" length="1" name="DwellText">
+			<text name="DwellText">
 				0
 			</text>
-			<button label="Land kaufen..." label_selected="Land kaufen..." name="Buy Land..." />
-			<button label="Für Gruppe kaufen..." label_selected="Für Gruppe kaufen..."
-			     name="Buy For Group..." />
-			<button label="Pass kaufen..." label_selected="Pass kaufen..." name="Buy Pass..."
-			     tool_tip="Ein Pass gibt Ihnen zeitbegrenzten Zugang zu diesem Land." />
-			<button label="Land aufgeben..." label_selected="Land aufgeben..."
-			     name="Abandon Land..." />
-			<button label="Land in Besitz nehmen..." label_selected="Land in Besitz nehmen..."
-			     name="Reclaim Land..." />
-			<button label="Linden-Verkauf..." label_selected="Linden-Verkauf..."
-			     name="Linden Sale..."
-			     tool_tip="Land muss Eigentum und auf Inhalt gesetzt sein und nicht zur Auktion stehen." />
-			<text name="new users only">
+			<button label="Land kaufen..." label_selected="Land kaufen..." name="Buy Land..."/>
+			<button label="Für Gruppe kaufen..." label_selected="Für Gruppe kaufen..." name="Buy For Group..."/>
+			<button label="Pass kaufen..." label_selected="Pass kaufen..." name="Buy Pass..." tool_tip="Ein Pass gibt Ihnen zeitbegrenzten Zugang zu diesem Land."/>
+			<button label="Land aufgeben..." label_selected="Land aufgeben..." name="Abandon Land..."/>
+			<button label="Land in Besitz nehmen..." label_selected="Land in Besitz nehmen..." name="Reclaim Land..."/>
+			<button label="Linden-Verkauf..." label_selected="Linden-Verkauf..." name="Linden Sale..." tool_tip="Land muss Eigentum und auf Inhalt gesetzt sein und nicht zur Auktion stehen."/>
+			<string name="new users only">
 				Nur neue Benutzer
-			</text>
-			<text name="anyone">
+			</string>
+			<string name="anyone">
 				Jeder
-			</text>
-			<text name="area_text">
+			</string>
+			<string name="area_text">
 				Gebiet:
-			</text>
-			<text name="area_size_text">
+			</string>
+			<string name="area_size_text">
 				[AREA] qm
-			</text>
-			<text name="auction_id_text">
+			</string>
+			<string name="auction_id_text">
 				Auktions-ID: [ID]
-			</text>
-			<text name="need_tier_to_modify">
+			</string>
+			<string name="need_tier_to_modify">
 				Bestätigen Sie den Kauf, um dieses Land zu bearbeiten.
-			</text>
-			<text name="group_owned_text">
+			</string>
+			<string name="group_owned_text">
 				(In Gruppenbesitz)
-			</text>
-			<text name="profile_text">
+			</string>
+			<string name="profile_text">
 				Profil...
-			</text>
-			<text name="info_text">
+			</string>
+			<string name="info_text">
 				Info...
-			</text>
-			<text name="public_text">
+			</string>
+			<string name="public_text">
 				(öffentlich)
-			</text>
-			<text name="none_text">
-				(-)
-			</text>
-			<text name="sale_pending_text">
+			</string>
+			<string name="none_text">
+				(keiner)
+			</string>
+			<string name="sale_pending_text">
 				(Wird verkauft)
-			</text>
+			</string>
 			<string name="no_selection_text">
 				Keine Parzelle ausgewählt.
-Öffnen Sie &quot;Welt&quot; &gt; &quot;Land-Info&quot; oder wählen Sie eine andere Parzelle aus, um Informationen darüber anzuzeigen.
+Öffnen Sie „Welt“ &gt; „Land-Info“ oder wählen Sie eine andere Parzelle aus, um Informationen darüber anzuzeigen.
 			</string>
 		</panel>
 		<panel label="Vertrag" name="land_covenant_panel">
-			<text type="string" length="1" name="covenant_timestamp_text">
+			<text name="covenant_timestamp_text">
 				Letzte Änderung am Mittwoch, den 31. Dez. 1969, 16:00:00
 			</text>
-			<text type="string" length="1" name="region_name_lbl">
+			<text name="region_name_lbl">
 				Region:
 			</text>
-			<text type="string" length="1" name="region_name_text">
+			<text name="region_name_text">
 				leyla
 			</text>
-			<text type="string" length="1" name="estate_name_lbl">
+			<text name="estate_name_lbl">
 				Grundstück:
 			</text>
-			<text type="string" length="1" name="estate_name_text">
+			<text name="estate_name_text">
 				Mainland
 			</text>
-			<text type="string" length="1" name="estate_owner_lbl">
+			<text name="estate_owner_lbl">
 				Eigentümer:
 			</text>
-			<text type="string" length="1" name="estate_owner_text">
+			<text name="estate_owner_text">
 				(keiner)
 			</text>
-			<text type="string" length="1" name="resellable_clause">
+			<text name="resellable_clause">
 				Gekauftes Land in dieser Region kann nicht wiederverkauft werden.
 			</text>
-			<text type="string" length="1" name="changeable_clause">
+			<text name="changeable_clause">
 				Gekauftes Land in dieser Region kann nicht zusammengelegt/geteilt werden.
 			</text>
-			<text_editor type="string" length="1" name="covenant_editor">
+			<text_editor name="covenant_editor">
 				Für dieses Grundstück fehlt der Vertrag.
 			</text_editor>
-			<text name="can_resell">
+			<string name="can_resell">
 				Gekauftes Land in dieser Region kann wiederverkauft werden.
-			</text>
-			<text name="can_not_resell">
+			</string>
+			<string name="can_not_resell">
 				Gekauftes Land in dieser Region kann nicht wiederverkauft werden.
-			</text>
-			<text name="can_change">
+			</string>
+			<string name="can_change">
 				Gekauftes Land in dieser Region kann zusammengelegt und geteilt werden.
-			</text>
-			<text name="can_not_change">
+			</string>
+			<string name="can_not_change">
 				Gekauftes Land in dieser Region kann nicht zusammengelegt und geteilt werden.
-			</text>
+			</string>
 		</panel>
 		<panel label="Objekte" name="land_objects_panel">
 			<text name="parcel_object_bonus">
 				Objektbonusfaktor in Region: [BONUS]
 			</text>
-			<text type="string" length="1" name="Simulator primitive usage:">
+			<text name="Simulator primitive usage:">
 				Primitive in Simulator:
 			</text>
 			<text name="objects_available">
 				[COUNT] von [MAX] ([AVAILABLE] verfügbar)
 			</text>
-			<text name="objects_available_text">
+			<string name="objects_available_text">
 				[COUNT] von [MAX] ([AVAILABLE] verfügbar)
-			</text>
-			<text name="objects_deleted_text">
+			</string>
+			<string name="objects_deleted_text">
 				[COUNT] von [MAX] ([DELETED] werden gelöscht)
-			</text>
+			</string>
 			<text name="Primitives parcel supports:" width="200">
 				Von Parzelle unterstützte Primitiva:
 			</text>
-			<text left="204" name="object_contrib_text" width="152">
+			<text name="object_contrib_text"  left="204" width="152">
 				[COUNT]
 			</text>
-			<text type="string" length="1" name="Primitives on parcel:">
+			<text name="Primitives on parcel:">
 				Primitiva auf Parzelle:
 			</text>
-			<text left="204" name="total_objects_text" width="48">
+			<text name="total_objects_text" left="204" width="48">
 				[COUNT]
 			</text>
-			<text left="14" name="Owned by parcel owner:" width="200">
+			<text name="Owned by parcel owner:" left="14" width="200">
 				Im Eigentum des Parzellenbesitzers:
 			</text>
-			<text left="204" name="owner_objects_text" width="48">
+			<text name="owner_objects_text" left="204" width="48">
 				[COUNT]
 			</text>
-			<button label="Anzeigen" label_selected="Anzeigen" name="ShowOwner" right="-135"
-			     width="60" />
-			<button label="Zurückgeben..." label_selected="Zurückgeben..." name="ReturnOwner..."
-			     right="-10" tool_tip="Objekte an ihre Eigentümer zurückgeben."
-			     width="119" />
-			<text left="14" name="Set to group:" width="200">
+			<button label="Anzeigen" label_selected="Anzeigen" name="ShowOwner" right="-135" width="60"/>
+			<button label="Zurückgeben..." label_selected="Zurückgeben..." name="ReturnOwner..." tool_tip="Objekte an ihre Eigentümer zurückgeben." right="-10" width="119"/>
+			<text name="Set to group:" left="14" width="200">
 				Der Gruppe übereignen:
 			</text>
-			<text left="204" name="group_objects_text" width="48">
+			<text name="group_objects_text" left="204" width="48">
 				[COUNT]
 			</text>
-			<button label="Anzeigen" label_selected="Anzeigen" name="ShowGroup" right="-135"
-			     width="60" />
-			<button label="Zurückgeben..." label_selected="Zurückgeben..." name="ReturnGroup..."
-			     right="-10" tool_tip="Objekte an ihre Eigentümer zurückgeben."
-			     width="119" />
-			<text left="14" name="Owned by others:" width="128">
+			<button label="Anzeigen" label_selected="Anzeigen" name="ShowGroup" width="60" right="-135" />
+			<button label="Zurückgeben..." label_selected="Zurückgeben..." name="ReturnGroup..." tool_tip="Objekte an ihre Eigentümer zurückgeben." right="-10" width="119"/>
+			<text name="Owned by others:" left="14" width="128">
 				Im Eigentum anderer:
 			</text>
-			<text left="204" name="other_objects_text" width="48">
+			<text name="other_objects_text" left="204" width="48">
 				[COUNT]
 			</text>
-			<button label="Anzeigen" label_selected="Anzeigen" name="ShowOther" right="-135"
-			     width="60" />
-			<button label="Zurückgeben..." label_selected="Zurückgeben..." name="ReturnOther..."
-			     right="-10" tool_tip="Objekte an ihre Eigentümer zurückgeben."
-			     width="119" />
-			<text left="14" name="Selected / sat upon:" width="140">
+			<button label="Anzeigen" label_selected="Anzeigen" name="ShowOther" right="-135" width="60"/>
+			<button label="Zurückgeben..." label_selected="Zurückgeben..." name="ReturnOther..." tool_tip="Objekte an ihre Eigentümer zurückgeben." right="-10" width="119"/>
+			<text name="Selected / sat upon:" left="14" width="140">
 				Ausgewählt/gesessen auf:
 			</text>
-			<text left="204" name="selected_objects_text" width="48">
+			<text name="selected_objects_text" left="204" width="48">
 				[COUNT]
 			</text>
-			<text left="4" name="Autoreturn" width="380">
+			<text name="Autoreturn" width="380" left="4" >
 				Objekte anderer Einwohner automatisch zurückgeben (Minuten, 0 für aus):
 			</text>
 			<line_editor name="clean other time" right="-10" width="56" />
-			<text type="string" length="1" name="Object Owners:">
+			<text name="Object Owners:">
 				Objekteigentümer:
 			</text>
-			<button label="Liste aktualisieren" label_selected="Liste aktualisieren"
-			     name="Refresh List" />
-			<button label="Objekte zurückgeben..." label_selected="Objekte zurückgeben..."
-			     name="Return objects..." />
-			<button label="" label_selected="" name="Type" tool_tip="Nach Typ sortieren" />
-			<button label="Name" label_selected="Name" name="Name" tool_tip="Nach Name sortieren" />
-			<button label="Zählen" label_selected="Zählen" name="Count"
-			     tool_tip="Nach Anzahl sortieren" />
-			<name_list label="Zählen" name="owner list">
-				<column label="Typ" name="type" />
-				<column label="Name" name="name" />
-				<column label="Zählen" name="count" />
+			<button label="Liste aktualisieren" label_selected="Liste aktualisieren" name="Refresh List"/>
+			<button label="Objekte zurückgeben..." label_selected="Objekte zurückgeben..." name="Return objects..."/>
+			<name_list name="owner list">
+				<column label="Typ" name="type"/>
+				<column label="Name" name="name"/>
+				<column label="Zählen" name="count"/>
+				<column label="Aktuellster" name="mostrecent"/>
 			</name_list>
-			/&gt;
 		</panel>
 		<panel label="Optionen" name="land_options_panel">
-			<text type="string" length="1" name="allow_label">
+			<text name="allow_label">
 				Anderen Einwohnern gestatten:
 			</text>
-			<check_box label="Terrain bearbeiten" name="edit land check" />
-			<check_box label="Landmarken erstellen" name="check landmark" />
-			<check_box label="Fliegen" name="check fly" />
-			<text type="string" length="1" name="allow_label2">
+			<check_box label="Terrain bearbeiten" name="edit land check" tool_tip="Falls aktiviert, kann jeder Ihr Land terraformen. Am besten ist es, wenn Sie diese Option deaktiviert lassen. Sie können Ihr eigenes Land jederzeit bearbeiten."/>
+			<check_box label="Landmarken erstellen" name="check landmark"/>
+			<check_box label="Fliegen" name="check fly" tool_tip="Falls aktiviert, können Einwohner auf Ihrem Land fliegen. Falls nicht aktiviert, können Einwohner lediglich auf Ihr Land fliegen und dort landen (dann jedoch nicht wieder weiterfliegen) oder über Ihr Land hinweg fliegen."/>
+			<text name="allow_label2">
 				Objekte erstellen:
 			</text>
-			<check_box label="Alle Einwohner" name="edit objects check" />
-			<check_box label="Gruppe" name="edit group objects check" />
-			<text type="string" length="1" name="allow_label3">
+			<check_box label="Alle Einwohner" name="edit objects check"/>
+			<check_box label="Gruppe" name="edit group objects check"/>
+			<text name="allow_label3">
 				Objekteintritt:
 			</text>
-			<check_box label="Alle Einwohner" name="all object entry check" />
-			<check_box label="Gruppe" name="group object entry check" />
-			<text type="string" length="1" name="allow_label4">
+			<check_box label="Alle Einwohner" name="all object entry check"/>
+			<check_box label="Gruppe" name="group object entry check"/>
+			<text name="allow_label4">
 				Skripts ausführen:
 			</text>
-			<check_box label="Alle Einwohner" name="check other scripts" />
-			<check_box label="Gruppe" name="check group scripts" />
-			<text type="string" length="1" name="land_options_label">
+			<check_box label="Alle Einwohner" name="check other scripts"/>
+			<check_box label="Gruppe" name="check group scripts"/>
+			<text name="land_options_label">
 				Landoptionen:
 			</text>
-			<check_box label="Sicher (kein Schaden)" name="check safe" />
-			<check_box label="Stoßen beschränken" name="PushRestrictCheck"
-			     tool_tip="llPushObject funktioniert nur in Skripts des Parzelleneigentümers oder in Skripts, die dem Stoßenden gehören." />
-			<check_box label="Ort in Suche anzeigen (30 L$/Woche) unter" name="ShowDirectoryCheck"
-			     tool_tip="Diese Parzelle in Suchergebnissen anzeigen." />
-			<combo_box left="266" max_chars="20" mouse_opaque="true" name="land category" width="130">
+			<check_box label="Sicher (kein Schaden)" name="check safe" tool_tip="Falls aktiviert, wird Land auf Option „Sicher“ eingestellt, Kampfschäden sind deaktiviert. Falls nicht aktiviert, sind Kampfschäden aktiviert."/>
+			<check_box label="Kein Stoßen" name="PushRestrictCheck" tool_tip="Verhindert Skripte am Stoßen. Durch Aktivieren dieser Option verhindern Sie störendes Verhalten auf Ihrem Land."/>
+			<check_box label="Ort in Suche anzeigen (30 L$/Woche) unter" name="ShowDirectoryCheck" tool_tip="Diese Parzelle in Suchergebnissen anzeigen."/>
+			<combo_box name="land category" left="266" width="130">
 				<combo_item name="AnyCategory">
 					Alle Kategorien
 				</combo_item>
@@ -322,67 +294,59 @@
 					Sonstige
 				</combo_item>
 			</combo_box>
-			<check_box label="Ab-18-Inhalt" name="MatureCheck"
-			     tool_tip="Die Informationen oder Inhalte Ihrer Parzelle sind nicht jugenfrei." />
-			<check_box label="Liste im Web veröffentlichen" name="PublishCheck"
-			     tool_tip="Veröffentlicht Informationen über Ihre Parzelle im Web." />
-			<button label="?" label_selected="?" name="?" />
-			<text type="string" length="1" name="Snapshot:">
+			<button label="?" label_selected="?" name="?"/>
+			<check_box label="Ab-18-Inhalt" name="MatureCheck" tool_tip="Die Informationen oder Inhalte Ihrer Parzelle sind nicht jugenfrei."/>
+			<text name="Snapshot:">
 				Foto:
 			</text>
-			<texture_picker label="" name="snapshot_ctrl"
-			     tool_tip="Klicken Sie hier, um ein Bild auszuwählen" />
-			<text type="string" length="1" name="Landing Point: (none)">
-				Landepunkt: (keiner)
-			</text>
+			<texture_picker label="" name="snapshot_ctrl" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
 			<text name="landing_point">
 				Landepunkt: [LANDING]
 			</text>
-			<text name="landing_point_none">
-				(-)
-			</text>
-			<button label="Festlegen" label_selected="Festlegen" left="234" name="Set"
-			     tool_tip="Den Landepunkt auf die aktuelle Position des Avatars setzen. Muss sich innerhalb dieser Parzelle befinden."
-			     width="70" />
-			<button label="Löschen" label_selected="Löschen" left="312" name="Clear"
-			     tool_tip="Landepunkt löschen." width="70" />
-			<text type="string" length="1" name="Teleport Routing: ">
+			<string name="landing_point_none">
+				(keiner)
+			</string>
+			<button label="Festlegen" label_selected="Festlegen" name="Set" tool_tip="Legt den Landepunkt fest, an dem Besucher ankommen. Legt die Position Ihres Avatars innerhalb dieser Parzelle fest." width="70" left="234"/>
+			<button label="Löschen" label_selected="Löschen" name="Clear" tool_tip="Landepunkt löschen." width="70" left="312"/>
+			<text name="Teleport Routing: ">
 				Teleport-Route:
 			</text>
-			<combo_box name="landing type"
-			     tool_tip="Teleport Routing -- select how to handle teleports onto your land.">
-				<combo_item type="string" length="1" name="Blocked">
+			<combo_box name="landing type" tool_tip="Teleport-Route -- festlegen, wie Teleports auf Ihrem Land gehandhabt werden sollen." >
+				<combo_item name="Blocked">
 					Blockiert
 				</combo_item>
-				<combo_item type="string" length="1" name="LandingPoint">
+				<combo_item name="LandingPoint">
 					Landepunkt
 				</combo_item>
-				<combo_item type="string" length="1" name="Anywhere">
+				<combo_item name="Anywhere">
 					Überall
 				</combo_item>
 			</combo_box>
-			<text name="push_restrict_text">
-				Stoßen beschränken
-			</text>
-			<text name="push_restrict_region_text">
-				Stoßen beschränken (regional)
-			</text>
+			<string name="push_restrict_text">
+				Kein Stoßen
+			</string>
+			<string name="push_restrict_region_text">
+				Kein Stoßen (regional)
+			</string>
 		</panel>
 		<panel label="Medien" name="land_media_panel">
-			<text name="at URL:">
-				Medien-URL:
-			</text>
-			<button label="Einstellen..." label_selected="Einstellen..." name="set_media_url" />
 			<text name="with media:">
 				Medientyp:
 			</text>
-			<combo_box name="media type"
-			     tool_tip="Geben Sie einen URL für den Film, die Webseite oder ein anderes Medium ein" />
+			<combo_box name="media type" tool_tip="Geben Sie einen URL für den Film, die Webseite oder ein anderes Medium ein"/>
+			<text name="at URL:">
+				Medien-URL:
+			</text>
+			<button label="Einstellen..." label_selected="Einstellen..." name="set_media_url"/>
 			<text name="Description:">
 				Inhalt:
 			</text>
-			<line_editor name="url_description"
-			     tool_tip="Text, der neben der Abspielen/Laden-Schaltfläche angezeigt wird" />
+			<line_editor name="url_description" tool_tip="Text, der neben der Abspielen/Laden-Schaltfläche angezeigt wird"/>
+			<text name="Media texture:">
+				Textur
+ersetzen:
+			</text>
+			<texture_picker label="" name="media texture" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
 			<text name="replace_texture_help">
 				(Objekte mit dieser Textur zeigen nach Anklicken
 des Abspielen-Pfeils den Film oder die Webseite an.)
@@ -391,20 +355,15 @@ des Abspielen-Pfeils den Film oder die Webseite an.)
 				Medien-
 Optionen:
 			</text>
-			<check_box label="Als Schleife wiedergeben" name="media_loop"
-			     tool_tip="Spielt das Medium in einer Schleife ab.  Der Abspielvorgang wird immer wieder von vorne fortgesetzt." />
-			<check_box label="Medien-URL verstecken" name="hide_media_url"
-			     tool_tip="Aktivieren Sie diese Option, wenn Sie nicht möchten, dass unautorisierte Personen die Medien-URL sehen können. Diese Option ist für HTML-Medien nicht verfügbar." />
-			<check_box label="Musik-URL verstecken" name="hide_music_url"
-			     tool_tip="Aktivieren Sie diese Option, wenn Sie nicht möchten, dass unautorisierte Personen die Musik-URL sehen können." />
-			<text name="media_size"
-			     tool_tip="Darstellungsgröße von Webmedien, für Standard bei 0 belassen.">
+			<check_box label="Automatisch skalieren" name="media_auto_scale" tool_tip="Aktivieren Sie diese Option, um den Inhalt für diese Parzelle automatisch zu skalieren. Dies ist eventuell langsamer und die Qualität ist schlechter, aber Sie müssen keine weitere Texturskalierung oder -anpassung vornehmen."/>
+			<check_box label="Als Schleife wiedergeben" name="media_loop" tool_tip="Spielt das Medium in einer Schleife ab.  Der Abspielvorgang wird immer wieder von vorne fortgesetzt."/>
+			<check_box label="Medien-URL verstecken" name="hide_media_url" tool_tip="Aktivieren Sie diese Option, wenn Sie nicht möchten, dass unautorisierte Personen die Medien-URL sehen können. Diese Option ist für HTML-Medien nicht verfügbar."/>
+			<check_box label="Musik-URL verstecken" name="hide_music_url" tool_tip="Aktivieren Sie diese Option, wenn Sie nicht möchten, dass unautorisierte Personen die Musik-URL sehen können."/>
+			<text name="media_size" tool_tip="Darstellungsgröße von Webmedien, für Standard bei 0 belassen.">
 				Größe:
 			</text>
-			<spinner name="media_size_width"
-			     tool_tip="Darstellungsgröße von Webmedien, für Standard bei 0 belassen." />
-			<spinner name="media_size_height"
-			     tool_tip="Darstellungsgröße von Webmedien, für Standard bei 0 belassen." />
+			<spinner name="media_size_width" tool_tip="Darstellungsgröße von Webmedien, für Standard bei 0 belassen."/>
+			<spinner name="media_size_height" tool_tip="Darstellungsgröße von Webmedien, für Standard bei 0 belassen."/>
 			<text name="pixels">
 				Pixel
 			</text>
@@ -414,28 +373,11 @@ Optionen:
 			<text name="Sound:">
 				Sound:
 			</text>
-			<check_box label="Umgebungssound auf diese Parzelle beschränken" name="check sound local" />
-			<text type="string" length="1" name="Music URL:">
-				Musik-URL:
-			</text>
-			<text type="string" length="1" name="Media texture:">
-				Textur
-ersetzen:
-			</text>
-			<text type="string" length="1" name="Replace this texture:">
-				Diese Textur ersetzen:
-			</text>
-			<texture_picker label="" name="media texture"
-			     tool_tip="Klicken Sie hier, um ein Bild auszuwählen" />
-			<text type="string" length="1" name="with content from this URL:">
-				mit Inhalt von diesem URL ersetzen:
-			</text>
-			<check_box label="Automatisch skalieren" name="media_auto_scale"
-			     tool_tip="Aktivieren Sie diese Option, um den Inhalt für diese Parzelle automatisch zu skalieren. Dies ist eventuell langsamer und die Qualität ist schlechter, aber Sie müssen keine weitere Texturskalierung oder -anpassung vornehmen." />
+			<check_box label="Umgebungssound auf diese Parzelle beschränken" name="check sound local"/>
 			<text name="Voice settings:">
 				Voice:
 			</text>
-			<radio_group name="parcel_voice_channel">
+			<radio_group name="parcel_voice_channel" width="310">
 				<radio_item name="Estate">
 					Voice-Channel des Grundstücks verwenden
 				</radio_item>
@@ -448,67 +390,42 @@ ersetzen:
 			</radio_group>
 		</panel>
 		<panel label="Zugang" name="land_access_panel">
-			<text type="string" length="1" name="Limit access to this parcel to:">
+			<text name="Limit access to this parcel to:">
 				Zugang zu dieser Parzelle
 			</text>
-			<check_box label="Freien Zugang erlauben" name="public_access" />
+			<check_box label="Freien Zugang erlauben" name="public_access"/>
 			<text name="Only Allow">
 				Zugang verweigern für:
 			</text>
-			<check_box
-			     label="Einwohner, die keine Zahlungsinformationen bei Linden Lab hinterlegt haben"
-			     name="limit_payment" tool_tip="Nicht identifizierte Einwohner verbannen." />
-			<check_box label="Einwohner, die keine altersgeprüften Erwachsenen sind"
-			     name="limit_age_verified"
-			     tool_tip="Einwohner ohne Altersprüfung verbannen. Weitere Informationen finden Sie auf support.secondlife.com." />
+			<check_box label="Einwohner, die keine Zahlungsinformationen bei Linden Lab hinterlegt haben" name="limit_payment" tool_tip="Nicht identifizierte Einwohner verbannen."/>
+			<check_box label="Einwohner, die keine altersgeprüften Erwachsenen sind" name="limit_age_verified" tool_tip="Einwohner ohne Altersprüfung verbannen. Weitere Informationen finden Sie auf support.secondlife.com."/>
 			<string name="estate_override">
 				Eine oder mehrere dieser Optionen gelten auf Grundstücksebene
 			</string>
-			<check_box label="Gruppenzugang erlauben: [GROUP]" name="GroupCheck"
-			     tool_tip="Gruppe im Register &apos;Allgemein&apos; festlegen." />
+			<check_box label="Gruppenzugang erlauben: [GROUP]" name="GroupCheck" tool_tip="Gruppe im Register „Allgemein“ festlegen."/>
+			<check_box label="Pässe verkaufen an:" name="PassCheck" tool_tip="Ermöglicht befristeten Zugang zu dieser Parzelle"/>
 			<combo_box name="pass_combo">
 				<combo_item name="Anyone">
-					Jeder
+					Jeden
 				</combo_item>
 				<combo_item name="Group">
 					Gruppe
 				</combo_item>
 			</combo_box>
+			<spinner label="Preis in L$:" name="PriceSpin"/>
+			<spinner label="Online-Zeit:" name="HoursSpin"/>
 			<text label="Immer erlauben" name="AllowedText">
 				Zulässige Einwohner
 			</text>
-			<button label="Hinzufügen..." label_selected="Hinzufügen..." name="add_allowed" />
-			<button label="Entfernen" label_selected="Entfernen" name="remove_allowed" />
-			<check_box label="Verbannen" name="BanCheck">
+			<name_list name="AccessList" tool_tip="([LISTED] angezeigt, max. [MAX])"/>
+			<button label="Hinzufügen..." label_selected="Hinzufügen..." name="add_allowed"/>
+			<button label="Entfernen" label_selected="Entfernen" name="remove_allowed"/>
+			<text label="Verbannen" name="BanCheck">
 				Verbannte Einwohner
-			</check_box>
-			<name_list name="AccessList" tool_tip="([LISTED] angezeigt, max. [MAX])">
-				<column label="Allowed Residents" name="name" />
-			</name_list>
-			<button label="Hinzufügen..." label_selected="Hinzufügen..." name="Add..." />
-			<button label="Entfernen" label_selected="Entfernen" name="Remove" />
-			<check_box label="Pässe verkaufen an:" name="PassCheck"
-			     tool_tip="Ermöglicht befristeten Zugang zu dieser Parzelle" />
-			<spinner label="Preis in L$:" name="PriceSpin" />
-			<spinner label="Online-Zeit:" name="HoursSpin" />
-			<name_list name="BannedList" tool_tip="([LISTED] angezeigt, max. [MAX])" />
-			<button label="Hinzufügen..." label_selected="Hinzufügen..." name="add_banned" />
-			<button label="Entfernen" label_selected="Entfernen" name="remove_banned" />
-		</panel>
-		<panel label="Verbannen" name="land_ban_panel">
-			<check_box label="Diese Avatare verbannen: ([LISTED] angezeigt, max. [MAX])"
-			     name="LandBanCheck" />
-			<name_list name="LandBanList">
-				<column label="Banned Residents" name="name" />
-			</name_list>
-			<button label="Hinzufügen..." label_selected="Hinzufügen..." name="Add..." />
-			<button label="Entfernen" label_selected="Entfernen" name="Remove" />
-			<text type="string" length="1" name="Deny by Payment Status:">
-				Nach Zahlungsstatus verweigern:
-			</text>
-			<check_box label="Verweigern - keine archivierte Zahlungsinfo" name="DenyAnonymousCheck" />
-			<check_box label="Verweigern - Zahlungsinfo archiviert" name="DenyIdentifiedCheck" />
-			<check_box label="Verweigern - Zahlungsinfo verwendet" name="DenyTransactedCheck" />
+			</text>
+			<name_list name="BannedList" tool_tip="([LISTED] angezeigt, max. [MAX])"/>
+			<button label="Hinzufügen..." label_selected="Hinzufügen..." name="add_banned"/>
+			<button label="Entfernen" label_selected="Entfernen" name="remove_banned"/>
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_animation_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_preview.xml
index 3cbcf081b5..299b6a7f7e 100644
--- a/indra/newview/skins/default/xui/de/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_animation_preview.xml
@@ -1,42 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Animation Preview" title="">
 	<text name="name_label">
 		Name:
 	</text>
-	<line_editor name="name_form" />
+	<line_editor name="name_form"/>
 	<text name="description_label">
 		Beschreibung:
 	</text>
-	<spinner label="Priorität" name="priority"
-	     tool_tip="Steuert, welche Animationen von dieser Animation überschrieben werden können." />
-	<text name="preview_label" width="97">
-		Vorschau während:
-	</text>
-	<combo_box label="" left_delta="107" name="preview_base_anim"
-	     tool_tip="Use this to test your animation behavior while your avatar performs common actions.">
-		<combo_item name="Standing">
-			Stehend
-		</combo_item>
-		<combo_item name="Walking">
-			Geht
-		</combo_item>
-		<combo_item name="Sitting">
-			Sitzt
-		</combo_item>
-		<combo_item name="Flying">
-			Fliegend
-		</combo_item>
-	</combo_box>
-	<check_box label="Schleife" name="loop_check" tool_tip="Erzeugt eine Animationsschleife." bottom_delta="-18" />
-	<spinner label="In (%)" name="loop_in_point"
-	     tool_tip="Anfang einer Animationsschleife festlegen." />
-	<spinner label="Aus (%)" name="loop_out_point"
-	     tool_tip="Ende einer Animationsschleife festlegen." />
+	<spinner label="Priorität" name="priority" tool_tip="Steuert, welche Animationen von dieser Animation überschrieben werden können."/>
+	<check_box bottom_delta="-18" label="Schleife" name="loop_check" tool_tip="Erzeugt eine Animationsschleife."/>
+	<spinner label="In (%)" name="loop_in_point" tool_tip="Anfang einer Animationsschleife festlegen."/>
+	<spinner label="Aus (%)" name="loop_out_point" tool_tip="Ende einer Animationsschleife festlegen."/>
 	<text name="hand_label">
 		Handhaltung
 	</text>
-	<combo_box label="" name="hand_pose_combo"
-	     tool_tip="Controls what hands do during animation.">
+	<combo_box label="" name="hand_pose_combo" tool_tip="Steuert während der Animation die Bewegung der Hände.">
 		<combo_item name="Spread">
 			Dehnen
 		</combo_item>
@@ -80,10 +58,9 @@
 	<text name="emote_label">
 		Ausdruck
 	</text>
-	<combo_box label="" name="emote_combo"
-	     tool_tip="Controls what face does during animation.">
+	<combo_box label="" name="emote_combo" tool_tip="Steuert Gesichtsregungen während der Animation.">
 		<combo_item name="[None]">
-			[None]
+			[Keine]
 		</combo_item>
 		<combo_item name="Aaaaah">
 			Aaaaah
@@ -119,7 +96,7 @@
 			Lachen
 		</combo_item>
 		<combo_item name="Plllppt">
-			Plllppt
+			Bäääh
 		</combo_item>
 		<combo_item name="Repulsed">
 			Zurückgestoßen
@@ -143,31 +120,46 @@
 			Sorgenvoll
 		</combo_item>
 	</combo_box>
-	<spinner label="Eingang glätten (s)" name="ease_in_time"
-	     tool_tip="Einblendungsgeschwindigkeit von Animationen (in Sekunden)." label_width="105" width="175"  />
-	<spinner label="Ausgang glätten (s)" name="ease_out_time"
-	     tool_tip="Ausblendungsgeschwindigkeit von Animationen (in Sekunden)." left="10" bottom_delta="-20" label_width="105" width="175" />
-	<button label="" name="play_btn" tool_tip="Animation stoppen/wiedergeben." bottom_delta="-32" />
-	<button label="" name="stop_btn" tool_tip="Animation anhalten" />
-	<slider label="" name="playback_slider" />
+	<text name="preview_label" width="97">
+		Vorschau während:
+	</text>
+	<combo_box label="" left_delta="107" name="preview_base_anim" tool_tip="Hiermit können Sie das Verhalten Ihres Avatars testen, während Ihr Avatar normale Bewegungen ausführt.">
+		<combo_item name="Standing">
+			Stehend
+		</combo_item>
+		<combo_item name="Walking">
+			Geht
+		</combo_item>
+		<combo_item name="Sitting">
+			Sitzt
+		</combo_item>
+		<combo_item name="Flying">
+			Fliegend
+		</combo_item>
+	</combo_box>
+	<spinner label="Eingang glätten (s)" label_width="105" name="ease_in_time" tool_tip="Einblendungsgeschwindigkeit von Animationen (in Sekunden)." width="175"/>
+	<spinner bottom_delta="-20" label="Ausgang glätten (s)" label_width="105" left="10" name="ease_out_time" tool_tip="Ausblendungsgeschwindigkeit von Animationen (in Sekunden)." width="175"/>
+	<button bottom_delta="-32" label="" name="play_btn" tool_tip="Animation stoppen/wiedergeben."/>
+	<button label="" name="stop_btn" tool_tip="Animation anhalten"/>
+	<slider label="" name="playback_slider"/>
 	<text name="bad_animation_text">
 		Animationsdatei konnte nicht gelesen werden.
-	
-	Wir empfehlen exportierte BVH-Dateien aus Poser 4.
+
+Wir empfehlen exportierte BVH-Dateien aus Poser 4.
 	</text>
-	<button label="Abbrechen" name="cancel_btn" />
-	<button label="Hochladen ([AMOUNT] L$)" name="ok_btn" />
-	<text name="failed_to_initialize">
+	<button label="Abbrechen" name="cancel_btn"/>
+	<button label="Hochladen ([AMOUNT] L$)" name="ok_btn"/>
+	<string name="failed_to_initialize">
 		Bewegung konnte nicht initialisiert werden
-	</text>
-	<text name="anim_too_long">
+	</string>
+	<string name="anim_too_long">
 		Animationsdatei ist [LENGTH] Sekunden lang.
 
 Maximal erlaubt sind [MAX_LENGTH] Sekunden.
-	</text>
-	<text name="failed_file_read">
+	</string>
+	<string name="failed_file_read">
 		Animationsdatei konnte nicht gelesen werden.
 
 [STATUS]
-	</text>
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_avatar_picker.xml b/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
index f02ffd22e2..b6b8792345 100644
--- a/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
@@ -12,6 +12,6 @@ Einwohners ein:
 	<button label="Auswählen" label_selected="Auswählen" name="Select" />
 	<button label="Schließen" label_selected="Schließen" name="Close" />
 	<text name="NotFound">
-		&apos;[TEXT]&apos; nicht gefunden
+		„[TEXT]“ nicht gefunden
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
index edf80f1dfb..13c41560b7 100644
--- a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="avatar_texture_debug" title="Avatar-Texturen">
-	<text name="">
-		Geformte Texturen not sure about this one ... missing context
-	</text>
-	<text name="">
-		Zusammengesetzte Texturen
-	</text>
-	<text name="baked_label">
+	<text name="baked_label" width="128">
 		Gebackene Texturen
 	</text>
-	<text name="composite_label">
+	<text name="composite_label" width="150">
 		Zusammengesetzte Texturen
 	</text>
 	<texture_picker label="Kopf" name="baked_head" />
-	<texture_picker label="Make-Uup" name="head_bodypaint" />
+	<texture_picker label="Make-Up" name="head_bodypaint" />
 	<texture_picker label="Haar" name="hair" />
 	<button label="Abladen" label_selected="Abladen" name="Dump" />
 	<texture_picker label="Augen" name="baked_eyes" />
diff --git a/indra/newview/skins/default/xui/de/floater_buy_contents.xml b/indra/newview/skins/default/xui/de/floater_buy_contents.xml
index c2ee63e597..01858b3c36 100644
--- a/indra/newview/skins/default/xui/de/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_contents.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_buy_contents" title="Inhalte kaufen">
+<floater name="floater_buy_contents" title="Inhalte kaufen" min_width="300">
 	<text name="contains_text">
 		[NAME] enthält:
 	</text>
 	<text name="buy_text">
 		[AMOUNT] L$ von [NAME] kaufen?
 	</text>
-	<button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn" />
+	<button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn" width="73" />
 	<button label="Kaufen" label_selected="Kaufen" name="buy_btn" />
 	<check_box label="Kleidung jetzt anziehen" name="wear_check" />
 	<text name="no_copy_text">
diff --git a/indra/newview/skins/default/xui/de/floater_buy_land.xml b/indra/newview/skins/default/xui/de/floater_buy_land.xml
index adfa766005..332c900190 100644
--- a/indra/newview/skins/default/xui/de/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_land.xml
@@ -52,7 +52,7 @@
 	<text name="info_price">
 		1500 L$, Objekte eingeschlossen
 	</text>
-	<text name="info_action">
+	<text name="info_action" width="275">
 		Bei Landkauf:
 	</text>
 	<text name="error_message">
@@ -204,9 +204,7 @@ unterstützt [AMOUNT2] Objekte
 		mit Objekten verkauft
 	</text>
 	<text name="insufficient_land_credits">
-		Die Gruppe [GROUP] benötigt ausreichende 
-Landnutzungsrechte für diese Parzelle, um den Kauf 
-abzuschließen.
+		Die Gruppe [GROUP] benötigt ausreichende Landnutzungsrechte für diese Parzelle, um den Kauf abzuschließen.
 	</text>
 	<text name="have_enough_lindens">
 		Sie haben [AMOUNT] L$, genug zum Kauf dieses Landes.
diff --git a/indra/newview/skins/default/xui/de/floater_buy_object.xml b/indra/newview/skins/default/xui/de/floater_buy_object.xml
index 910df26c96..3cfa59ff06 100644
--- a/indra/newview/skins/default/xui/de/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_object.xml
@@ -6,7 +6,7 @@
 	<text name="buy_text">
 		[AMOUNT] L$ von [NAME] kaufen?
 	</text>
-	<button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn" />
+	<button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn" width="73" />
 	<button label="Kaufen" label_selected="Kaufen" name="buy_btn" />
 	<text name="title_buy_text">
 		Kaufen
diff --git a/indra/newview/skins/default/xui/de/floater_color_picker.xml b/indra/newview/skins/default/xui/de/floater_color_picker.xml
index c540ad3756..f53a1135dc 100644
--- a/indra/newview/skins/default/xui/de/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/de/floater_color_picker.xml
@@ -13,10 +13,10 @@
 		Farbton:
 	</text>
 	<text name="s_val_text">
-		Sat.:
+		Sätt.:
 	</text>
 	<text name="l_val_text">
-		Lum:
+		Hell.:
 	</text>
 	<check_box label="Sofort übernehmen" name="apply_immediate" />
 	<button label="" label_selected="" name="color_pipette" />
diff --git a/indra/newview/skins/default/xui/de/floater_customize.xml b/indra/newview/skins/default/xui/de/floater_customize.xml
index 65f4fa7a57..7ceb7bd3ae 100644
--- a/indra/newview/skins/default/xui/de/floater_customize.xml
+++ b/indra/newview/skins/default/xui/de/floater_customize.xml
@@ -108,7 +108,7 @@ und diese anziehen.
 			<button label="Farbe" label_selected="Farbe" name="Color" />
 			<button label="Stil" label_selected="Stil" name="Style" />
 			<button label="Augenbrauen" label_selected="Augenbrauen" name="Eyebrows" />
-			<button label="Gesichts" label_selected="Gesichts" name="Facial" />
+			<button label="Gesichtshaar" label_selected="Gesichtshaar" name="Facial" />
 			<text type="string" length="1" name="title">
 				[DESC]
 			</text>
diff --git a/indra/newview/skins/default/xui/de/floater_env_settings.xml b/indra/newview/skins/default/xui/de/floater_env_settings.xml
index b97e3d5dd1..bb9e5efc36 100644
--- a/indra/newview/skins/default/xui/de/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/de/floater_env_settings.xml
@@ -14,7 +14,7 @@
 	</text>
 	<color_swatch name="EnvWaterColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen" />
 	<text name="EnvWaterFogText">
-		Wasser
+		Wasser-
 trübung
 	</text>
 	<button label="Grundstückszeit verw." name="EnvUseEstateTimeButton" />
diff --git a/indra/newview/skins/default/xui/de/floater_god_tools.xml b/indra/newview/skins/default/xui/de/floater_god_tools.xml
index 6356dffa91..dcb6982588 100644
--- a/indra/newview/skins/default/xui/de/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_god_tools.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="godtools floater" title="Gott-Tools">
+<floater name="godtools floater" title="Gott-Werkzeuge">
 	<tab_container name="GodTools Tabs">
 		<panel label="Raster" name="grid">
 			<button label="Alle Benutzer hinauswerfen" label_selected="Alle Benutzer hinauswerfen"
-			     name="Kick all users" />
+			     name="Kick all users" width="175" />
 			<button label="Sichtbarkeits-Cache dieser Regionskarte leeren"
 			     label_selected="Sichtbarkeits-Cache dieser Regionskarte leeren"
-			     name="Flush This Region&apos;s Map Visibility Caches" />
+			     name="Flush This Region&apos;s Map Visibility Caches" width="285" />
 		</panel>
 		<panel label="Region" name="region">
-			<text name="Sim Name:">
+			<text name="Sim Name:" width="55">
 				Sim-Name:
 			</text>
 			<check_box label="Startbereich Einleitung" name="check prelude"
 			     tool_tip="Diese Region zu einem Startbereich machen." />
 			<check_box label="Sonne fest" name="check fixed sun"
-			     tool_tip="Fixiert den Sonnenstand (wie in &apos;Region/Grundstück&apos; &gt; &apos;Terrain&apos;." />
-			<check_box label="Zuhause auf Teleport zurücksetzen" name="check reset home"
-			     tool_tip="Wenn Einwohner wegteleportieren, ihr Zuhause auf Zielposition setzen." />
+			     tool_tip="Fixiert den Sonnenstand (wie in „Region/Grundstück“ &gt; „Terrain“." />
+			<check_box label="Zuhause auf Teleport &#10;zurücksetzen" name="check reset home"
+			     tool_tip="Wenn Einwohner wegteleportieren, ihr Zuhause auf Zielposition setzen." height="32" />
 			<check_box label="Sichtbar" name="check visible"
-			     tool_tip="Diese Region für Nicht-Götter sichtbar machen." />
+			     tool_tip="Diese Region für Nicht-Götter sichtbar machen." bottom_delta="-32" />
 			<check_box label="Schaden" name="check damage"
 			     tool_tip="Schaden in dieser Region aktivieren." />
 			<check_box label="Trafficüberwachung blockieren" name="block dwell"
@@ -29,28 +29,30 @@
 			<check_box label="Sandkasten" name="is sandbox"
 			     tool_tip="Sandkastenregion ein-/ausschalten." />
 			<button label="Terrain formen" label_selected="Terrain formen" name="Bake Terrain"
-			     tool_tip="Das aktuelle Terrain als Standard speichern." />
+			     tool_tip="Das aktuelle Terrain als Standard speichern." width="118" />
 			<button label="Terrain zurücksetzen" label_selected="Terrain zurücksetzen"
 			     name="Revert Terrain"
-			     tool_tip="Das aktuelle Terrain mit dem Standard ersetzen." />
+			     tool_tip="Das aktuelle Terrain mit dem Standard ersetzen." width="118" />
 			<button label="Terrain tauschen" label_selected="Terrain tauschen" name="Swap Terrain"
-			     tool_tip="Aktuelles Terrain gegen Standard austauschen." />
+			     tool_tip="Aktuelles Terrain gegen Standard austauschen." width="118" />
 			<text name="estate id">
 				Grundstücks-ID:
 			</text>
 			<text name="parent id">
-				Übergeordnet-ID:
+				Parent ID:
 			</text>
 			<line_editor name="parentestate" tool_tip="Das übergeordnete Grundstück dieser Region" />
 			<text name="Grid Pos: ">
 				Raster-Pos.:
 			</text>
-			<line_editor name="gridposx" tool_tip="Die X-Rasterposition dieser Region" />
-			<line_editor name="gridposy" tool_tip="Die Y-Rasterposition dieser Region" />
-			<text name="Redirect to Grid: ">
+			<line_editor name="gridposx" tool_tip="Die X-Rasterposition dieser Region" left_delta="110" width="35" />
+			<line_editor name="gridposy" tool_tip="Die Y-Rasterposition dieser Region" left_delta="45" width="35" />
+			<text name="Redirect to Grid: " >
 				Auf Raster umleiten:
 			</text>
-			<text name="billable factor text">
+			<line_editor left_delta="110" name="redirectx" width="35" />
+			<line_editor left_delta="45" name="redirecty" width="35" />
+			<text name="billable factor text" font="SansSerifSmall" >
 				Abrechnungsfaktor:
 			</text>
 			<text name="land cost text">
@@ -62,21 +64,21 @@
 			     tool_tip="Klicken Sie hier, um die obigen Änderungen zu übernehmen." />
 			<button label="Region auswählen" label_selected="Region auswählen"
 			     name="Select Region"
-			     tool_tip="Die gesamte Region mit dem Landwerkzeug auswählen." />
+			     tool_tip="Die gesamte Region mit dem Landwerkzeug auswählen." width="130" left="136"/>
 			<button label="Automatisch speichern" label_selected="Automatisch speichern"
 			     name="Autosave now"
-			     tool_tip="gzipped-Status im Autosave-Verzeichnis speichern." />
+			     tool_tip="gzipped-Status im Autosave-Verzeichnis speichern." width="130" left="136"/>
 		</panel>
 		<panel label="Objekte" name="objects">
-			<text name="Sim Name:">
+			<text name="Sim Name:" width="55">
 				Sim-Name:
 			</text>
 			<text name="region name">
-				Walisisch
+				Welsh
 			</text>
-			<check_box label="Skripts deaktivieren" name="disable scripts"
+			<check_box label="Skripts &#10;deaktivieren" name="disable scripts"
 			     tool_tip="Skripts in dieser Region komplett abschalten" />
-			<check_box label="Kollisionen deaktivieren" name="disable collisions"
+			<check_box label="Kollisionen &#10;deaktivieren" name="disable collisions"
 			     tool_tip="Nicht-Avatar-Kollisionen in dieser Region komplett abschalten" />
 			<check_box label="Physik deaktivieren" name="disable physics"
 			     tool_tip="Die Physik in dieser Region komplett abschalten" />
@@ -101,12 +103,12 @@
 			     tool_tip="Alle dem Ziel gehörenden Objekte in dieser Region löschen. Objekte (nicht kopierfähig) werden zurückgegeben." />
 			<button label="Top-Kollisionsobjekte" label_selected="Top-Kollisionsobjekte"
 			     name="Get Top Colliders"
-			     tool_tip="Zeigt eine Liste der Objekte mit den meisten Callbacks in der nahen Phase an." />
+			     tool_tip="Zeigt eine Liste der Objekte mit den meisten Callbacks in der nahen Phase an." width="130" />
 			<button label="Top-Skripts" label_selected="Top-Skripts" name="Get Top Scripts"
-			     tool_tip="Zeigt eine Liste der Objekte an, die die meiste Zeit über Skripts ausführen." />
+			     tool_tip="Zeigt eine Liste der Objekte an, die die meiste Zeit über Skripts ausführen." width="130" />
 			<button label="Scripting-Übersicht" label_selected="Scripting-Übersicht"
 			     name="Scripts digest"
-			     tool_tip="Zeigt eine Liste aller Skripts mit Häufigkeit an." />
+			     tool_tip="Zeigt eine Liste aller Skripts mit Häufigkeit an." width="130" />
 		</panel>
 		<panel label="Anfrage" name="request">
 			<text name="Destination:">
diff --git a/indra/newview/skins/default/xui/de/floater_inspect.xml b/indra/newview/skins/default/xui/de/floater_inspect.xml
index e0f43df0c9..afe7bec2fa 100644
--- a/indra/newview/skins/default/xui/de/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/de/floater_inspect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="inspect" title="Objekt prüfen" min_width="440" >
+<floater name="inspect" title="Objekt prüfen" min_width="450" >
 	<scroll_list name="object_list"
 	     tool_tip="Wählen Sie ein Objekt aus dieser Liste, um es in der Second Life-Welt zu markieren">
 		<column label="Objektname" name="object_name" />
diff --git a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
index 2b63a90a19..0028f1da13 100644
--- a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
@@ -30,7 +30,7 @@
 		Sie können:
 	</text>
 	<check_box label="Bearbeiten" name="CheckOwnerModify" />
-	<check_box label="Kopieren" name="CheckOwnerCopy" />
+	<check_box label="Kopieren" name="CheckOwnerCopy" left_delta="85" />
 	<check_box label="Verkaufen/Weggeben" name="CheckOwnerTransfer" />
 	<text name="BaseMaskDebug">
 		B:
diff --git a/indra/newview/skins/default/xui/de/floater_lagmeter.xml b/indra/newview/skins/default/xui/de/floater_lagmeter.xml
index dffbf9ef36..91ae544887 100644
--- a/indra/newview/skins/default/xui/de/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/de/floater_lagmeter.xml
@@ -99,7 +99,7 @@
 		Ping-Zeit der Verbindung liegt bei [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
 	</text>
 	<text name="network_packet_loss_cause_msg">
-		Möglicherweise schlechte Verbindung oder zu hoher Wert für &apos;Bandbreite&apos;.
+		Möglicherweise schlechte Verbindung oder zu hoher Wert für „Bandbreite“.
 	</text>
 	<text name="network_ping_cause_msg">
 		Möglicherweise schlechte Verbindung oder File-Sharing-Anwendung.
diff --git a/indra/newview/skins/default/xui/de/floater_land_holdings.xml b/indra/newview/skins/default/xui/de/floater_land_holdings.xml
index f9dcfc9c8a..25944895a2 100644
--- a/indra/newview/skins/default/xui/de/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/de/floater_land_holdings.xml
@@ -2,8 +2,8 @@
 <floater name="land holdings floater" title="Mein Land">
 	<scroll_list name="parcel list">
 		<column label="Name" name="name" />
-		<column label="Location" name="location" />
-		<column label="Area" name="area" />
+		<column label="Lage" name="location" />
+		<column label="Gebiet" name="area" />
 		<column label="" name="hidden" />
 	</scroll_list>
 	<button label="Teleportieren" label_selected="Teleportieren" name="Teleport"
@@ -14,8 +14,8 @@
 		Beiträge zu Ihren Gruppen:
 	</text>
 	<scroll_list name="grant list">
-		<column label="Group" name="group" />
-		<column label="Area" name="area" />
+		<column label="Gruppe" name="group" />
+		<column label="Gebiet" name="area" />
 	</scroll_list>
 	<text name="allowed_label">
 		Zulässiger Landbesitz bei aktuellem Zahlungsplan:
diff --git a/indra/newview/skins/default/xui/de/floater_lsl_guide.xml b/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
index 3f4a6237f1..f45983b9d6 100644
--- a/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
@@ -3,5 +3,5 @@
 	<check_box label="Cursor folgen" name="lock_check" />
 	<combo_box label="Sperren" name="history_combo" />
 	<button label="Zurück" name="back_btn" />
-	<button label="Weiterleiten" name="fwd_btn" width="82" />
+	<button label="Weiter" name="fwd_btn" />
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_openobject.xml b/indra/newview/skins/default/xui/de/floater_openobject.xml
index c7f9b744ef..0b5a36578e 100644
--- a/indra/newview/skins/default/xui/de/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/de/floater_openobject.xml
@@ -4,7 +4,7 @@
 		[DESC]:
 	</text>
 	<button label="In Inventar kopieren" label_selected="In Inventar kopieren"
-	     name="copy_to_inventory_button" />
+	     name="copy_to_inventory_button" width="132" />
 	<button label="Kopieren und anziehen" label_selected="Kopieren und anziehen"
-	     name="copy_and_wear_button" />
+	     name="copy_and_wear_button" width="132" left="150" />
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_pay_object.xml b/indra/newview/skins/default/xui/de/floater_pay_object.xml
index b3d8921ee4..eaf95a9e9e 100644
--- a/indra/newview/skins/default/xui/de/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/de/floater_pay_object.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Give Money" title="">
-	<text type="string" length="1" name="payee_group">
+	<text type="string" length="1" name="payee_group" width="105">
 		Gruppe bezahlen:
 	</text>
-	<text type="string" length="1" name="payee_resident">
+	<text type="string" length="1" name="payee_resident" width="118">
 		Einwohner bezahlen:
 	</text>
-	<text type="string" length="1" name="payee_name">
+	<text type="string" length="1" name="payee_name" left="128" width="168">
 		[FIRST] [LAST]
 	</text>
-	<text type="string" length="1" name="object_name_label">
+	<text type="string" length="1" name="object_name_label" halign="left">
 		Über Objekt:
 	</text>
-	<text type="string" length="1" name="object_name_text">
+	<text type="string" length="1" name="object_name_text" left="105">
 		...
 	</text>
-	<text type="string" length="1" name="fastpay text">
+	<text type="string" length="1" name="fastpay text" width="95" halign="left">
 		Schnellzahlung:
 	</text>
 	<text type="string" length="1" name="amount text">
 		Betrag:
 	</text>
-	<button label="1 L$" label_selected="1 L$" name="fastpay 1" />
-	<button label="5 L$" label_selected="5 L$" name="fastpay 5" />
-	<button label="10 L$" label_selected="10 L$" name="fastpay 10" />
-	<button label="20 L$" label_selected="20 L$" name="fastpay 20" />
+	<button label="1 L$" label_selected="1 L$" name="fastpay 1" left="105" />
+	<button label="5 L$" label_selected="5 L$" name="fastpay 5" left="190" />
+	<button label="10 L$" label_selected="10 L$" name="fastpay 10" left="105" />
+	<button label="20 L$" label_selected="20 L$" name="fastpay 20" left="190" />
 	<button label="Zahlen" label_selected="Zahlen" name="pay btn" />
-	<button label="Abbrechen" label_selected="Abbrechen" name="cancel btn" />
+	<button label="Abbrechen" label_selected="Abbrechen" name="cancel btn" width="76" />
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_preview_animation.xml b/indra/newview/skins/default/xui/de/floater_preview_animation.xml
index 0d5a6b13ff..c807556a9b 100644
--- a/indra/newview/skins/default/xui/de/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_animation.xml
@@ -3,8 +3,9 @@
 	<text type="string" length="1" name="desc txt">
 		Beschreibung:
 	</text>
+<line_editor left="98" name="desc" width="189" />
 	<button label="In Welt abspielen" label_selected="Stopp" name="Anim play btn"
-	     tool_tip="Gibt diese Animation so wieder, dass andere sie sehen können." />
+	     tool_tip="Gibt diese Animation so wieder, dass andere sie sehen können." width="116" />
 	<button label="Lokal wiedergeben" label_selected="Stopp" name="Anim audition btn"
-	     tool_tip="Gibt diese Animation so wieder, dass nur Sie sie sehen." />
+	     tool_tip="Gibt diese Animation so wieder, dass nur Sie sie sehen." left="171" width="116" />
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
index 72b8bd881b..da385b72d6 100644
--- a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
@@ -15,10 +15,10 @@
 	<text name="trigger_label">
 		Auslöser:
 	</text>
-	<text name="replace_text" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser &apos;hallo&apos; durch &apos;wie geht&apos;s&apos; ersetzen, erscheint im Chat anstelle von &apos;Ich wollte nur hallo sagen&apos; der Text &apos;Ich wollte nur wie geht&apos;s sagen&apos; und die zugehörige Geste wird abgespielt.">
+	<text name="replace_text" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser „hallo“ durch „wie geht&apos;s“ ersetzen, erscheint im Chat anstelle von „Ich wollte nur hallo sagen“ der Text „Ich wollte nur wie geht&apos;s sagen“ und die zugehörige Geste wird abgespielt.">
 		Ersetzen mit:
 	</text>
-	<line_editor name="replace_editor" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser &apos;hallo&apos; durch &apos;wie geht&apos;s&apos; ersetzen, erscheint im Chat anstelle von &apos;Ich wollte nur hallo sagen&apos; der Text &apos;Ich wollte nur wie geht&apos;s sagen&apos; und die zugehörige Geste wird abgespielt."/>
+	<line_editor name="replace_editor" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser „hallo“ durch „wie geht&apos;s“ ersetzen, erscheint im Chat anstelle von „Ich wollte nur hallo sagen“ der Text „Ich wollte nur wie geht&apos;s sagen“ und die zugehörige Geste wird abgespielt."/>
 	<text name="key_label">
 		Tastenkürzel:
 	</text>
@@ -30,12 +30,14 @@
 	<text name="steps_label">
 		Schritte:
 	</text>
+	<!-- Revert translations as interim fix to VWR-9985 while the code is not properly internationalized
 	<scroll_list name="library_list">
 		Animation
 Ton
 Chat
 Warten
 	</scroll_list>
+	-->
 	<button label="Hinzufügen &gt;&gt;" name="add_btn"/>
 	<button label="Nach oben" name="up_btn"/>
 	<button label="Nach unten" name="down_btn"/>
diff --git a/indra/newview/skins/default/xui/de/floater_report_abuse.xml b/indra/newview/skins/default/xui/de/floater_report_abuse.xml
index da6affbc7e..ddcd2a859e 100644
--- a/indra/newview/skins/default/xui/de/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/de/floater_report_abuse.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_report_abuse" title="Missbrauch melden">
+	<texture_picker label="" name="screenshot"/>
+	<check_box label="Screenshot einschließen" name="screen_check" bottom_delta="-20"/>
 	<text name="reporter_title">
 		Melder:
 	</text>
@@ -15,17 +17,14 @@
 	<text name="pos_title">
 		Position:
 	</text>
-	<texture_picker name="screenshot" />
-	<check_box label="Screenshot einschließen" name="screen_check" bottom_delta="-20" />
 	<text name="pos_field">
 		{128.1, 128.1, 15.4}
 	</text>
-	<button label="" label_selected="" name="pick_btn"
-	     tool_tip="Objektauswahl – Wählen Sie ein Objekt als Thema dieses Berichts aus" />
 	<text bottom_delta="-38" height="32" name="select_object_label">
 		Klicken Sie auf die Schaltfläche,
 dann auf das Objekt:
 	</text>
+	<button label="" label_selected="" name="pick_btn" tool_tip="Objektauswahl – Wählen Sie ein Objekt als Thema dieses Berichts aus"/>
 	<text name="object_name_label">
 		Name:
 	</text>
@@ -38,11 +37,7 @@ dann auf das Objekt:
 	<text name="owner_name">
 		Hendrerit Vulputate
 	</text>
-	<combo_box name="category_combo"
-	     tool_tip="Category -- select the category that best describes this report">
-		<combo_item name="Selectcategory">
-			Kategorie auswählen
-		</combo_item>
+	<combo_box name="category_combo" tool_tip="Kategorie -- wählen Sie die Kategorie aus, die am besten auf diesen Bericht zutrifft">
 		<combo_item name="Select_category">
 			Kategorie auswählen
 		</combo_item>
@@ -64,14 +59,11 @@ dann auf das Objekt:
 		<combo_item name="Assault__Weapons_testing_sandbox">
 			Angriff &gt; Sandbox für Waffentest
 		</combo_item>
-		<combo_item name="Copyright_or_intellectual_property_violation">
-			Urheberrechtsverletzung
-		</combo_item>
 		<combo_item name="Commerce__Failure_to_deliver_product_or_service">
-			Handel &gt; Produkt nicht geliefer oder Dienstleistung nicht erbracht
+			Handel &gt; Produkt nicht geliefert oder Dienstleistung nicht erbracht
 		</combo_item>
-		<combo_item name="Disclosure__First_Life_information">
-			Offenlegung &gt; Private Benutzerdaten
+		<combo_item name="Disclosure__Real_world_information">
+			Offenlegung &gt; Informationen aus realer Welt
 		</combo_item>
 		<combo_item name="Disclosure__Remotely_monitoring chat">
 			Offenlegung &gt; Abhören eines Chats aus der Ferne
@@ -134,28 +126,16 @@ dann auf das Objekt:
 			Unanständigkeit &gt; Anstößiger Avatarname
 		</combo_item>
 		<combo_item name="Indecency__Mature_content_in_PG_region">
-			Unanständigkeit &gt; Nicht jugendfreier Inhalt in &quot;Jugendfrei&quot;-Region
-		</combo_item>
-		<combo_item name="Intolerance">
-			Intoleranz
+			Unanständigkeit &gt; Nicht jugendfreier Inhalt in „Jugendfrei“-Region
 		</combo_item>
-		<combo_item name="Harassment">
-			Belästigung
+		<combo_item name="Intellectual_property_infringement_Content_Removal">
+			Urheberrechtsverletzung &gt; Entfernen von Inhalten
 		</combo_item>
-		<combo_item name="Assault">
-			Angriff
+		<combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
+			Urheberrechtsverletzung &gt; CopyBot oder Berechtigungs-Exploit
 		</combo_item>
-		<combo_item name="Disclosure">
-			Offenlegen
-		</combo_item>
-		<combo_item name="Indecency">
-			Unanständigkeit
-		</combo_item>
-		<combo_item name="Age">
-			Alter
-		</combo_item>
-		<combo_item name="Parcel">
-			Parzelle
+		<combo_item name="Intolerance">
+			Intoleranz
 		</combo_item>
 		<combo_item name="Land__Abuse_of_sandbox_resources">
 			Land &gt; Missbrauch der Sandbox-Ressourcen
@@ -169,9 +149,6 @@ dann auf das Objekt:
 		<combo_item name="Land__Encroachment__Trees_plants">
 			Land &gt; Unbefugte Nutzung &gt; Bäume/Pflanzen
 		</combo_item>
-		<combo_item name="Trademark_violation">
-			Markenrechtsverletzung
-		</combo_item>
 		<combo_item name="Wagering_gambling">
 			Wetten/Glücksspiel
 		</combo_item>
@@ -182,10 +159,8 @@ dann auf das Objekt:
 	<text name="abuser_name_title">
 		Name des Beschuldigten:
 	</text>
-	<button label="Einwohner auswählen" label_selected="" name="select_abuser"
-	     tool_tip="Den Namen des Beschuldigten aus einer Liste wählen" />
-	<check_box label="Name des Täters ist nicht bekannt" name="omit_abuser_name"
-	     tool_tip="Wählen Sie diese Option, wenn Ihnen der Name des Täters unbekannt ist" />
+	<button label="Einwohner auswählen" label_selected="" name="select_abuser" tool_tip="Den Namen des Beschuldigten aus einer Liste wählen"/>
+	<check_box label="Name des Täters ist nicht bekannt" name="omit_abuser_name" tool_tip="Wählen Sie diese Option, wenn Ihnen der Name des Täters unbekannt ist"/>
 	<text name="abuser_name_title2">
 		Ort des Missbrauchs:
 	</text>
@@ -204,6 +179,6 @@ Objekt, wenn möglich.
 	<text name="incomplete_title" bottom_delta="-20">
 		Hinweis: Unvollständige Meldungen werden nicht bearbeitet.
 	</text>
-	<button label="Missbrauch melden" label_selected="Missbrauch melden" name="send_btn" />
-	<button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn" />
+	<button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn"/>
+	<button label="Missbrauch melden" label_selected="Missbrauch melden" name="send_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_script_queue.xml b/indra/newview/skins/default/xui/de/floater_script_queue.xml
index b2a1b136f6..63d5ef2478 100644
--- a/indra/newview/skins/default/xui/de/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/de/floater_script_queue.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="queue" title="Rückgängig">
-	<button label="Schließen" label_selected="Schließen" name="close" />
+	<button label="Schließen" label_selected="Schließen" name="close" left="215" width="72"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_settings_debug.xml b/indra/newview/skins/default/xui/de/floater_settings_debug.xml
index 659207d1cd..d64b9dccf9 100644
--- a/indra/newview/skins/default/xui/de/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/de/floater_settings_debug.xml
@@ -13,5 +13,5 @@
 	<spinner label="x" name="val_spinner_2" />
 	<spinner label="x" name="val_spinner_3" />
 	<spinner label="x" name="val_spinner_4" />
-	<button label="Standard wiederherstellen" name="default_btn" />
+	<button label="Standard wiederherstellen" name="default_btn" width="170" />
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_telehub.xml b/indra/newview/skins/default/xui/de/floater_telehub.xml
index 091f803bcf..264411c166 100644
--- a/indra/newview/skins/default/xui/de/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/de/floater_telehub.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="telehub" title="Telehub">
+<floater name="telehub" title="Telehub" min_height="310" height="310"  >
 	<text name="status_text_connected">
 		Telehub verbunden mit Objekt [OBJECT]
 	</text>
@@ -7,22 +7,26 @@
 		Kein Telehub verbunden.
 	</text>
 	<text name="help_text_connected">
-		Klicken Sie zum Entfernen auf &apos;Trennen&apos;.
+		Klicken Sie zum Entfernen auf „Trennen“.
 	</text>
-	<text name="help_text_not_connected">
-		Wählen Sie ein Objekt und klicken Sie auf &apos;Mit Telehub verbinden&apos;.
+	<text name="help_text_not_connected" height="38" bottom_delta="-18" >
+		Wählen Sie ein Objekt und klicken Sie auf
+„Mit Telehub verbinden“.
 	</text>
-	<button label="Mit Telehub verbinden" name="connect_btn" />
-	<button label="Trennen" name="disconnect_btn" />
-	<text name="spawn_points_text">
+	<button label="Mit Telehub verbinden" name="connect_btn" width="122" />
+	<button label="Trennen" name="disconnect_btn" left="142" width="98" />
+	<text name="spawn_points_text" width="230">
 		Spawn-Punkte (Positionen, nicht Objekte):
 	</text>
 	<button label="Spawn hinzufügen" name="add_spawn_point_btn" />
 	<button label="Spawn entfernen" name="remove_spawn_point_btn" />
 	<text name="spawn_point_help">
-		Wählen Sie ein Objekt und klicken zur Positionsangabe auf &apos;Hinzufügen&apos;.
-Anschließend können sie das Objekt verschieben oder löschen.
-Positionsangaben sind relativ zum Telehub-Mittelpunkt.
-Wählen Sie ein Objekt aus, um seine Position in der Welt anzuzeigen.
+		Wählen Sie ein Objekt und klicken zur
+Positionsangabe auf „Hinzufügen“. Anschließend
+können sie das Objekt verschieben oder löschen.
+Positionsangaben sind relativ zum
+Telehub-Mittelpunkt.
+Wählen Sie ein Objekt aus, um seine Position in
+der Welt anzuzeigen.
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index a04851c429..b428585f12 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -376,29 +376,30 @@
 			</text>
 			<spinner label="X" left="115" name="Shear X" />
 			<spinner label="Y" left="115" name="Shear Y" />
-			<text name="advanced_cut">
+			<text name="advanced_cut" left="115" width="153">
 				Profilschnitt-Beginn und Ende
 			</text>
-			<text name="advanced_dimple">
+			<text name="advanced_dimple" left="115">
 				Vertiefung-Beginn und Ende
 			</text>
-			<spinner label="B" name="Path Limit Begin" />
+			<spinner label="B" name="Path Limit Begin" left="115"/>
 			<spinner label="E" name="Path Limit End" />
-			<text name="text taper2">
+			<text name="text taper2" left="115">
 				Verjüngung
 			</text>
-			<spinner label="X" name="Taper X" />
+			<spinner label="X" name="Taper X" left="115"/>
 			<spinner label="Y" name="Taper Y" />
-			<text name="text radius delta">
+			<text name="text radius delta" left="115">
 				Radius
 			</text>
-			<text name="text revolutions">
+			<text name="text revolutions" width="74">
 				Umdrehungen
 			</text>
-			<texture_picker label="Textur für gestaltetes Primitiv" name="sculpt texture control"
+			<spinner left="115" name="Radius Offset" />
+			<texture_picker label="Textur für gestaltetes &#10;Primitiv" name="sculpt texture control"
 			     tool_tip="Klicken Sie hier, um ein Bild auszuwählen" />
 			<check_box label="Spiegeln" name="sculpt mirror control"
-			     tool_tip="Geformtes Primitiv entlang der X-Achse spiegeln." />
+			     tool_tip="Geformtes Primitiv entlang der X-Achse spiegeln." bottom_delta="-34" />
 			<check_box label="Wenden" name="sculpt invert control"
 			     tool_tip="Dreht die Normalen des geformten Primitivs von innen nach außen." />
 			<text name="label sculpt type">
@@ -476,7 +477,7 @@
 			</text>
 			<combo_box name="combobox shininess">
 				<combo_item name="None">
-					Keine
+					Kein
 				</combo_item>
 				<combo_item name="Low">
 					Niedrig
@@ -561,7 +562,7 @@
 				Kacheln pro Meter
 			</text>
 			<text name="string repeats per face">
-				Wiederholungen pro Gesicht
+				Wiederholungen pro Fläche
 			</text>
 			<text name="rpt">
 				Kacheln pro Meter
diff --git a/indra/newview/skins/default/xui/de/floater_top_objects.xml b/indra/newview/skins/default/xui/de/floater_top_objects.xml
index d7abf5c62d..f9e7becee1 100644
--- a/indra/newview/skins/default/xui/de/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/de/floater_top_objects.xml
@@ -1,68 +1,58 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="top_objects" title="wird geladen...">
 	<text name="title_text">
 		Wird geladen...
 	</text>
 	<scroll_list name="objects_list">
-		<column label="Score" name="score" />
-		<column label="Name" name="name" />
-		<column label="Owner" name="owner" />
-		<column label="Location" name="location" />
-		<column label="Uhrzeit" name="time" />
+		<column label="Wertung" name="score" width="65"/>
+		<column label="Name" name="name" width="135"/>
+		<column label="Eigentümer" name="owner"/>
+		<column label="Position" name="location" width="125"/>
+		<column label="Uhrzeit" name="time"/>
+		<column label="Mono-Uhrzeit:" name="mono_time"/>
 	</scroll_list>
-	<line_editor bg_readonly_color="clear" bottom_delta="3" enabled="false"
-	     follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
-	     name="id_editor" text_readonly_color="white" width="244" />
 	<text name="id_text">
 		Objekt-ID:
 	</text>
-	<button bottom_delta="0" follows="bottom|right" height="20" label="Beacon anzeigen"
-	     name="show_beacon_btn" right="-10" width="110" />
-	<line_editor bg_readonly_color="clear" bottom_delta="3" enabled="false"
-	     follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
-	     name="object_name_editor" text_readonly_color="white" width="244" />
+	<line_editor bg_readonly_color="clear" bottom_delta="3" enabled="false" follows="left|bottom|right" font="SansSerifSmall" height="20" left="80" name="id_editor" text_readonly_color="white" width="244"/>
+	<button bottom_delta="0" follows="bottom|right" height="20" label="Beacon anzeigen" name="show_beacon_btn" right="-10" width="110"/>
 	<text name="obj_name_text">
 		Objektname:
 	</text>
-	<button bottom_delta="0" follows="bottom|right" height="20" label="Filter"
-	     name="filter_object_btn" right="-10" width="110" />
-	<line_editor bg_readonly_color="clear" bottom_delta="3" enabled="true"
-	     follows="left|bottom|right" font="SansSerifSmall" height="20" left="106"
-	     name="owner_name_editor" text_readonly_color="white" width="218" />
+	<line_editor bg_readonly_color="clear" bottom_delta="3" enabled="false" follows="left|bottom|right" font="SansSerifSmall" height="20" left="80" name="object_name_editor" text_readonly_color="white" width="244"/>
+	<button bottom_delta="0" follows="bottom|right" height="20" label="Filter" name="filter_object_btn" right="-10" width="110"/>
 	<text name="owner_name_text">
 		Eigentümername:
 	</text>
-	<button bottom_delta="0" follows="bottom|right" height="20" label="Filter"
-	     name="filter_owner_btn" right="-10" width="110" />
-	<button bottom="35" follows="bottom|left" height="20" label="Auswahl zurückgeben"
-	     left="10" name="return_selected_btn" width="134" />
-	<button bottom="35" follows="bottom|left" height="20" label="Alle zurückgeben"
-	     left="150" name="return_all_btn" width="134" />
-	<button bottom="10" follows="bottom|left" height="20" label="Auswahl deaktivieren"
-	     left="10" name="disable_selected_btn" width="134" />
-	<button bottom="10" follows="bottom|left" height="20" label="Alle deaktivieren"
-	     left="150" name="disable_all_btn" width="134" />
-	<button bottom_delta="0" follows="bottom|right" height="20" label="Aktualisieren"
-	     name="refresh_btn" right="-10" width="110" />
-	<text name="top_scripts_title">
+	<line_editor bg_readonly_color="clear" bottom_delta="3" enabled="true" follows="left|bottom|right" font="SansSerifSmall" height="20" left="106" name="owner_name_editor" text_readonly_color="white" width="218"/>
+	<button bottom_delta="0" follows="bottom|right" height="20" label="Filter" name="filter_owner_btn" right="-10" width="110"/>
+	<button bottom="35" follows="bottom|left" height="20" label="Auswahl zurückgeben" left="10" name="return_selected_btn" width="134"/>
+	<button bottom="35" follows="bottom|left" height="20" label="Alle zurückgeben" left="150" name="return_all_btn" width="134"/>
+	<button bottom="10" follows="bottom|left" height="20" label="Auswahl deaktivieren" left="10" name="disable_selected_btn" width="134"/>
+	<button bottom="10" follows="bottom|left" height="20" label="Alle deaktivieren" left="150" name="disable_all_btn" width="134"/>
+	<button bottom_delta="0" follows="bottom|right" height="20" label="Aktualisieren" name="refresh_btn" right="-10" width="110"/>
+	<string name="top_scripts_title">
 		Top-Skripts
-	</text>
-	<text name="top_scripts_text">
+	</string>
+	<string name="top_scripts_text">
 		[COUNT] Skripts benötigen insgesamt [TIME] ms
-	</text>
-	<text name="scripts_score_label">
+	</string>
+	<string name="scripts_score_label">
 		Zeit
-	</text>
-	<text name="top_colliders_title">
+	</string>
+	<string name="scripts_mono_time_label">
+		Mono-Uhrzeit:
+	</string>
+	<string name="top_colliders_title">
 		Top-Kollisionsobjekte
-	</text>
-	<text name="top_colliders_text">
+	</string>
+	<string name="top_colliders_text">
 		Top [COUNT] Objekte mit vielen potenziellen Kollisionen
-	</text>
-	<text name="colliders_score_label">
+	</string>
+	<string name="colliders_score_label">
 		Wertung
-	</text>
-	<text name="none_descriptor">
+	</string>
+	<string name="none_descriptor">
 		Nicht gefunden.
-	</text>
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_url_entry.xml b/indra/newview/skins/default/xui/de/floater_url_entry.xml
index 370b4f0167..c230d9c6c3 100644
--- a/indra/newview/skins/default/xui/de/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/de/floater_url_entry.xml
@@ -4,8 +4,7 @@
 		Medien-URL:
 	</text>
 	<button label="OK" name="ok_btn" />
-	<button label="Abbrechen" name="cancel_btn" />
-	<button label="Abbrechen" name="cancel_btn2" />
+	<button label="Abbrechen" name="cancel_btn" width="75" />
 	<button label="Löschen" name="clear_btn" />
 	<text name="loading_label">
 		Wird geladen...
diff --git a/indra/newview/skins/default/xui/de/floater_water.xml b/indra/newview/skins/default/xui/de/floater_water.xml
index efd606cdf1..d8ec1a2fa5 100644
--- a/indra/newview/skins/default/xui/de/floater_water.xml
+++ b/indra/newview/skins/default/xui/de/floater_water.xml
@@ -11,16 +11,17 @@
 			<text name="BHText">
 				Wassertrübungsfarbe
 			</text>
-			<button label=" ?" name="WaterFogColorHelp" />
+			<button label=" ?" name="WaterFogColorHelp" left="175" />
 			<color_swatch name="WaterFogColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen" />
 			<text name="WaterFogDensText">
 				Wassertrübungsdichte
 			</text>
-			<button label=" ?" name="WaterFogDensityHelp" />
+			<button label=" ?" name="WaterFogDensityHelp" left="175" />
 			<text name="WaterUnderWaterFogModText">
 				Wassertrübungs-Modifikator
 			</text>
-			<button label=" ?" name="WaterUnderWaterFogModHelp" />
+			<button label=" ?" name="WaterUnderWaterFogModHelp" left="175" />
+			<slider bottom_delta="-34" name="WaterUnderWaterFogMod" />
 			<text name="BDensText">
 				Reflexionswellengröße
 			</text>
diff --git a/indra/newview/skins/default/xui/de/floater_world_map.xml b/indra/newview/skins/default/xui/de/floater_world_map.xml
index c3d203d4dc..aba6fe5e9a 100644
--- a/indra/newview/skins/default/xui/de/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/de/floater_world_map.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="worldmap" title="Weltkarte">
 	<tab_container name="maptab">
-		<panel label="Objekte" name="objects_mapview" />
-		<panel label="Terrain" name="terrain_mapview" />
+		<panel label="Objekte" name="objects_mapview"/>
+		<panel label="Terrain" name="terrain_mapview"/>
 	</tab_container>
 	<text font="SansSerifSmall" name="land_for_sale_label">
 		Land erhaeltlich
@@ -16,77 +16,60 @@
 	<text name="home_label">
 		Zuhause
 	</text>
-	<button label="Nach Hause" label_selected="Nach Hause" name="Go Home"
-	     tool_tip="Nach Hause teleportieren" />
-	<text name="classifieds_label">
-		Anzeigen
-	</text>
-	<check_box label=" " name="class_chk" />
+	<button label="Nach Hause" label_selected="Nach Hause" name="Go Home" tool_tip="Nach Hause teleportieren"/>
 	<text name="person_label">
 		Person
 	</text>
-	<check_box label=" " name="people_chk" />
+	<check_box label=" " name="people_chk"/>
 	<text name="infohub_label">
 		Infohub
 	</text>
-	<check_box label=" " name="infohub_chk" />
+	<check_box label=" " name="infohub_chk"/>
 	<text name="telehub_label">
 		Telehub
 	</text>
-	<check_box label=" " name="telehubchk" />
-	<text name="popular_label">
-		Beliebt
-	</text>
-	<check_box label=" " name="popular_chk" />
+	<check_box label=" " name="telehubchk"/>
 	<text font="SansSerifSmall" name="land_for_sale_label2">
 		Land erhaeltlich
 	</text>
-	<check_box label=" " name="land_for_sale_chk" />
+	<check_box label=" " name="land_for_sale_chk"/>
 	<text name="events_label">
 		Events
 	</text>
-	<check_box label=" " name="event_chk" />
+	<check_box label=" " name="event_chk"/>
 	<text name="events_mature_label">
 		Events (18+)
 	</text>
-	<check_box label=" " name="event_mature_chk" />
-	<combo_box label="Online-Freunde" name="friend combo" tool_tip="Friend to Show on Map">
+	<check_box label=" " name="event_mature_chk"/>
+	<combo_box label="Online-Freunde" name="friend combo" tool_tip="Freund, der auf Karte angezeigt werden soll">
 		<combo_item name="none_selected">
 			Online-Freunde
 		</combo_item>
 	</combo_box>
-	<combo_box label="Landmarken" name="landmark combo" tool_tip="Landmark to Show on Map">
+	<combo_box label="Landmarken" name="landmark combo" tool_tip="Landmarke, die auf Karte angezeigt werden soll">
 		<combo_item name="none_selected">
 			Landmarken
 		</combo_item>
 	</combo_box>
-	<line_editor label="Nach Regionsname suchen" name="location"
-	     tool_tip="Geben Sie den Namen einer Region ein" />
-	<button label="Suchen" name="DoSearch" tool_tip="Nach einer Region suchen" />
+	<line_editor label="Nach Regionsname suchen" name="location" tool_tip="Geben Sie den Namen einer Region ein"/>
+	<button label="Suchen" name="DoSearch" tool_tip="Nach einer Region suchen"/>
 	<text name="search_label">
 		Suchergebnisse:
 	</text>
 	<scroll_list name="search_results">
-		<column label="" name="icon" />
-		<column label="" name="sim_name" />
+		<column label="" name="icon"/>
+		<column label="" name="sim_name"/>
 	</scroll_list>
 	<text name="location_label">
 		Standort:
 	</text>
-	<spinner name="spin x" tool_tip="X-Koordinate der Position auf der Karte" />
-	<spinner name="spin y" tool_tip="Y-Koordinate der Position auf der Karte" />
-	<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="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="Meine Position" label_selected="Wo bin ich?" name="Show My Location"
-	     tool_tip="Karte auf Position Ihres Avatars zentrieren" />
-	<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" />
+	<spinner name="spin x" tool_tip="X-Koordinate der Position auf der Karte"/>
+	<spinner name="spin y" tool_tip="Y-Koordinate der Position auf der Karte"/>
+	<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="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="Meine Position" label_selected="Wo bin ich?" name="Show My Location" tool_tip="Karte auf Position Ihres Avatars zentrieren"/>
+	<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/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 0934a28105..9305d0731a 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -1,256 +1,210 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Main Menu">
 	<menu label="Datei" name="File">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-		<menu_item_call label="Bild hochladen ([COST] L$)..." name="Upload Image" />
-		<menu_item_call label="Sound hochladen ([COST] L$)..." name="Upload Sound" />
-		<menu_item_call label="Animation hochladen ([COST] L$)..." name="Upload Animation" />
-		<menu_item_call label="Mehrfach-Upload ([COST] L$ pro Datei)..." name="Bulk Upload" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="Fenster schließen" name="Close Window" />
-		<menu_item_call label="Alle Fenster schließen" name="Close All Windows" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="Textur speichern unter..." name="Save Texture As..." />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="Foto machen" name="Take Snapshot" />
-		<menu_item_call label="Foto auf Datenträger" name="Snapshot to Disk" />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu label="Fenstergröße einstellen" name="Set Window Size">
-			<menu_item_call label="320x240" name="320x240" />
-			<menu_item_call label="640x480" name="640x480" />
-			<menu_item_call label="800x600" name="800x600" />
-			<menu_item_separator label="-----------" name="separator" />
-			<menu_item_call label="720x480 (NTSC)" name="720x480 (NTSC)" />
-			<menu_item_call label="768x576 (PAL)" name="768x576 (PAL)" />
-		</menu>
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="Beenden" name="Quit" />
+		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+		<menu_item_call label="Bild hochladen ([COST] L$)..." name="Upload Image"/>
+		<menu_item_call label="Sound hochladen ([COST] L$)..." name="Upload Sound"/>
+		<menu_item_call label="Animation hochladen ([COST] L$)..." name="Upload Animation"/>
+		<menu_item_call label="Mehrfach-Upload ([COST] L$ pro Datei)..." name="Bulk Upload"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Fenster schließen" name="Close Window"/>
+		<menu_item_call label="Alle Fenster schließen" name="Close All Windows"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Textur speichern unter..." name="Save Texture As..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Foto machen" name="Take Snapshot"/>
+		<menu_item_call label="Foto auf Datenträger" name="Snapshot to Disk"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Beenden" name="Quit"/>
 	</menu>
 	<menu label="Bearbeiten" name="Edit">
-		<menu_item_call label="Rückgängig" name="Undo" />
-		<menu_item_call label="Neu" name="Redo" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="Ausschneiden" name="Cut" />
-		<menu_item_call label="Kopieren" name="Copy" />
-		<menu_item_call label="Einfügen" name="Paste" />
-		<menu_item_call label="Löschen" name="Delete" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="Suchen..." name="Search..." />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="Alle auswählen" name="Select All" />
-		<menu_item_call label="Auswahl aufheben" name="Deselect" />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu_item_call label="Duplizieren" name="Duplicate" />
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu label="Objekt anhängen" name="Attach Object" />
-		<menu label="Objekt abnehmen" name="Detach Object" />
+		<menu_item_call label="Rückgängig" name="Undo"/>
+		<menu_item_call label="Neu" name="Redo"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Ausschneiden" name="Cut"/>
+		<menu_item_call label="Kopieren" name="Copy"/>
+		<menu_item_call label="Einfügen" name="Paste"/>
+		<menu_item_call label="Löschen" name="Delete"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Suchen..." name="Search..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Alle auswählen" name="Select All"/>
+		<menu_item_call label="Auswahl aufheben" name="Deselect"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Duplizieren" name="Duplicate"/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu label="Objekt anhängen" name="Attach Object"/>
+		<menu label="Objekt abnehmen" name="Detach Object"/>
 		<menu label="Kleider ausziehen" name="Take Off Clothing">
-			<menu_item_call label="Hemd" name="Shirt" />
-			<menu_item_call label="Hose" name="Pants" />
-			<menu_item_call label="Schuhe" name="Shoes" />
-			<menu_item_call label="Socken" name="Socks" />
-			<menu_item_call label="Jacke" name="Jacket" />
-			<menu_item_call label="Handschuhe" name="Gloves" />
-			<menu_item_call label="Unterhemd" name="Menu Undershirt" />
-			<menu_item_call label="Unterhose" name="Menu Underpants" />
-			<menu_item_call label="Rock" name="Skirt" />
-			<menu_item_call label="Alle Kleider" name="All Clothes" />
+			<menu_item_call label="Hemd" name="Shirt"/>
+			<menu_item_call label="Hose" name="Pants"/>
+			<menu_item_call label="Schuhe" name="Shoes"/>
+			<menu_item_call label="Socken" name="Socks"/>
+			<menu_item_call label="Jacke" name="Jacket"/>
+			<menu_item_call label="Handschuhe" name="Gloves"/>
+			<menu_item_call label="Unterhemd" name="Menu Undershirt"/>
+			<menu_item_call label="Unterhose" name="Menu Underpants"/>
+			<menu_item_call label="Rock" name="Skirt"/>
+			<menu_item_call label="Alle Kleider" name="All Clothes"/>
 		</menu>
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu_item_call label="Gesten..." name="Gestures..." />
-		<menu_item_call label="Profil..." name="Profile..." />
-		<menu_item_call label="Aussehen..." name="Appearance..." />
-		<menu_item_separator label="-----------" name="separator7" />
-		<menu_item_check label="Freunde..." name="Friends..." />
-		<menu_item_call label="Gruppen..." name="Groups..." />
-		<menu_item_separator label="-----------" name="separator8" />
-		<menu_item_call label="Einstellungen..." name="Preferences..." />
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call label="Gesten..." name="Gestures..."/>
+		<menu_item_call label="Profil..." name="Profile..."/>
+		<menu_item_call label="Aussehen..." name="Appearance..."/>
+		<menu_item_separator label="-----------" name="separator7"/>
+		<menu_item_check label="Freunde..." name="Friends..."/>
+		<menu_item_call label="Gruppen..." name="Groups..."/>
+		<menu_item_separator label="-----------" name="separator8"/>
+		<menu_item_call label="Einstellungen..." name="Preferences..."/>
 	</menu>
 	<menu label="Ansicht" name="View">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-		<menu_item_call label="Mouselook" name="Mouselook" />
-		<menu_item_check label="Bauen" name="Build" />
-		<menu_item_check label="Joystick-Flycam" name="Joystick Flycam" />
-		<menu_item_call label="Ansicht zurücksetzen" name="Reset View" />
-		<menu_item_call label="Letzten Chatter ansehen" name="Look at Last Chatter" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_check label="Symbolleiste" name="Toolbar" />
-		<menu_item_check label="Lokaler Chat" name="Chat History" />
-		<menu_item_check label="Unterhalten" name="Instant Message" />
-		<menu_item_call label="Inventar" name="Inventory" />
-		<menu_item_check label="Aktive Sprecher" name="Active Speakers" />
-		<menu_item_check label="Stummschalten-Liste" name="Mute List" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_check label="Kamerasteuerung" name="Camera Controls" />
-		<menu_item_check label="Bewegungssteuerung" name="Movement Controls" />
-		<menu_item_check label="Weltkarte" name="World Map" />
-		<menu_item_check label="Minikarte" name="Mini-Map" />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_check label="Statistikleiste" name="Statistics Bar" />
-		<menu_item_check label="Grundstücksgrenzen" name="Property Lines" />
-		<menu_item_check label="Landeigentümer" name="Land Owners" />
-		<menu_item_separator label="-----------" name="separator4" />
+		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+		<menu_item_call label="Mouselook" name="Mouselook"/>
+		<menu_item_check label="Bauen" name="Build"/>
+		<menu_item_check label="Joystick-Flycam" name="Joystick Flycam"/>
+		<menu_item_call label="Ansicht zurücksetzen" name="Reset View"/>
+		<menu_item_call label="Letzten Chatter ansehen" name="Look at Last Chatter"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_check label="Symbolleiste" name="Toolbar"/>
+		<menu_item_check label="Lokaler Chat" name="Chat History"/>
+		<menu_item_check label="Unterhalten" name="Instant Message"/>
+		<menu_item_call label="Inventar" name="Inventory"/>
+		<menu_item_check label="Aktive Sprecher" name="Active Speakers"/>
+		<menu_item_check label="Stummschalten-Liste" name="Mute List"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_check label="Kamerasteuerung" name="Camera Controls"/>
+		<menu_item_check label="Bewegungssteuerung" name="Movement Controls"/>
+		<menu_item_check label="Weltkarte" name="World Map"/>
+		<menu_item_check label="Minikarte" name="Mini-Map"/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_check label="Statistikleiste" name="Statistics Bar"/>
+		<menu_item_check label="Grundstücksgrenzen" name="Property Lines"/>
+		<menu_item_check label="Landeigentümer" name="Land Owners"/>
+		<menu_item_separator label="-----------" name="separator4"/>
 		<menu label="Schwebe-Tipps" name="Hover Tips">
-			<menu_item_check label="Tipps anzeigen" name="Show Tips" />
-			<menu_item_separator label="-----------" name="separator" />
-			<menu_item_check label="Landtipps" name="Land Tips" />
-			<menu_item_check label="Tipps zu allen Objekten" name="Tips On All Objects" />
-		</menu>
-		<menu_item_check label="Alt zeigt physische Objekte an" name="Alt Shows Physical" />
-		<menu_item_check label="Beacons immer an" name="Beacons Always On" />
-		<menu_item_check label="Durchsichtig hervorheben" name="Highlight Transparent" />
-		<menu label="Beacons" name="Beacons">
-			<menu_item_check label="Auf Berührung beschränkte Skriptobjekte"
-			     name="Scripted Objects With Touch Only" />
-			<menu_item_check label="Scripting-Objekte" name="Scripted Objects" />
-			<menu_item_check label="Physische Objekte" name="Physical Objects" />
-			<menu_item_check label="Soundquellen" name="Sound Sources" />
-			<menu_item_check label="Partikelquellen" name="Particle Sources" />
-			<menu_item_check label="Glanzlichter anzeigen" name="Render Highlights" />
-			<menu_item_check label="Beacons anzeigen" name="Render Beacons" />
-			<menu_item_separator label="-----------" name="separator" />
-			<menu_item_separator label=" -----------" name="separator2" />
-			<menu_item_check label="Partikel ausblenden" name="Hide Particles" />
-			<menu_item_separator label=" -----------" name="separator3" />
-			<menu label="Beacon-Breite" name="Beacon Width">
-				<menu_item_call label=" 1" name="Beacon Width 1" />
-				<menu_item_call label=" 4" name="Beacon Width 4" />
-				<menu_item_call label=" 16" name="Beacon Width 16" />
-				<menu_item_call label=" 32" name="Beacon Width 32" />
-			</menu>
+			<menu_item_check label="Tipps anzeigen" name="Show Tips"/>
+			<menu_item_separator label="-----------" name="separator"/>
+			<menu_item_check label="Landtipps" name="Land Tips"/>
+			<menu_item_check label="Tipps zu allen Objekten" name="Tips On All Objects"/>
 		</menu>
-		<menu_item_check label="HUD-Anhänge anzeigen" name="Show HUD Attachments" />
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="Hinein zoomen" name="Zoom In" />
-		<menu_item_call label="Zoom-Standard" name="Zoom Default" />
-		<menu_item_call label="Wegzoomen" name="Zoom Out" />
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu_item_call label="Vollbild" name="Toggle Fullscreen" />
-		<menu_item_call label="UI-Größe auf Standard setzen" name="Set UI Size to Default" />
+		<menu_item_check label="Durchsichtig hervorheben" name="Highlight Transparent"/>
+		<menu_item_check label="Beacons" name="beacons"/>
+		<menu_item_check label="Partikel ausblenden" name="Hide Particles"/>
+		<menu_item_check label="HUD-Anhänge anzeigen" name="Show HUD Attachments"/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu_item_call label="Hinein zoomen" name="Zoom In"/>
+		<menu_item_call label="Zoom-Standard" name="Zoom Default"/>
+		<menu_item_call label="Wegzoomen" name="Zoom Out"/>
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call label="Vollbild" name="Toggle Fullscreen"/>
+		<menu_item_call label="UI-Größe auf Standard setzen" name="Set UI Size to Default"/>
 	</menu>
 	<menu label="Welt" name="World">
-		<menu_item_call label="Chat" name="Chat" />
-		<menu_item_call label="Geste starten" name="Start Gesture" />
-		<menu_item_check label="Immer rennen" name="Always Run" />
-		<menu_item_check label="Fliegen" name="Fly" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="Landmarke hier setzen" name="Create Landmark Here" />
-		<menu_item_call label="Hier als Zuhause wählen" name="Set Home to Here" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="Teleport nach Hause" name="Teleport Home" />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="Als abwesend anzeigen" name="Set Away" />
-		<menu_item_call label="Als beschäftigt anzeigen" name="Set Busy" />
-		<menu_item_call label="Alle Animationen stoppen" name="Stop All Animations" />
-		<menu_item_call label="Tasten freigeben" name="Release Keys" />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu_item_call label="Kontostatistik..." name="Account History..." />
-		<menu_item_call label="Mein Konto verwalten..." name="Manage My Account..." />
-		<menu_item_call label="L$ kaufen..." name="Buy and Sell L$..." />
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="Mein Land..." name="My Land..." />
-		<menu_item_call label="Land-Info..." name="About Land..." />
-		<menu_item_call label="Land kaufen..." name="Buy Land..." />
-		<menu_item_call label="Region/Grundstück..." name="Region/Estate..." />
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu label="Sonne erzwingen" name="Force Sun">
-			<menu_item_call label="Sonnenaufgang" name="Sunrise" />
-			<menu_item_call label="Mittags" name="Noon" />
-			<menu_item_call label="Sonnenuntergang" name="Sunset" />
-			<menu_item_call label="Mitternacht" name="Midnight" />
-			<menu_item_separator label="-----------" name="separator" />
-			<menu_item_call label="Auf Regionsstandard zurücksetzen" name="Revert to Region Default" />
-		</menu>
+		<menu_item_call label="Chat" name="Chat"/>
+		<menu_item_check label="Immer rennen" name="Always Run"/>
+		<menu_item_check label="Fliegen" name="Fly"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Landmarke hier setzen" name="Create Landmark Here"/>
+		<menu_item_call label="Hier als Zuhause wählen" name="Set Home to Here"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Teleport nach Hause" name="Teleport Home"/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Als abwesend anzeigen" name="Set Away"/>
+		<menu_item_call label="Als beschäftigt anzeigen" name="Set Busy"/>
+		<menu_item_call label="Alle Animationen stoppen" name="Stop All Animations"/>
+		<menu_item_call label="Tasten freigeben" name="Release Keys"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Kontostatistik..." name="Account History...">
+			<on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=de" />
+		</menu_item_call>
+		<menu_item_call label="Mein Konto verwalten..." name="Manage My Account...">
+			<on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=de" />
+		</menu_item_call>
+		<menu_item_call label="L$ kaufen..." name="Buy and Sell L$..."/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu_item_call label="Mein Land..." name="My Land..."/>
+		<menu_item_call label="Land-Info..." name="About Land..."/>
+		<menu_item_call label="Land kaufen..." name="Buy Land..."/>
+		<menu_item_call label="Region/Grundstück..." name="Region/Estate..."/>
+		<menu_item_separator label="-----------" name="separator6"/>
 		<menu label="Umwelt-Einstellungen" name="Environment Settings">
-			<menu_item_call label="Sonnenaufgang" name="Sunrise" />
-			<menu_item_call label="Mittag" name="Noon" />
-			<menu_item_call label="Sonnenuntergang" name="Sunset" />
-			<menu_item_call label="Mitternacht" name="Midnight" />
-			<menu_item_call label="Auf Regionsstandard zurücksetzen" name="Revert to Region Default" />
-			<menu_item_separator label=" -----------" name="separator" />
-			<menu_item_call label="Umwelt-Editor" name="Environment Editor" />
+			<menu_item_call label="Sonnenaufgang" name="Sunrise"/>
+			<menu_item_call label="Mittag" name="Noon"/>
+			<menu_item_call label="Sonnenuntergang" name="Sunset"/>
+			<menu_item_call label="Mitternacht" name="Midnight"/>
+			<menu_item_call label="Auf Regionsstandard zurücksetzen" name="Revert to Region Default"/>
+			<menu_item_separator label="-----------" name="separator"/>
+			<menu_item_call label="Umwelt-Editor" name="Environment Editor"/>
 		</menu>
 	</menu>
 	<menu label="Werkzeug" name="Tools">
 		<menu label="Fehlermeldungen" name="Select Tool">
-			<menu_item_call label="Fokus" name="Focus" />
-			<menu_item_call label="Verschieben" name="Move" />
-			<menu_item_call label="Bearbeiten" name="Edit" />
-			<menu_item_call label="Erstellen" name="Create" />
-			<menu_item_call label="Land" name="Land" />
+			<menu_item_call label="Fokus" name="Focus"/>
+			<menu_item_call label="Verschieben" name="Move"/>
+			<menu_item_call label="Bearbeiten" name="Edit"/>
+			<menu_item_call label="Erstellen" name="Create"/>
+			<menu_item_call label="Land" name="Land"/>
 		</menu>
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_check label="Nur meine Objekte auswählen" name="Select Only My Objects" />
-		<menu_item_check label="Nur bewegliche Objekte auswählen" name="Select Only Movable Objects" />
-		<menu_item_check label="Nach Umgebung auswählen" name="Select By Surrounding" />
-		<menu_item_check label="Ausgeblendete Auswahl anzeigen" name="Show Hidden Selection" />
-		<menu_item_check label="Lichtradius für Auswahl anzeigen"
-		     name="Show Light Radius for Selection" />
-		<menu_item_check label="Auswahlstrahl anzeigen" name="Show Selection Beam" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_check label="An Raster ausrichten" name="Snap to Grid" />
-		<menu_item_call label="Objekt-XY an Raster ausrichten" name="Snap Object XY to Grid" />
-		<menu_item_call label="Auswahl für Raster verwenden" name="Use Selection for Grid" />
-		<menu_item_call label="Rasteroptionen..." name="Grid Options..." />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_check label="Verknüpfte Teile bearbeiten" name="Edit Linked Parts" />
-		<menu_item_call label="Verknüpfung" name="Link" />
-		<menu_item_call label="Verknüpfung aufheben" name="Unlink" />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="Fokus auf Auswahl" name="Focus on Selection" />
-		<menu_item_call label="Auf Auswahl zoomen" name="Zoom to Selection" />
-		<menu_item_call label="Objekt kaufen" name="Menu Object Take" />
-		<menu_item_call label="Kopie nehmen/machen" name="Take Copy" />
-		<menu_item_call label="Objekt wieder im Inventar speichern"
-		     name="Save Object Back to My Inventory" />
-		<menu_item_call label="Objekt wieder in Objektinhalt speichern"
-		     name="Save Object Back to Object Contents" />
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu_item_call label="Skriptwarnung/Fehlerfenster anzeigen"
-		     name="Show Script Warning/Error Window" />
-		<menu_item_call label="Skripte in Auswahl neu kompilieren"
-		     name="Recompile Scripts in Selection">
-			<menu_item_call label="Mono" name="Mono" />
-			<menu_item_call label="LSL" name="LSL" />
-		</menu_item_call>
-		<menu_item_call label="Skripte in Auswahl zurücksetzen" name="Reset Scripts in Selection" />
-		<menu_item_call label="Skripte in Auswahl so einstellen, dass sie ausgeführt werden"
-		     name="Set Scripts to Running in Selection" />
-		<menu_item_call label="Skripte in Auswahl so einstellen, dass sie nicht ausgeführt werden"
-		     name="Set Scripts to Not Running in Selection" />
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_check label="Nur meine Objekte auswählen" name="Select Only My Objects"/>
+		<menu_item_check label="Nur bewegliche Objekte auswählen" name="Select Only Movable Objects"/>
+		<menu_item_check label="Nach Umgebung auswählen" name="Select By Surrounding"/>
+		<menu_item_check label="Ausgeblendete Auswahl anzeigen" name="Show Hidden Selection"/>
+		<menu_item_check label="Lichtradius für Auswahl anzeigen" name="Show Light Radius for Selection"/>
+		<menu_item_check label="Auswahlstrahl anzeigen" name="Show Selection Beam"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_check label="An Raster ausrichten" name="Snap to Grid"/>
+		<menu_item_call label="Objekt-XY an Raster ausrichten" name="Snap Object XY to Grid"/>
+		<menu_item_call label="Auswahl für Raster verwenden" name="Use Selection for Grid"/>
+		<menu_item_call label="Rasteroptionen..." name="Grid Options..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_check label="Verknüpfte Teile bearbeiten" name="Edit Linked Parts"/>
+		<menu_item_call label="Verknüpfung" name="Link"/>
+		<menu_item_call label="Verknüpfung aufheben" name="Unlink"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Fokus auf Auswahl" name="Focus on Selection"/>
+		<menu_item_call label="Auf Auswahl zoomen" name="Zoom to Selection"/>
+		<menu_item_call label="Objekt kaufen" name="Menu Object Take"/>
+		<menu_item_call label="Kopie nehmen/machen" name="Take Copy"/>
+		<menu_item_call label="Objekt wieder im Inventar speichern" name="Save Object Back to My Inventory"/>
+		<menu_item_call label="Objekt wieder in Objektinhalt speichern" name="Save Object Back to Object Contents"/>
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call label="Skriptwarnung/Fehlerfenster anzeigen" name="Show Script Warning/Error Window"/>
+		<menu label="Skripte in Auswahl neu kompilieren" name="Recompile Scripts in Selection">
+			<menu_item_call label="Mono" name="Mono"/>
+			<menu_item_call label="LSL" name="LSL"/>
+		</menu>
+		<menu_item_call label="Skripte in Auswahl zurücksetzen" name="Reset Scripts in Selection"/>
+		<menu_item_call label="Skripte in Auswahl so einstellen, dass sie ausgeführt werden" name="Set Scripts to Running in Selection"/>
+		<menu_item_call label="Skripte in Auswahl so einstellen, dass sie nicht ausgeführt werden" name="Set Scripts to Not Running in Selection"/>
 	</menu>
 	<menu label="Hilfe" name="Help">
-		<menu_item_call label="Hilfe zu Second Life" name="Second Life Help" />
-		<menu_item_call label="In-Welt-Hilfe" name="In-World Help" />
-		<menu_item_call label="Weitere Hilfe" name="Additional Help" />
-		<menu_item_call label="Tutorial" name="Tutorial" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="Offizielles Linden-Blog..." name="Official Linden Blog..." />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="Scripting-Anleitung..." name="Scripting Guide..." />
-		<menu_item_call label="Scripting-Portal..." name="Scripting Portal..." />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="Meldung des Tages..." name="Message of the Day..." />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu_item_call label="Missbrauch melden..." name="Report Abuse..." />
-		<menu_item_call label="Rempler, Stöße und Schläge..." name="Bumps, Pushes &amp;amp; Hits..." />
-		<menu_item_call label="Lag-Anzeige" name="Lag Meter" />
-		<menu_item_separator label=" -----------" name="separator7" />
-		<menu_item_separator label="-----------" name="separator5" />
+		<menu_item_call label="Hilfe zu Second Life" name="Second Life Help"/>
+		<menu_item_call label="Tutorial" name="Tutorial"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Offizielles Linden-Blog..." name="Official Linden Blog..."/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Scripting-Portal..." name="Scripting Portal..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Missbrauch melden..." name="Report Abuse..."/>
+		<menu_item_call label="Rempler, Stöße und Schläge..." name="Bumps, Pushes &amp;amp; Hits..."/>
+		<menu_item_call label="Lag-Anzeige" name="Lag Meter"/>
+		<menu_item_separator label="-----------" name="separator7"/>
 		<menu label="Fehlermeldungen" name="Bug Reporting">
-			<menu_item_call label="Allgemeiner Probleme-Tracker..." name="Public Issue Tracker..." />
-			<menu_item_call label="Hilfe zum Allgemeinen Probleme-Tracker..."
-			     name="Publc Issue Tracker Help..." />
-			<menu_item_separator label=" -----------" name="separator7" />
-			<menu_item_call label="Fehlermeldungs-1x1..." name="Bug Reporing 101..." />
-			<menu_item_call label="Sicherheitsfragen..." name="Security Issues..." />
-			<menu_item_call label="QA-Wiki..." name="QA Wiki..." />
-			<menu_item_separator label=" -----------" name="separator9" />
-			<menu_item_call label="Fehler melden..." name="Report Bug..." />
+			<menu_item_call label="Allgemeiner Probleme-Tracker..." name="Public Issue Tracker..."/>
+			<menu_item_call label="Hilfe zum Allgemeinen Probleme-Tracker..." name="Publc Issue Tracker Help..."/>
+			<menu_item_separator label="-----------" name="separator7"/>
+			<menu_item_call label="Fehlermeldungs-1x1..." name="Bug Reporing 101...">
+				<on_click function="PromptShowURL" name="BugReporting101_url"
+				     userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
+			</menu_item_call>
+			<menu_item_call label="Sicherheitsfragen..." name="Security Issues...">
+				<on_click name="SecurityIssues_url" userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues/de" />
+			</menu_item_call>
+			<menu_item_call label="QA-Wiki..." name="QA Wiki..."/>
+			<menu_item_separator label="-----------" name="separator9"/>
+			<menu_item_call label="Fehler melden..." name="Report Bug..."/>
 		</menu>
-		<menu_item_call label="Versionshinweise..." name="Release Notes..." />
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu_item_call label="Über Second Life..." name="About Second Life..." />
+		<menu_item_call label="Über Second Life..." name="About Second Life..."/>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/de/mime_types.xml b/indra/newview/skins/default/xui/de/mime_types.xml
index 57b074e77a..5384559446 100644
--- a/indra/newview/skins/default/xui/de/mime_types.xml
+++ b/indra/newview/skins/default/xui/de/mime_types.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <mimetypes name="default">
 	<widgetset name="web">
 		<label name="web_label">
@@ -16,7 +16,7 @@
 			Video
 		</label>
 		<tooltip name="movie_tooltip">
-			Kein Video gefunden
+			Ein Video wurde gefunden.
 		</tooltip>
 		<playtip name="movie_playtip">
 			Video wiedergeben
diff --git a/indra/newview/skins/default/xui/de/panel_friends.xml b/indra/newview/skins/default/xui/de/panel_friends.xml
index e82aa07340..17c073427c 100644
--- a/indra/newview/skins/default/xui/de/panel_friends.xml
+++ b/indra/newview/skins/default/xui/de/panel_friends.xml
@@ -4,7 +4,7 @@
 		Mehrere Freunde...
 	</string>
 	<scroll_list name="friend_list"
-	     tool_tip="Halten Sie die Tasten &apos;Umschalt&apos; oder &apos;Strg&apos; gedrückt, um durch Klicken mehrere Freunde auszuwählen.">
+	     tool_tip="Halten Sie die Tasten „Umschalt“ oder „Strg“ gedrückt, um durch Klicken mehrere Freunde auszuwählen.">
 		<column name="icon_online_status" tool_tip="Online-Status" />
 		<column label="Name" name="friend_name" tool_tip="Name" />
 		<column name="icon_visible_online" tool_tip="Freund kann sehen, wenn Sie online sind" />
diff --git a/indra/newview/skins/default/xui/de/panel_group_general.xml b/indra/newview/skins/default/xui/de/panel_group_general.xml
index d232bfaf07..1ecb304a31 100644
--- a/indra/newview/skins/default/xui/de/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_general.xml
@@ -1,36 +1,35 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Allgemein" name="general_tab">
-	<text name="help_text">
-		Die Registerkarte &apos;Allgemein&apos; enthält Informationen über
+	<string name="help_text">
+		Die Registerkarte „Allgemein“ enthält Informationen über
 diese Gruppe, eine Liste der Eigentümer und sichtbaren Mitglieder, 
 allgemeine Gruppeneinstellungen und Mitgliederoptionen.
 
 Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen.
-	</text>
+	</string>
 	<string name="group_info_unchanged">
 		Die allgemeine Gruppeninfo wurde geändert.
 	</string>
-	<button label="?" label_selected="?" name="help_button" />
-	<line_editor label="Neuen Gruppennamen hier eingeben" name="group_name_editor" />
+	<button label="?" label_selected="?" name="help_button"/>
+	<line_editor label="Neuen Gruppennamen hier eingeben" name="group_name_editor"/>
 	<text name="group_name">
 		Neuen Gruppennamen hier eingeben
 	</text>
 	<text name="prepend_founded_by">
 		Gegründet von
 	</text>
-	<text left_delta="80" name="founder_name">
+	<text name="founder_name" left_delta="79">
 		(wartet)
 	</text>
 	<text name="group_charter_label">
 		Gruppencharta
 	</text>
-	<texture_picker label="Gruppeninsignien" name="insignia"
-	     tool_tip="Klicken Sie hier, um ein Bild auszuwählen" />
+	<texture_picker label="Gruppeninsignien" name="insignia" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
 	<text_editor name="charter">
 		Gruppencharta
 	</text_editor>
-	<button label="Beitreten (0 L$)" label_selected="Beitreten (0 L$)" name="join_button" />
-	<button label="Detailansicht" label_selected="Detailansicht" name="info_button" />
+	<button label="Beitreten (0 L$)" label_selected="Beitreten (0 L$)" name="join_button"/>
+	<button label="Detailansicht" label_selected="Detailansicht" name="info_button"/>
 	<text name="text_owners_and_visible_members">
 		Eigentümer und sichtbare Mitglieder
 	</text>
@@ -38,37 +37,19 @@ Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen.
 		(Eigentümer werden fettgedruckt angezeigt)
 	</text>
 	<name_list name="visible_members">
-		<column label="Mitgliedsname" name="name" relwidth="0.40" />
-		<column label="Titel" name="title" relwidth="0.25" />
-		<column label="Letzte Anmeldung" name="online" relwidth="0.35" />
+		<column label="Mitgliedsname" name="name" relwidth="0.40"/>
+		<column label="Titel" name="title" relwidth="0.25"/>
+		<column label="Letzte Anmeldung" name="online" relwidth="0.35"/>
 	</name_list>
-	<text name="incomplete_member_data_str">
-		Mitgliedsdaten werden abgerufen
-	</text>
-	<text name="confirm_group_create_str">
-		Die Gründung dieser Gruppe kostet 100 L$. 
-Sind Sie wirklich, WIRKLICH sicher, dass Sie 100 L$ für die Gründung dieser Gruppe ausgeben möchten?
-Falls in den nächsten 48 Stunden niemand sonst dieser Gruppe beitritt, wird sie aufgelöst und der Name der Gruppe wird nicht mehr verfügbar sein.
-	</text>
 	<text name="text_group_preferences">
 		Gruppeneinstellungen
 	</text>
 	<panel name="preferences_container">
-		<check_box label="In Suche anzeigen" name="show_in_group_list"
-		     tool_tip="Diese Gruppe in Suchergebnissen anzeigen." />
-		<check_box label="Im Web veröffentlichen" name="publish_on_web"
-		     tool_tip="Festlegen, ob die Gruppeninformationen im Web veröffentlicht werden dürfen." />
-		<check_box label="Registrierung offen" name="open_enrollement"
-		     tool_tip="Festlegen, ob der Gruppenbeitritt ohne Einladung zulässig ist." />
-		<check_box label="Beitrittsgebühr: L$" name="check_enrollment_fee"
-		     tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen."
-		     width="125" />
-		<spinner name="spin_enrollment_fee"
-		     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.">
+		<check_box label="In Suche anzeigen" name="show_in_group_list" tool_tip="Diese Gruppe in Suchergebnissen anzeigen."/>
+		<check_box label="Registrierung offen" name="open_enrollement" tool_tip="Festlegen, ob der Gruppenbeitritt ohne Einladung zulässig ist."/>
+		<check_box label="Beitrittsgebühr: L$" name="check_enrollment_fee" tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen." width="125"/>
+		<spinner name="spin_enrollment_fee" tool_tip="Wenn „Beitrittsgebühr“ aktiviert ist, müssen neue Mitglieder diesen Betrag zahlen."/>
+		<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>
@@ -83,11 +64,17 @@ Falls in den nächsten 48 Stunden niemand sonst dieser Gruppe beitritt, wird sie
 			<text name="active_title_label">
 				Mein aktiver Titel
 			</text>
+			<combo_box name="active_title" tool_tip="Legt fest, was im Namensschild Ihres Avatars angezeigt wird, wenn diese Gruppe aktiviert ist."/>
 		</panel>
-		<check_box label="Gruppenmitteilungen erhalten" name="receive_notices"
-		     tool_tip="Festlegen, ob Sie von dieser Gruppe Mitteilungen erhalten können.  Deaktivieren Sie diese Option, wenn Sie von der Gruppe Spam erhalten."
-		     width="173" />
-		<check_box label="Gruppe im Profil anzeigen" name="list_groups_in_profile"
-		     tool_tip="Steuert, ob diese Gruppe in Ihrem Profil angezeigt wird" />
+		<check_box label="Gruppenmitteilungen erhalten" name="receive_notices" tool_tip="Festlegen, ob Sie von dieser Gruppe Mitteilungen erhalten können.  Deaktivieren Sie diese Option, wenn Sie von der Gruppe Spam erhalten." width="173"/>
+		<check_box label="Gruppe im Profil anzeigen" name="list_groups_in_profile" tool_tip="Steuert, ob diese Gruppe in Ihrem Profil angezeigt wird"/>
 	</panel>
+	<string name="incomplete_member_data_str">
+		Mitgliedsdaten werden abgerufen
+	</string>
+	<string name="confirm_group_create_str">
+		Die Gründung dieser Gruppe kostet 100 L$. 
+Sind Sie wirklich, WIRKLICH sicher, dass Sie 100 L$ für die Gründung dieser Gruppe ausgeben möchten?
+Falls in den nächsten 48 Stunden niemand sonst dieser Gruppe beitritt, wird sie aufgelöst und der Name der Gruppe wird nicht mehr verfügbar sein.
+	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_group_invite.xml b/indra/newview/skins/default/xui/de/panel_group_invite.xml
index 0ad1aeb648..96af8e3021 100644
--- a/indra/newview/skins/default/xui/de/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_invite.xml
@@ -3,7 +3,7 @@
 	<text name="help_text">
 		Sie können mehrere Einwohner zu Ihrer
 Gruppe einladen. Klicken Sie auf
-&apos;Personenauswahl öffnen&apos;.
+„Personenauswahl öffnen“.
 	</text>
 	<button label="Personenauswahl öffnen" name="add_button" tool_tip="" />
 	<name_list name="invitee_list"
diff --git a/indra/newview/skins/default/xui/de/panel_group_land_money.xml b/indra/newview/skins/default/xui/de/panel_group_land_money.xml
index 77a98166a1..f942819c1d 100644
--- a/indra/newview/skins/default/xui/de/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_land_money.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Land und L$" name="land_money_tab">
 	<text name="help_text">
-		Es werden Parzellen in Gruppenbesitz und Beitragsdetails angezeigt. Solange der Wert für &apos;Insgesamt verwendetes Land&apos; unter oder gleich dem Wert für &apos;Gesamtbeitrag&apos; ist, wird eine Warnung angezeigt. Die Registerkarten &apos;Planung&apos;, &apos;Details&apos; und &apos;Verkäufe&apos; enthalten Informationen über die Gruppenfinanzen.
+		Es werden Parzellen in Gruppenbesitz und Beitragsdetails angezeigt. Solange der Wert für „Insgesamt verwendetes Land“ unter oder gleich dem Wert für „Gesamtbeitrag“ ist, wird eine Warnung angezeigt. Die Registerkarten „Planung“, „Details“ und „Verkäufe“ enthalten Informationen über die Gruppenfinanzen.
 	</text>
 	<button label="?" name="help_button" />
 	<text name="cant_view_group_land_text">
diff --git a/indra/newview/skins/default/xui/de/panel_group_notices.xml b/indra/newview/skins/default/xui/de/panel_group_notices.xml
index 53f581313a..5189eea6a1 100644
--- a/indra/newview/skins/default/xui/de/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_notices.xml
@@ -6,7 +6,7 @@ Mitglieder auf dem Laufenden zu halten und
 Objekte im Anhang zu versenden. Mitteilungen werden
 nur an Mitglieder mit einer entsprechenden Rolle 
 gesendet. Mitteilungen können unter 
-&apos;Allgemein&apos; ausgeschaltet werden.
+„Allgemein“ ausgeschaltet werden.
 	</text>
 	<text name="no_notices_text">
 		Keine älteren Mitteilungen.
@@ -17,7 +17,7 @@ gesendet. Mitteilungen können unter
 	</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.
+um sie anzuzeigen. Klicken Sie auf „Aktualisieren“, um neue Mitteilungen zu suchen.
 Eine Mitteilungsliste speichert maximal 200 Mitteilungen pro Gruppe täglich.
 	</text>
 	<scroll_list name="notice_list">
@@ -63,7 +63,7 @@ und transferierbar sein. Ordner können nicht gesendet werden.
 			Archivierte Mitteilung
 		</text>
 		<text name="lbl2">
-			Klicken Sie zum Senden einer Mitteilung auf &apos;Neue Mitteilung&apos;.
+			Klicken Sie zum Senden einer Mitteilung auf „Neue Mitteilung“.
 		</text>
 		<text name="lbl3">
 			Betreff:
diff --git a/indra/newview/skins/default/xui/de/panel_group_roles.xml b/indra/newview/skins/default/xui/de/panel_group_roles.xml
index 204759f43d..f5671fc852 100644
--- a/indra/newview/skins/default/xui/de/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_roles.xml
@@ -1,15 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Mitglieder und Rollen" name="roles_tab">
-	<text name="default_needs_apply_text">
+	<string name="default_needs_apply_text">
 		Das Unterregister enthält nicht übernommene Änderungen.
-	</text>
-	<text name="want_apply_text">
+	</string>
+	<string name="want_apply_text">
 		Diese Änderungen übernehmen?
-	</text>
-	<text name="cant_delete_role">
-		Die Rollen &apos;Jeder&apos; und &apos;Eigentümer&apos; können nicht gelöscht werden.
-	</text>
-	<button label="?" name="help_button" />
+	</string>
+	<button label="?" name="help_button"/>
 	<panel name="members_header">
 		<text name="static">
 			Mitglieder und Rollen
@@ -47,52 +44,52 @@ Mitglieder diese Fähigkeit haben.
 	</panel>
 	<tab_container name="roles_tab_container">
 		<panel label="Mitglieder" name="members_sub_tab" tool_tip="Mitglieder">
-			<button label="Suchen" name="search_button" />
-			<button label="Alle anzeigen" name="show_all_button" />
+			<button label="Suchen" name="search_button"/>
+			<button label="Alle anzeigen" name="show_all_button"/>
 			<name_list name="member_list">
-				<column label="Mitgliedsname" name="name" />
-				<column name="donated" />
-				<column label="Letzte Anmeldung" name="online" />
+				<column label="Mitgliedsname" name="name" width="116"/>
+				<column label="Übertragene Landanteile" name="donated" width="156"/>
+				<column label="Letzte Anmeldung" name="online"/>
 			</name_list>
-			<button label="Neue Person einladen..." name="member_invite" />
-			<button label="Aus Gruppe werfen" name="member_eject" />
-			<text name="help_text">
+			<button label="Neue Person einladen..." name="member_invite"/>
+			<button label="Aus Gruppe werfen" name="member_eject"/>
+			<string name="help_text">
 				Sie können Mitgliedern Rollen zuweisen und entziehen.
 Drücken Sie die Strg-Taste und klicken Sie auf Namen,
 um mehrere Mitglieder auszuwählen.
-			</text>
+			</string>
 		</panel>
 		<panel label="Rollen" name="roles_sub_tab">
-			<button label="Suchen" name="search_button" />
-			<button label="Alle anzeigen" name="show_all_button" />
+			<button label="Suchen" name="search_button"/>
+			<button label="Alle anzeigen" name="show_all_button"/>
 			<scroll_list name="role_list">
-				<column name="name" />
-				<column label="Titel" name="title" />
-				<column label="Mitglieder" name="members" />
+				<column label="Rolle" name="name" width="126"/>
+				<column label="Titel" name="title" width="180"/>
+				<column label="Mitglieder" name="members" width="82"/>
 			</scroll_list>
-			<button label="Neue Rolle erstellen..." name="role_create" />
-			<button label="Rolle löschen" name="role_delete" />
-			<text name="help_text">
+			<button label="Neue Rolle erstellen..." name="role_create"/>
+			<button label="Rolle löschen" name="role_delete"/>
+			<string name="help_text">
 				Rollen haben einen Titel und umfassen bestimmte
 Fähigkeiten. Mitglieder können mehrere 
 Rollen innehaben. Eine Gruppe kann bis zu 10 Rollen
-definieren, darunter &apos;Jeder&apos; und &apos;Eigentümer&apos;.
-			</text>
+definieren, darunter „Jeder“ und „Eigentümer“.
+			</string>
 			<string name="cant_delete_role">
-				Die Rollen &apos;Jeder&apos; und &apos;Eigentümer&apos; können nicht gelöscht werden.
+				Die Rollen „Jeder“ und „Eigentümer“ können nicht gelöscht werden.
 			</string>
 		</panel>
 		<panel label="Fähigkeiten" name="actions_sub_tab">
-			<button label="Suchen" name="search_button" />
-			<button label="Alle anzeigen" name="show_all_button" />
+			<button label="Suchen" name="search_button"/>
+			<button label="Alle anzeigen" name="show_all_button"/>
 			<scroll_list name="action_list" tool_tip="Select an Ability to view more details.">
-				<column label="" name="icon" />
-				<column label="" name="action" />
+				<column label="" name="icon"/>
+				<column label="" name="action"/>
 			</scroll_list>
-			<text name="help_text">
+			<string name="help_text">
 				Fähigkeiten verleihen Mitgliedern in Rollen bestimmte
 Rechte in einer Gruppe. Es gibt viele verschiedene Fähigkeiten.
-			</text>
+			</string>
 		</panel>
 	</tab_container>
 	<panel name="members_footer">
@@ -103,13 +100,12 @@ Rechte in einer Gruppe. Es gibt viele verschiedene Fähigkeiten.
 			Zulässige Fähigkeiten
 		</text>
 		<scroll_list name="member_assigned_roles">
-			<column label="" name="checkbox" />
-			<column label="" name="role" />
+			<column label="" name="checkbox"/>
+			<column label="" name="role"/>
 		</scroll_list>
-		<scroll_list name="member_allowed_actions"
-		     tool_tip="For Details of each Allowed Ability see the Abilities tab.">
-			<column label="" name="icon" />
-			<column label="" name="action" />
+		<scroll_list name="member_allowed_actions" tool_tip="Um detaillierte Informationen zu erlaubten Fähigkeiten anzuzeigen, siehe Reiter Fähigkeiten.">
+			<column label="" name="icon"/>
+			<column label="" name="action"/>
 		</scroll_list>
 	</panel>
 	<panel name="roles_footer">
@@ -134,17 +130,14 @@ Rechte in einer Gruppe. Es gibt viele verschiedene Fähigkeiten.
 		<text name="static4">
 			Mitglieder in Rolle
 		</text>
-		<text name="static5"
-		     tool_tip="Eine Liste der Fähigkeiten der aktuell ausgewählten Rolle.">
+		<text name="static5" tool_tip="Eine Liste der Fähigkeiten der aktuell ausgewählten Rolle.">
 			Zulässige Fähigkeiten
 		</text>
-		<check_box label="Mitglieder sind sichtbar" name="role_visible_in_list"
-		     tool_tip="Festlegen, ob Mitglieder in dieser Rolle auf der Registerkarte &apos;Allgemein&apos; für Personen außerhalb der Gruppe sichtbar sind." />
-		<scroll_list name="role_allowed_actions"
-		     tool_tip="For Details of each Allowed Ability see the Abilities tab.">
-			<column label="" name="icon" />
-			<column label="" name="checkbox" />
-			<column label="" name="action" />
+		<check_box label="Mitglieder sind sichtbar" name="role_visible_in_list" tool_tip="Festlegen, ob Mitglieder in dieser Rolle auf der Registerkarte „Allgemein“ für Personen außerhalb der Gruppe sichtbar sind."/>
+		<scroll_list name="role_allowed_actions" tool_tip="Um detaillierte Informationen zu erlaubten Fähigkeiten anzuzeigen, siehe Reiter Fähigkeiten.">
+			<column label="" name="icon"/>
+			<column label="" name="checkbox"/>
+			<column label="" name="action"/>
 		</scroll_list>
 	</panel>
 	<panel name="actions_footer">
@@ -152,7 +145,7 @@ Rechte in einer Gruppe. Es gibt viele verschiedene Fähigkeiten.
 			Beschreibung
 		</text>
 		<text_editor name="action_description">
-			Diese Fähigkeit heißt &apos;Mitglieder aus dieser Gruppe werfen&apos;. Eigentümer können nur von anderen Eigentümern hinausgeworfen werden.
+			Diese Fähigkeit heißt „Mitglieder aus dieser Gruppe werfen“. Eigentümer können nur von anderen Eigentümern hinausgeworfen werden.
 		</text_editor>
 		<text name="static2">
 			Rollen mit Fähigkeit
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
index fbf57426e0..0fad717551 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
@@ -1,26 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Allgemein" name="general_panel">
-	<combo_box name="location_combobox">
-		<combo_item name="MyHome">
+	<radio_group name="default_start_location">
+		<radio_item name="MyHome" tool_tip="Als Standardeinstellung in Zuhauseposition anmelden.">
 			Mein Heimatort
-		</combo_item>
-		<combo_item name="MyLastLocation">
-			Mein letzter Standort
-		</combo_item>
-	</combo_box>
-	<check_box label="Startposition auf Anmeldebildschirm anzeigen"
-	     name="show_location_checkbox" />
-	<radio_group name="fade_out_radio">
-		<radio_item type="string" length="1" name="Never">
-			Nie
 		</radio_item>
-		<radio_item type="string" length="1" name="Temporarily">
-			Temporär anzeigen
-		</radio_item>
-		<radio_item type="string" length="1" name="Always">
-			Immer
+		<radio_item name="MyLastLocation" tool_tip="Als Standardeinstellung in letztem Standort anmelden.">
+			Mein letzter Standort
 		</radio_item>
 	</radio_group>
+	<check_box label="Startposition auf Anmeldebildschirm anzeigen" name="show_location_checkbox"/>
 	<combo_box name="fade_out_combobox">
 		<combo_item name="Never">
 			Nie
@@ -32,93 +20,95 @@
 			Immer
 		</combo_item>
 	</combo_box>
-	<check_box label="Meinen Namen auf meinem Bildschirm ausblenden"
-	     name="show_my_name_checkbox" />
+	<check_box label="Kleine Avatarnamen" name="small_avatar_names_checkbox"/>
+	<check_box label="Meinen Namen auf meinem Bildschirm ausblenden" name="show_my_name_checkbox"/>
 	<text name="group_titles_textbox">
 		Gruppentitel:
 	</text>
-	<check_box label="Alle Gruppentitel ausblenden" name="show_all_title_checkbox" />
-	<check_box label="Meinen Gruppentitel ausblenden" name="show_my_title_checkbox" />
-	<check_box label="Kleine Avatarnamen" name="small_avatar_names_checkbox" />
-	<color_swatch label="" name="effect_color_swatch"
-	     tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen" />
+	<check_box label="Alle Gruppentitel ausblenden" name="show_all_title_checkbox"/>
+	<check_box label="Meinen Gruppentitel ausblenden" name="show_my_title_checkbox"/>
+	<color_swatch label="" name="effect_color_swatch" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
 	<text name="UI Size:">
 		UI-Größe:
 	</text>
-	<check_box label="Auflösungsunabhängigen Maßstab verwenden" name="ui_auto_scale" />
-	<spinner label="Timeout für Abwesenheit:" name="afk_timeout_spinner" />
-	<check_box label="Online-Freundbenachrichtigungen anzeigen"
-	     name="friends_online_notify_checkbox" />
-	<check_box label="Minikarte drehen" name="rotate_mini_map_checkbox" />
-	<check_box label="L$ Eingänge und Ausgaben melden" name="notify_money_change_checkbox" />
-	<check_box label="Standard-Farbauswahl verwenden" name="use_system_color_picker_checkbox"
-	     tool_tip="Standard-Farbauswahl des Systems anstelle des Second Life-eigenen verwenden." />
-	<check_box label="Suchleiste in Menüleiste anzeigen" name="show_search_panel"
-	     tool_tip="Die eingebettete Suchleiste anzeigen." />
-	<text type="string" length="1" name="start_location_textbox">
+	<check_box label="Auflösungsunabhängigen Maßstab verwenden" name="ui_auto_scale"/>
+	<spinner label="Timeout für Abwesenheit:" name="afk_timeout_spinner"/>
+	<check_box label="Minikarte drehen" name="rotate_mini_map_checkbox"/>
+	<check_box label="L$ Eingänge und Ausgaben melden" name="notify_money_change_checkbox"/>
+	<check_box label="Standard-Farbauswahl verwenden" name="use_system_color_picker_checkbox" tool_tip="Standard-Farbauswahl des Systems anstelle des Second Life-eigenen verwenden."/>
+	<check_box label="Suchleiste in Menüleiste anzeigen" name="show_search_panel" tool_tip="Die eingebettete Suchleiste anzeigen."/>
+	<text name="start_location_textbox">
 		Startposition:
 	</text>
-	<text type="string" length="1" name="show_names_textbox">
+	<text name="show_names_textbox">
 		Namen anzeigen:
 	</text>
-	<text type="string" length="1" name="effects_color_textbox">
+	<text name="effects_color_textbox">
 		Farbe für meine Effekte:
 	</text>
-	<text type="string" length="1" name="seconds_textbox">
+	<text name="seconds_textbox">
 		Sekunden
 	</text>
-	<text type="string" length="1" name="crash_report_textbox">
+	<text name="crash_report_textbox">
 		Crash-Berichte:
 	</text>
-	<text type="string" length="1" name="language_textbox">
+	<text name="language_textbox">
 		Sprache:
 	</text>
-	<text type="string" length="1" name="language_textbox2">
+	<text name="language_textbox2">
 		(Erfordert Neustart)
 	</text>
-	<text name="region_name_prompt">
+	<string name="region_name_prompt">
 		&lt;Region eingeben&gt;
-	</text>
+	</string>
 	<combo_box name="crash_behavior_combobox">
-		<combo_item type="string" length="1" name="Askbeforesending">
+		<combo_item name="Askbeforesending">
 			Vor dem Senden fragen
 		</combo_item>
-		<combo_item type="string" length="1" name="Alwayssend">
+		<combo_item name="Alwayssend">
 			Immer senden
 		</combo_item>
-		<combo_item type="string" length="1" name="Neversend">
+		<combo_item name="Neversend">
 			Nie senden
 		</combo_item>
 	</combo_box>
 	<combo_box name="language_combobox">
-		<combo_item type="string" length="1" name="System Default Language">
+		<combo_item name="System Default Language">
 			Betriebssystem-Einstellung
 		</combo_item>
-		<combo_item type="string" length="1" name="English">
+		<combo_item name="English">
 			English (Englisch)
 		</combo_item>
-		<combo_item type="string" length="1" name="Chinese">
-			汉语/漢語 (Chinesisch) - Beta
+		<combo_item name="Danish">
+			Danks (Dänisch) - Beta
 		</combo_item>
-		<combo_item type="string" length="1" name="Deutsch(German)">
+		<combo_item name="Deutsch(German)">
 			Deutsch - Beta
 		</combo_item>
-		<combo_item type="string" length="1" name="French">
+		<combo_item name="Spanish">
+			Español (Spanisch) - Beta
+		</combo_item>
+		<combo_item name="French">
 			Français (Französisch) - Beta
 		</combo_item>
-		<combo_item type="string" length="1" name="(Japanese)">
-			日本語 (Japanisch) - Beta
+		<combo_item name="Hungarian">
+			Magyar (Ungarisch) - Beta
 		</combo_item>
-		<combo_item type="string" length="1" name="(Korean)">
-			한국어 (Koreanisch) - Beta
+		<combo_item name="Polish">
+			Polski (Polnisch) - Beta
 		</combo_item>
-		<combo_item type="string" length="1" name="Portugese">
+		<combo_item name="Portugese">
 			Português (Portugiesisch) - Beta
 		</combo_item>
-		<combo_item type="string" length="1" name="Spanish">
-			Español (Spanisch) - Beta
+		<combo_item name="Chinese">
+			汉语/漢語 (Chinesisch) - Beta
+		</combo_item>
+		<combo_item name="(Japanese)">
+			日本語 (Japanisch) - Beta
+		</combo_item>
+		<combo_item name="(Korean)">
+			한국어 (Koreanisch) - Beta
 		</combo_item>
 	</combo_box>
-	<check_box label="Objekten Sprache mitteilen" name="language_is_public"
-	     tool_tip="In-Welt-Objekten wird Ihre bevorzugte Spracheinstellung mitgeteilt." />
+	<check_box label="Objekten Sprache mitteilen" name="language_is_public" tool_tip="In-Welt-Objekten wird Ihre bevorzugte Spracheinstellung mitgeteilt."/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_region_debug.xml b/indra/newview/skins/default/xui/de/panel_region_debug.xml
index 7d6b1ffc41..9e03ebeda3 100644
--- a/indra/newview/skins/default/xui/de/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_debug.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Debug" name="Debug">
 	<text name="region_text_lbl">
 		Region:
@@ -6,42 +6,35 @@
 	<text name="region_text">
 		unbekannt
 	</text>
-	<check_box label="Skripts deaktivieren" name="disable_scripts_check"
-	     tool_tip="Skripts in dieser Region deaktivieren" />
-	<button label="?" name="disable_scripts_help" />
-	<check_box label="Kollisionen deaktivieren" name="disable_collisions_check"
-	     tool_tip="Nicht-Avatar-Kollisionen in dieser Region deaktivieren" />
-	<button label="?" name="disable_collisions_help" />
-	<check_box label="Physik deaktivieren" name="disable_physics_check"
-	     tool_tip="Physik in dieser Region deaktivieren" />
-	<button label="?" name="disable_physics_help" />
-	<button label="Übernehmen" name="apply_btn" />
+	<check_box label="Skripts deaktivieren" name="disable_scripts_check" tool_tip="Skripts in dieser Region deaktivieren"/>
+	<button label="?" name="disable_scripts_help"/>
+	<check_box label="Kollisionen deaktivieren" name="disable_collisions_check" tool_tip="Nicht-Avatar-Kollisionen in dieser Region deaktivieren"/>
+	<button label="?" name="disable_collisions_help"/>
+	<check_box label="Physik deaktivieren" name="disable_physics_check" tool_tip="Physik in dieser Region deaktivieren"/>
+	<button label="?" name="disable_physics_help"/>
+	<button label="Übernehmen" name="apply_btn"/>
+	<text name="objret_text_lbl" width="105">
+		Objekt zurückgeben
+	</text>
+	<text name="resident_text_lbl">
+		Einwohner:
+	</text>
 	<line_editor name="target_avatar_name">
 		(keiner)
 	</line_editor>
-	<button label="Auswählen..." name="choose_avatar_btn" />
-	<button label="Skriptobjekte des Avatars auf fremdem Land zurückgeben"
-	     name="return_scripted_other_land_btn" />
-	<button label="ALLE Skriptobjekte des Avatars zurückgeben"
-	     name="return_scripted_all_btn" />
-	<check_box label="Nur Objekte mit Skripten zurückgeben" name="return_scripts"
-	     tool_tip="Es werden nur die Objekte zurückgegeben, die über Skripte verfügen." />
-	<check_box label="Nur Objekte auf dem Land eines anderen Einwohners zurückgeben"
-	     name="return_other_land"
-	     tool_tip="Es werden nur die Objekte zurückgegeben, die sich auf dem Land eines anderen Einwohners befinden" />
-	<check_box label="Objekte in jeder Region dieses Grundstücks zurückgeben"
-	     name="return_estate_wide"
-	     tool_tip="Es werden die Objekte in allen Regionen dieses Grundstücks zurückgegeben" />
-	<button label="Zurückgeben" name="return_btn" width="90" />
-	<button label="Top-Kollisionsobjekte..." name="top_colliders_btn"
-	     tool_tip="Liste der Objekte mit den meisten potenziellen Kollisionen" />
-	<button label="?" name="top_colliders_help" />
-	<button label="Top-Skripts..." name="top_scripts_btn"
-	     tool_tip="Zeigt eine Liste der Objekte an, die die meiste Zeit benötigen um Skripts auszuführen." />
-	<button label="?" name="top_scripts_help" />
-	<button label="Region neu starten" name="restart_btn"
-	     tool_tip="2-Minuten-Countdown und Region neu starten" />
-	<button label="?" name="restart_help" />
-	<button label="Neustart verzögern" name="cancel_restart_btn"
-	     tool_tip="Regionsneustart um eine Stunde verschieben" />
+	<button label="Auswählen..." name="choose_avatar_btn"/>
+	<text name="options_text_lbl">
+		Optionen:
+	</text>
+	<check_box label="Nur Objekte mit Skripten zurückgeben" name="return_scripts" tool_tip="Es werden nur die Objekte zurückgegeben, die über Skripte verfügen."/>
+	<check_box label="Nur Objekte auf dem Land eines anderen Einwohners zurückgeben" name="return_other_land" tool_tip="Es werden nur die Objekte zurückgegeben, die sich auf dem Land eines anderen Einwohners befinden"/>
+	<check_box label="Objekte in jeder Region dieses Grundstücks zurückgeben" name="return_estate_wide" tool_tip="Es werden die Objekte in allen Regionen dieses Grundstücks zurückgegeben"/>
+	<button label="Zurückgeben" name="return_btn" width="90"/>
+	<button label="Top-Kollisionsobjekte..." name="top_colliders_btn" tool_tip="Liste der Objekte mit den meisten potenziellen Kollisionen"/>
+	<button label="?" name="top_colliders_help"/>
+	<button label="Top-Skripts..." name="top_scripts_btn" tool_tip="Zeigt eine Liste der Objekte an, die die meiste Zeit benötigen, um Skripts auszuführen."/>
+	<button label="?" name="top_scripts_help"/>
+	<button label="Region neu starten" name="restart_btn" tool_tip="2-Minuten-Countdown und Region neu starten"/>
+	<button label="?" name="restart_help"/>
+	<button label="Neustart verzögern" name="cancel_restart_btn" tool_tip="Regionsneustart um eine Stunde verschieben"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_region_estate.xml b/indra/newview/skins/default/xui/de/panel_region_estate.xml
index 625f6ab9de..ddc5941da6 100644
--- a/indra/newview/skins/default/xui/de/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_estate.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Grundstück" name="Estate">
 	<text name="estate_help_text">
-		Änderungen auf dieser Registerkarte wirken sich auf alle Regionen auf dem Grundstück aus.
+		Änderungen auf dieser Registerkarte wirken sich
+auf alle Regionen auf dem Grundstück aus.
 	</text>
 	<text name="estate_text">
 		Grundstück:
diff --git a/indra/newview/skins/default/xui/de/panel_status_bar.xml b/indra/newview/skins/default/xui/de/panel_status_bar.xml
index d0c3460f6f..adfe38797d 100644
--- a/indra/newview/skins/default/xui/de/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/de/panel_status_bar.xml
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="status">
-	<text type="string" length="1" name="ParcelNameText"
-	     tool_tip="Der Name der Parzelle, auf der Sie sich befinden. Klicken Sie für Land-Informationen.">
+	<text length="1" name="ParcelNameText" tool_tip="Der Name der Parzelle, auf der Sie sich befinden. Klicken Sie für Land-Informationen." type="string">
 		Parzellenname hier
 	</text>
-	<text type="string" length="1" name="BalanceText" tool_tip="Kontostand">
+	<text length="1" name="BalanceText" tool_tip="Kontostand" type="string">
 		Wird geladen...
 	</text>
-	<button label="" label_selected="" name="buycurrency" tool_tip="Geld kaufen" />
-	<text type="string" length="12" name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)">
+	<button label="" label_selected="" name="buycurrency" tool_tip="Geld kaufen"/>
+	<text length="12" name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)" type="string">
 		12:00
 	</text>
 	<text name="StatBarDaysOfWeek">
@@ -17,29 +16,27 @@
 	<text name="StatBarMonthsOfYear">
 		Januar:Februar:März:April:Mai:Juni:Juli:August:September:Oktober:November:Dezember
 	</text>
-	<button label="" label_selected="" name="scriptout"
-	     tool_tip="Skriptwarnungen und -fehler" />
-	<button label="" label_selected="" name="health" tool_tip="Gesundheit" />
-	<text type="string" length="1" name="HealthText" tool_tip="Gesundheit">
+	<button label="" label_selected="" name="scriptout" tool_tip="Skriptwarnungen und -fehler"/>
+	<button label="" label_selected="" name="health" tool_tip="Gesundheit"/>
+	<text length="1" name="HealthText" tool_tip="Gesundheit" type="string">
 		100%
 	</text>
-	<button label="" label_selected="" name="fly" tool_tip="Fliegen aus" />
-	<button label="" label_selected="" name="build" tool_tip="Bauen aus" />
-	<button label="" label_selected="" name="scripts" tool_tip="Skripts aus" />
-	<button name="no_fly" tool_tip="Fliegen ist unzulässig" />
-	<button name="no_build" tool_tip="Bauen/Rezzen ist unzulässig" />
-	<button name="no_scripts" tool_tip="Skripte sind unzulässig" />
-	<button label="" label_selected="" name="restrictpush"
-	     tool_tip="llPushObject beschränkt" />
-	<button name="status_voice" tool_tip="Voice aktiviert" />
-	<button name="status_no_voice" tool_tip="Voice hier nicht möglich" />
-	<button label="" label_selected="" name="buyland" tool_tip="Diese Parzelle kaufen" />
+	<button label="" label_selected="" name="fly" tool_tip="Fliegen aus"/>
+	<button label="" label_selected="" name="build" tool_tip="Bauen aus"/>
+	<button label="" label_selected="" name="scripts" tool_tip="Skripts aus"/>
+	<button name="no_fly" tool_tip="Fliegen ist unzulässig"/>
+	<button name="no_build" tool_tip="Bauen/Rezzen ist unzulässig"/>
+	<button name="no_scripts" tool_tip="Skripte sind unzulässig"/>
+	<button label="" label_selected="" name="restrictpush" tool_tip="Kein Stoßen"/>
+	<button name="status_voice" tool_tip="Voice aktiviert"/>
+	<button name="status_no_voice" tool_tip="Voice hier nicht möglich"/>
+	<button label="" label_selected="" name="buyland" tool_tip="Diese Parzelle kaufen"/>
 	<text name="packet_loss_tooltip">
 		Paketverlust
 	</text>
 	<text name="bandwidth_tooltip">
 		Bandbreite
 	</text>
-	<line_editor label="Suchen" name="search_editor" tool_tip="Second Life durchsuchen" />
-	<button name="search_btn" tool_tip="Second Life durchsuchen" />
+	<line_editor label="Suchen" name="search_editor" tool_tip="Second Life durchsuchen"/>
+	<button name="search_btn" tool_tip="Second Life durchsuchen"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
index 1411093a82..ce401c16b9 100644
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -132,54 +132,33 @@
 			<text type="string" length="1" name="Simulator primitive usage:">
 				Simulador de primitiva usado:
 			</text>
-			<text type="string" length="1" name="0 out of 0 available">
-				0 de 14055 (14055 disponible)
-			</text>
 			<text type="string" length="1" name="Primitives parcel supports:">
 				Primitivas en la parcela soportan:
 			</text>
-			<text type="string" length="1" name="object_contrib_text">
-				926
-			</text>
 			<text type="string" length="1" name="Primitives on parcel:">
 				Primitivas en la parcela:
 			</text>
-			<text type="string" length="1" name="total_objects_text">
-				0
-			</text>
 			<text type="string" length="1" name="Owned by parcel owner:">
 				Pertenecientes al propietario de la parcela:
 			</text>
-			<text type="string" length="1" name="owner_objects_text">
-				0
-			</text>
 			<button label="Mostrar" label_selected="Mostrar" name="ShowOwner" />
 			<button label="Retornar..." label_selected="Retornar..." name="ReturnOwner..."
 			     tool_tip="Devolver objetos para sus propietarios." />
 			<text type="string" length="1" name="Set to group:">
 				Definido para el grupo:
 			</text>
-			<text type="string" length="1" name="group_objects_text">
-				0
-			</text>
 			<button label="Mostrar" label_selected="Mostrar" name="ShowGroup" />
 			<button label="Retornar..." label_selected="Retornar..." name="ReturnGroup..."
 			     tool_tip="Devolver objetos para sus propietarios." />
 			<text type="string" length="1" name="Owned by others:">
 				Pertenecientes a otros:
 			</text>
-			<text type="string" length="1" name="other_objects_text">
-				0
-			</text>
 			<button label="Mostrar" label_selected="Mostrar" name="ShowOther" />
 			<button label="Retornar..." label_selected="Retornar..." name="ReturnOther..."
 			     tool_tip="Devolver objetos para sus propietarios." />
 			<text type="string" length="1" name="Selected / sat upon:">
 				Seleccionado / puesto en:
 			</text>
-			<text type="string" length="1" name="selected_objects_text">
-				0
-			</text>
 			<text type="string" length="1" name="Autoreturn other resident&amp;apos;s objects (minutes, 0 for off):">
 				Autoretornar objetos de otros residentes (minutos, 0 para desligar):
 			</text>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index bb67d7cfa8..d688337055 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -76,7 +76,7 @@
 		<menu_item_check label="Historial del chat" name="Chat History" />
 		<menu_item_check label="Mensaje instantáneo" name="Instant Message" />
 		<menu_item_call label="Inventario" name="Inventory" />
-		<menu_item_check label="Dejar sin sonido por la lista" name="Mute List" />
+		<menu_item_check label="Residentes &amp; Objetos sin sonido" name="Mute List" />
 		<menu_item_separator label="-----------" name="separator2" />
 		<menu_item_check label="Controles de cámara" name="Camera Controls" />
 		<menu_item_check label="Controles de movimiento" name="Movement Controls" />
diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
index 31b4c95f43..3f6d47cd94 100644
--- a/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_about" title="A propos de Second Life">
 	<text_editor name="credits_editor">
 		Second Life existe grâce aux efforts de Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ et de nombreuses autres personnes.
@@ -26,7 +26,7 @@
   Codage Audio du chat vocal : Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 
 
-  On ne peut pas voir très loin devant nous, mais l&apos;on peut déjà y voir qu&apos;il y a beaucoup à faire. --Alan Turing
+  On ne peut pas voir très loin devant nous, mais l&apos;on peut déjà y voir qu&apos;il y a beaucoup à faire. -Alan Turing
 	</text_editor>
 	<string name="you_are_at">
 		Votre position : [POSITION]
diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml
index 50ce466192..c922562b70 100644
--- a/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -1,91 +1,81 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floaterland" title="À propos du terrain">
 	<tab_container name="landtab">
 		<panel label="Général" name="land_general_panel">
-			<text type="string" length="1" name="Name:">
+			<text length="1" name="Name:" type="string">
 				Nom :
 			</text>
-			<text type="string" length="1" name="Description:">
+			<line_editor name="Name"/>
+			<text length="1" name="Description:" type="string">
 				Description :
 			</text>
-			<text type="string" length="1" name="Owner:">
+			<text_editor name="Description"/>
+			<text length="1" name="Owner:" type="string">
 				Propriétaire :
 			</text>
-			<text type="string" length="1" name="OwnerText">
+			<text length="1" name="OwnerText" type="string">
 				Leyla Linden
 			</text>
-			<button label="Profil..." label_selected="Profil..." name="Profile..." />
-			<text type="string" length="1" name="Group:">
+			<button label="Profil..." label_selected="Profil..." name="Profile..."/>
+			<text length="1" name="Group:" type="string">
 				Groupe :
 			</text>
-			<button label="Définir..." label_selected="Définir..." name="Set..." />
-			<check_box label="Autoriser le transfert au groupe" name="check deed"
-			     tool_tip="Un officier peut transférer ce terrain au groupe. Il viendra alors s&apos;ajouter au patrimoine du groupe." />
-			<button label="Transférer..." label_selected="Transférer..." name="Deed..."
-			     tool_tip="Vous ne pouvez transférer le terrain que si vous avez un rôle d&apos;officier dans le groupe sélectionné." />
-			<check_box label="Le propriétaire contribue par transfert" name="check contib"
-			     tool_tip="Lorsque le terrain est transféré au groupe, la contribution du précédent propriétaire suffit à l&apos;entretenir." />
-			<check_box label="Le propriétaire contribue par une donation" name="check contrib"
-			     tool_tip="Lorsqu&apos;un titre de propriété est transféré au groupe, l&apos;ancien propriétaire fait également un don de terrain suffisant." />
-			<text type="string" length="1" name="For Sale:">
+			<text name="GroupText"/>
+			<button label="Définir..." label_selected="Définir..." name="Set..."/>
+			<check_box label="Autoriser la cession au groupe" name="check deed" tool_tip="Un officier peut céder ce terrain au groupe. Il viendra alors s&apos;ajouter au patrimoine du groupe."/>
+			<button label="Céder..." label_selected="Céder..." name="Deed..." tool_tip="Vous ne pouvez céder le terrain que si vous avez un rôle d&apos;officier dans le groupe sélectionné."/>
+			<check_box label="Le propriétaire contribue en cédant du terrain" name="check contrib" tool_tip="Lorsqu&apos;un terrain est cédé au groupe, l&apos;ancien propriétaire fait également un don de terrain suffisant."/>
+			<text length="1" name="For Sale:" type="string">
 				À vendre :
 			</text>
-			<text type="string" length="1" name="Not for sale.">
-				Pas à vendre.
+			<text length="1" name="Not for sale." type="string">
+				Pas à vendre
 			</text>
-			<text type="string" length="1" name="For Sale: Price L$[PRICE].">
-				Prix : [PRICE] $L.
+			<text length="1" name="For Sale: Price L$[PRICE]." type="string">
+				Prix : [PRICE] L$.
 			</text>
-			<button label="Vendre le terrain..." label_selected="Vendre le terrain..."
-			     name="Sell Land..." />
-			<text type="string" length="1" name="For sale to">
+			<text name="SalePending"/>
+			<button label="Vendre le terrain..." label_selected="Vendre le terrain..." name="Sell Land..."/>
+			<text length="1" name="For sale to" type="string">
 				À vendre à : [BUYER]
 			</text>
-			<text type="string" length="1" name="Sell with landowners objects in parcel.">
+			<text length="1" name="Sell with landowners objects in parcel." type="string">
 				Objets inclus dans la vente.
 			</text>
-			<text type="string" length="1" name="Selling with no objects in parcel.">
+			<text length="1" name="Selling with no objects in parcel." type="string">
 				Objets non inclus dans la vente.
 			</text>
-			<button label="Annuler la vente du terrain"
-			     label_selected="Annuler la vente du terrain" name="Cancel Land Sale" />
-			<text type="string" length="1" name="Claimed:">
-				Réclamée :
+			<button label="Annuler la vente du terrain" label_selected="Annuler la vente du terrain" name="Cancel Land Sale"/>
+			<text length="1" name="Claimed:" type="string">
+				Acquis :
 			</text>
-			<text type="string" length="1" name="DateClaimText">
+			<text length="1" name="DateClaimText" type="string">
 				Tue Aug 15 13:47:25 2006
 			</text>
-			<text type="string" length="1" name="PriceLabel">
-				Surface :
+			<text length="1" name="PriceLabel" type="string">
+				Surface :
 			</text>
-			<text type="string" length="1" name="PriceText">
+			<text length="1" name="PriceText" type="string">
 				4048 m²
 			</text>
-			<text type="string" length="1" name="Traffic:">
-				Trafic :
+			<text length="1" name="Traffic:" type="string">
+				Trafic :
 			</text>
-			<text type="string" length="1" name="DwellText">
+			<text length="1" name="DwellText" type="string">
 				0
 			</text>
-			<button label="Acheter le terrain..." label_selected="Acheter le terrain..."
-			     name="Buy Land..." />
-			<button label="Acheter pour le groupe..." label_selected="Acheter pour le groupe..."
-			     name="Buy For Group..." />
-			<button label="Acheter un passe..." label_selected="Acheter un passe..."
-			     name="Buy Pass..."
-			     tool_tip="Un passe vous donne un accès temporaire à ce terrain." />
-			<button label="Céder le terrain..." label_selected="Céder le terrain..."
-			     name="Abandon Land..." />
-			<button label="Récupérer le terrain…" label_selected="Récupérer le terrain…"
-			     name="Reclaim Land..." />
-			<button label="Vente Linden..." label_selected="Vente Linden..." name="Linden Sale..."
-			     tool_tip="Le terrain doit être la propriété d&apos;un résident, avoir un contenu défini et ne pas être aux enchères." />
-			<text name="new users only">
+			<button label="Acheter le terrain..." label_selected="Acheter le terrain..." name="Buy Land..." width="125" left="130"/>
+			<button label="Acheter pour le groupe..." label_selected="Acheter pour le groupe..." name="Buy For Group..."/>
+			<button label="Acheter un pass..." label_selected="Acheter un pass..." name="Buy Pass..." tool_tip="Un pass vous donne un accès temporaire à ce terrain." width="125" left="130"/>
+			<button label="Abandonner le terrain..." label_selected="Abandonner le terrain..." name="Abandon Land..."/>
+			<button label="Redemander le terrain..." label_selected="Redemander le terrain…" name="Reclaim Land..."/>
+			<button label="Vente Linden..." label_selected="Vente Linden..." name="Linden Sale..." tool_tip="Le terrain doit être la propriété d&apos;un résident, avoir un contenu défini et ne pas être aux enchères."/>
+			<string name="new users only">
 				Nouveaux utilisateurs uniquement
-			</text>
-			<text name="anyone">
+			</string>
+			<string name="anyone">
 				Tout le monde
-			</text>
+			</string>
 			<string name="area_text">
 				Surface
 			</string>
@@ -122,61 +112,58 @@ Allez dans le menu Monde &gt; À propos du terrain ou sélectionnez une autre pa
 			</string>
 		</panel>
 		<panel label="Règlement" name="land_covenant_panel">
-			<text type="string" length="1" name="covenant_timestamp_text">
+			<text length="1" name="covenant_timestamp_text" type="string">
 				Last Modified Wed Dec 31 16:00:00 1969
 			</text>
-			<text type="string" length="1" name="region_name_lbl">
+			<text length="1" name="region_name_lbl" type="string">
 				Région :
 			</text>
-			<text type="string" length="1" name="region_name_text">
+			<text length="1" name="region_name_text" type="string">
 				leyla
 			</text>
-			<text type="string" length="1" name="estate_name_lbl">
+			<text length="1" name="estate_name_lbl" type="string">
 				Domaine :
 			</text>
-			<text type="string" length="1" name="estate_name_text">
+			<text length="1" name="estate_name_text" type="string">
 				continent
 			</text>
-			<text type="string" length="1" name="estate_owner_lbl">
+			<text length="1" name="estate_owner_lbl" type="string">
 				Propriétaire :
 			</text>
-			<text type="string" length="1" name="estate_owner_text">
+			<text length="1" name="estate_owner_text" type="string">
 				(aucun)
 			</text>
-			<text type="string" length="1" name="resellable_clause">
+			<text length="1" name="resellable_clause" type="string">
 				Le terrain acheté dans cette région ne peut être revendu.
 			</text>
-			<text type="string" length="1" name="changeable_clause">
+			<text length="1" name="changeable_clause" type="string">
 				Le terrain acheté dans cette région ne peut être revendu/divisé.
 			</text>
-			<text_editor type="string" length="1" name="covenant_editor">
+			<text_editor length="1" name="covenant_editor" type="string">
 				Il n&apos;y a aucun règlement pour ce domaine.
 			</text_editor>
-			<text name="can_resell">
+			<string name="can_resell">
 				Le terrain acheté dans cette région peut être revendu.
-			</text>
-			<text name="can_not_resell">
+			</string>
+			<string name="can_not_resell">
 				Le terrain acheté dans cette région ne peut pas être revendu.
-			</text>
-			<text name="can_change">
+			</string>
+			<string name="can_change">
 				Le terrain acheté dans cette région peut être fusionné ou divisé.
-			</text>
-			<text name="can_not_change">
+			</string>
+			<string name="can_not_change">
 				Le terrain acheté dans cette région ne peut pas être fusionné ou divisé.
-			</text>
+			</string>
 		</panel>
 		<panel label="Objets" name="land_objects_panel">
 			<text name="parcel_object_bonus">
 				Facteur Bonus Objets : [BONUS]
 			</text>
-			<text type="string" length="1" name="Simulator primitive usage:">
-				Prims utilisés sur le sim :
-			</text>
-			<text type="string" length="1" name="0 out of 0 available">
-				0 sur 14055 (14055 disponibles)
+			<text length="1" name="Simulator primitive usage:" type="string">
+				Prims utilisés sur la parcelle :
 			</text>
-			<text name="objects_available">
-				[COUNT] sur [COUNT] ([COUNT] disponibles)
+			<text name="objects_available" left="214" width="230">
+				[COUNT] sur [MAX] ([AVAILABLE] disponibles)
 			</text>
 			<string name="objects_available_text">
 				[COUNT] sur [MAX] ([AVAILABLE] disponibles)
@@ -184,113 +171,103 @@ Allez dans le menu Monde &gt; À propos du terrain ou sélectionnez une autre pa
 			<string name="objects_deleted_text">
 				[COUNT] sur [MAX] ([DELETED] seront supprimés)
 			</string>
-			<text type="string" length="1" name="Primitives parcel supports:">
+			<text length="1" name="Primitives parcel supports:" type="string" width="200">
 				Prims max. sur la parcelle :
 			</text>
-			<text type="string" length="1" name="object_contrib_text">
+			<text length="1" name="object_contrib_text" type="string" left="214" width="152">
 				[COUNT]
 			</text>
-			<text type="string" length="1" name="Primitives on parcel:">
+			<text length="1" name="Primitives on parcel:" type="string">
 				Prims sur la parcelle :
 			</text>
-			<text type="string" length="1" name="total_objects_text">
+			<text length="1" name="total_objects_text" type="string" left="214" width="48">
 				[COUNT]
 			</text>
-			<text type="string" length="1" name="Owned by parcel owner:">
+			<text length="1" name="Owned by parcel owner:" type="string" left="14" width="180">
 				Appartenant au propriétaire :
 			</text>
-			<text type="string" length="1" name="owner_objects_text">
+			<text length="1" name="owner_objects_text" type="string" left="214" width="48">
 				[COUNT]
 			</text>
-			<button label="Afficher" label_selected="Afficher" name="ShowOwner" />
-			<button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOwner..."
-			     tool_tip="Renvoyer les objets à leurs propriétaires." />
-			<text type="string" length="1" name="Set to group:">
+			<button label="Afficher" label_selected="Afficher" name="ShowOwner" right="-135" width="60"/>
+			<button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOwner..." tool_tip="Renvoyer les objets à leurs propriétaires." right="-10" width="119"/>
+			<text length="1" name="Set to group:" type="string" left="14" width="180">
 				Donnés au groupe :
 			</text>
-			<text type="string" length="1" name="group_objects_text">
-				0
+			<text length="1" name="group_objects_text" type="string" left="214" width="48">
+				[COUNT]
 			</text>
-			<button label="Afficher" label_selected="Afficher" name="ShowGroup" />
-			<button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnGroup..."
-			     tool_tip="Renvoyer les objets à leurs propriétaires." />
-			<text type="string" length="1" name="Owned by others:">
+			<button label="Afficher" label_selected="Afficher" name="ShowGroup" width="60" right="-135"/>
+			<button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnGroup..." tool_tip="Renvoyer les objets à leurs propriétaires." right="-10" width="119"/>
+			<text length="1" name="Owned by others:" type="string" left="14" width="128">
 				Appartenant à d&apos;autres :
 			</text>
-			<text type="string" length="1" name="other_objects_text">
-				0
+			<text length="1" name="other_objects_text" type="string" left="214" width="48">
+				[COUNT]
 			</text>
-			<button label="Afficher" label_selected="Afficher" name="ShowOther" />
-			<button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOther..."
-			     tool_tip="Renvoyer les objets à leurs propriétaires." />
-			<text type="string" length="1" name="Selected / sat upon:">
+			<button label="Afficher" label_selected="Afficher" name="ShowOther" right="-135" width="60"/>
+			<button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOther..." tool_tip="Renvoyer les objets à leurs propriétaires."  right="-10" width="119"/>
+			<text length="1" name="Selected / sat upon:" type="string" left="14" width="193">
 				Sélectionnés/où quelqu&apos;un est assis :
 			</text>
-			<text type="string" length="1" name="selected_objects_text">
-				0
-			</text>
-			<text type="string" length="1" name="Autoreturn other resident&amp;apos;s objects (minutes, 0 for off):">
-				Renvoi automatique des objets appartenant aux autres résidents (minutes, 0 pour désactiver):
+			<text length="1" name="selected_objects_text" type="string" left="214" width="48">
+				[COUNT]
 			</text>
-			<text name="Autoreturn">
+			<text name="Autoreturn" width="412" left="4">
 				Renvoi automatique des objets d&apos;autres résidents (minutes, 0 pour désactiver) :
 			</text>
-			<text type="string" length="1" name="Object Owners:">
+			<line_editor name="clean other time" right="-6" width="36" />
+			<text length="1" name="Object Owners:" type="string">
 				Propriétaires :
 			</text>
-			<button label="Rafraîchir la liste" label_selected="Rafraîchir la liste"
-			     name="Refresh List" />
-			<button label="Renvoyer les objets..." label_selected="Renvoyer les objets..."
-			     name="Return objects..." />
-			<button label="" label_selected="" name="Type" tool_tip="Trier par type" />
-			<button label="Nom" label_selected="Nom" name="Name" tool_tip="Trier par nom" />
-			<button label="Trafic" label_selected="Trafic" name="Count" tool_tip="Trier par trafic" />
+			<button label="Rafraîchir" label_selected="Rafraîchir" name="Refresh List"/>
+			<button label="Renvoyer les objets..." label_selected="Renvoyer les objets..." name="Return objects..."/>
 			<name_list label="Plus récents" name="owner list">
-				<column label="Type" name="type" />
-				<column label="Nom" name="name" />
-				<column label="Nombre" name="count" />
+				<column label="Type" name="type"/>
+				<column name="online_status"/>
+				<column label="Nom" name="name"/>
+				<column label="Nombre" name="count"/>
+				<column label="Plus récents" name="mostrecent"/>
 			</name_list>
 		</panel>
 		<panel label="Options" name="land_options_panel">
-			<text type="string" length="1" name="allow_label">
+			<text length="1" name="allow_label" type="string">
 				Autoriser les autres résidents à :
 			</text>
-			<text name="allow_label2">
+			<check_box label="Modifier le terrain" name="edit land check" tool_tip="Si cette option est cochée, n&apos;importe qui peut terraformer votre terrain. Il vaut mieux ne pas cocher cette option pour toujours pouvoir modifer votre propre terrain."/>
+			<check_box label="Créer des repères" name="check landmark"/>
+			<check_box label="Voler" name="check fly" tool_tip="Si cette option est cochée, les résidents peuvent voler sur votre terrain. Si elle n&apos;est pas cochée, ils ne pourront voler que lorsqu&apos;ils arrivent et passent au dessus de votre terrain."/>
+			<text name="allow_label2" left="152">
 				Créer des objets :
 			</text>
-			<check_box label="Tous les résidents" name="edit objects check" />
-			<check_box label="Modifier le terrain" name="edit land check" />
-			<check_box label="Créer des repères" name="check landmark" />
-			<check_box label="Groupe" name="edit group objects check" />
-			<text name="allow_label3">
-				Apporter des objets :
+			<check_box label="Tous les résidents" name="edit objects check" left="285"/>
+			<check_box label="Groupe" name="edit group objects check" left="395"/>
+			<text name="allow_label3" left="152" width="134">
+				Laisser entrer des objets :
 			</text>
-			<check_box label="Tous les résidents" name="all object entry check" />
-			<check_box label="Groupe" name="group object entry check" />
-			<text name="allow_label4">
+			<check_box label="Tous les résidents" name="all object entry check" left="285"/>
+			<check_box label="Groupe" name="group object entry check" left="395"/>
+			<text name="allow_label4" left="152">
 				Exécuter des scripts :
 			</text>
-			<check_box label="Groupe" name="check group scripts" />
-			<check_box label="Voler" name="check fly" />
-			<check_box label="Tous les résidents" name="check other scripts" />
-			<text type="string" length="1" name="land_options_label">
+			<check_box label="Tous les résidents" name="check other scripts" left="285"/>
+			<check_box label="Groupe" name="check group scripts" left="395"/>
+			<text length="1" name="land_options_label" type="string">
 				Options du terrain :
 			</text>
-			<check_box label="Sécurisé (pas de dégâts)" name="check safe" />
-			<check_box label="Interdire les bousculades" name="PushRestrictCheck"
-			     tool_tip="llPushObject ne fonctionne que sur les scripts du propriétaire de la parcelle ou sur les scripts où la personne qui bouscule est aussi la propriétaire du script." />
-			<check_box label="Afficher dans la recherche (30 $L/semaine) sous"
-			     name="ShowDirectoryCheck"
-			     tool_tip="Afficher la parcelle dans les résultats de recherche" />
-			<combo_box name="land category">
+			<check_box label="Sécurisé (pas de dégâts)" name="check safe" tool_tip="Si cette option est cochée, le terrain est sécurisé et il n&apos;y pas de risques de dommages causés par des combats. Si elle est décochée, des dommages causés par les combats peuvent avoir lieu."/>
+			<check_box label="Pas de bousculades" left="14" bottom="-140"
+				name="PushRestrictCheck" tool_tip="Empêche l&apos;utilisation de scripts causant des bousculades. Cette option est utile pour empêcher les comportements abusifs sur votre terrain."/>
+			<check_box label="Afficher dans la recherche (30 L$/semaine) sous" name="ShowDirectoryCheck" tool_tip="Afficher la parcelle dans les résultats de recherche" bottom="-160"/>
+			<combo_box name="land category" left="286" width="146" bottom="-160">
 				<combo_item name="AnyCategory">
-					Toute catégorie
+					Toutes catégories
 				</combo_item>
 				<combo_item name="LindenLocation">
-					Emplacement Linden
+					Appartenant aux Lindens
 				</combo_item>
 				<combo_item name="Adult">
-					Adultes
+					Adulte
 				</combo_item>
 				<combo_item name="Arts&amp;Culture">
 					Art et Culture
@@ -305,10 +282,10 @@ Allez dans le menu Monde &gt; À propos du terrain ou sélectionnez une autre pa
 					Jeux
 				</combo_item>
 				<combo_item name="Hangout">
-					Endroit favori
+					Favoris
 				</combo_item>
 				<combo_item name="NewcomerFriendly">
-					Convivial pour les nouveaux
+					Accueil pour les nouveaux
 				</combo_item>
 				<combo_item name="Parks&amp;Nature">
 					Parcs et Nature
@@ -323,186 +300,142 @@ Allez dans le menu Monde &gt; À propos du terrain ou sélectionnez une autre pa
 					Autre
 				</combo_item>
 			</combo_box>
-			<check_box label="Publier liste sur le web" name="PublishCheck"
-			     tool_tip="Publiez vos informations de parcelle sur le web." />
-			<check_box label="Contenu pour adultes" name="MatureCheck"
-			     tool_tip="Les infos sur votre parcelle, ou le contenu de cette dernière, sont à caractère adulte." />
-			<button label="?" label_selected="?" name="?" />
-			<text type="string" length="1" name="Snapshot:">
+			<button label="?" label_selected="?" name="?" left="436" bottom="-160"/>
+			<check_box label="Contenu pour adultes" name="MatureCheck" tool_tip="Les infos sur votre parcelle, ou le contenu de cette dernière, sont à caractère adulte." bottom="-180"/>
+			<text length="1" name="Snapshot:" type="string" bottom="-200">
 				Photo :
 			</text>
-			<texture_picker label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image" />
-			<text type="string" length="1" name="Landing Point: (none)">
-				Point d&apos;atterrissage : (aucun)
-			</text>
-			<text name="landing_point">
+			<texture_picker label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image" bottom="-319"/>
+			<text name="landing_point" bottom="-323">
 				Lieu d&apos;arrivée : [LANDING]
 			</text>
 			<string name="landing_point_none">
 				(aucun)
 			</string>
-			<button label="Définir" label_selected="Définir" name="Set"
-			     tool_tip="Définir le lieu d&apos;arrivée de l&apos;avatar sur votre position actuelle. ll doit se trouver sur cette parcelle de terrain." />
-			<button label="Annuler" label_selected="Annuler" name="Clear"
-			     tool_tip="Dégager le lieu d&apos;arrivée." />
-			<text type="string" length="1" name="Teleport Routing: ">
-				Options de téléportation :
-			</text>
-			<combo_box name="landing type"
-			     tool_tip="Vous permet de paramétrer les téléportations sur votre terrain.">
-				<combo_item type="string" length="1" name="Blocked">
+			<button label="Définir" label_selected="Définir" name="Set" tool_tip="Définit le point d&apos;arrivée des visiteurs. Définit l&apos;emplacement de votre avatar sur ce terrain." bottom="-323"/>
+			<button label="Annuler" label_selected="Annuler" name="Clear" tool_tip="Libérer le lieu d&apos;arrivée." bottom="-323"/>
+			<text length="1" name="Teleport Routing: " type="string" bottom="-343">
+				Règles de téléportation :
+			</text>
+			<combo_box name="landing type" tool_tip="Vous permet de paramétrer les téléportations sur votre terrain." left="140" width="140" bottom="-343">
+				<combo_item length="1" name="Blocked" type="string">
 					Bloquée
 				</combo_item>
-				<combo_item type="string" length="1" name="LandingPoint">
+				<combo_item length="1" name="LandingPoint" type="string">
 					Lieu d&apos;arrivée défini
 				</combo_item>
-				<combo_item type="string" length="1" name="Anywhere">
+				<combo_item length="1" name="Anywhere" type="string">
 					Lieu d&apos;arrivée indéfini
 				</combo_item>
 			</combo_box>
 			<string name="push_restrict_text">
-				Interdire les bousculades
+				Pas de bousculades
 			</string>
 			<string name="push_restrict_region_text">
-				Interdire les bousculades (passer outre les règles de la région)
+				Pas de bousculades (les règles de la région priment)
 			</string>
 		</panel>
-		<panel label="Média" name="land_media_panel">
-			<text name="with media:">
+		<panel label="Médias" name="land_media_panel">
+			<text name="with media:" width="85">
 				Type de média :
 			</text>
-			<combo_box name="media type"
-			     tool_tip="Indiquez s&apos;il s&apos;agit de l&apos;URL d&apos;un film, d&apos;une page web ou autre" />
-			<text name="at URL:">
+			<combo_box name="media type" tool_tip="Indiquez s&apos;il s&apos;agit de l&apos;URL d&apos;un film, d&apos;une page web ou autre" left="97"/>
+			<text name="mime_type"/>
+			<text name="at URL:" width="85">
 				URL du média :
 			</text>
-			<button label="Définir..." label_selected="Définir..." name="set_media_url" />
+			<line_editor name="media_url" left="97"/>
+			<button label="Définir..." label_selected="Définir..." name="set_media_url"/>
 			<text name="Description:">
 				Description :
 			</text>
-			<line_editor name="url_description"
-			     tool_tip="Texte affiché à côté du bouton Jouer/Charger" />
+			<line_editor name="url_description" tool_tip="Texte affiché à côté du bouton Jouer/Charger" left="97"/>
+			<text length="1" name="Media texture:" type="string">
+				Remplacer
+la texture :
+			</text>
+			<texture_picker label="" name="media texture" tool_tip="Cliquez pour sélectionner une image" left="97"/>
 			<text name="replace_texture_help">
 				(Les objets avec cette texture affichent le film ou 
-la page web quand vous cliquez sur la flèche Jouer).
+la page web quand vous cliquez sur la flèche Jouer.)
 			</text>
 			<text name="Options:">
 				Options
 média :
 			</text>
-			<check_box label="Média en boucle" name="media_loop"
-			     tool_tip="Jouer le média en boucle. Lorsque le média aura fini de jouer, il recommencera." />
-			<check_box label="Masquer l&apos;URL du média" name="hide_media_url"
-			     tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l&apos;URL du média. Cette option n&apos;est pas disponible pour les fichiers HTML." />
-			<check_box label="Masquer l&apos;URL de la musique" name="hide_music_url"
-			     tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l&apos;URL de la musique." />
-			<text name="media_size"
-			     tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut.">
+			<check_box left="97" label="Échelle automatique" name="media_auto_scale" tool_tip="Si vous sélectionnez cette option, le contenu de cette parcelle sera automatiquement mis à l&apos;échelle. La qualité visuelle sera peut-être amoindrie mais vous n&apos;aurez à faire aucune autre mise à l&apos;échelle ou alignement."/>
+			<check_box label="Média en boucle" name="media_loop" tool_tip="Jouer le média en boucle. Lorsque le média aura fini de jouer, il recommencera."/>
+			<check_box left="97" label="Masquer l&apos;URL du média" name="hide_media_url" tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l&apos;URL du média. Cette option n&apos;est pas disponible pour les fichiers HTML."/>
+			<check_box label="Masquer l&apos;URL de la musique" name="hide_music_url" tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l&apos;URL de la musique."/>
+			<text name="media_size" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut." width="105" left="102">
 				Taille du média :
 			</text>
-			<spinner name="media_size_width"
-			     tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut." />
-			<spinner name="media_size_height"
-			     tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut." />
+			<spinner name="media_size_width" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut." left_delta="89"/>
+			<spinner name="media_size_height" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut."/>
 			<text name="pixels">
 				pixels
 			</text>
-			<text name="MusicURL:">
-				URL de la musique :
+			<text name="MusicURL:" bottom_delta="-28">
+				URL de la
+musique :
 			</text>
+			<line_editor name="music_url" left="97" bottom_delta="-12"/>
 			<text name="Sound:">
 				Son :
 			</text>
-			<check_box label="Limiter le son spatial à cette parcelle" name="check sound local" />
-			<text type="string" length="1" name="Music URL:">
-				URL du flux :
-			</text>
-			<text type="string" length="1" name="Media texture:">
-				Remplacer
-la texture :
-			</text>
-			<text type="string" length="1" name="Replace this texture:">
-				Remplacer cette texture :
-			</text>
-			<texture_picker label="" name="media texture" tool_tip="Cliquez pour sélectionner une image" />
-			<text type="string" length="1" name="with content from this URL:">
-				par du contenu situé à l&apos;URL suivante :
-			</text>
-			<check_box label="Échelle automatique" name="media_auto_scale"
-			     tool_tip="Si vous sélectionnez cette option, le contenu de cette parcelle sera automatiquement mis à l&apos;échelle. La qualité visuelle sera peut-être amoindrie mais vous n&apos;aurez à faire aucune autre mise à l&apos;échelle ou alignement." />
+			<check_box label="Limiter le son ambiant à cette parcelle" name="check sound local" left="97" />
 			<text name="Voice settings:">
 				Voix :
 			</text>
-			<radio_group name="parcel_voice_channel">
+			<radio_group name="parcel_voice_channel" left="97" width="310">
 				<radio_item name="Estate">
-					Utiliser le canal spatial du domaine
+					Utiliser le canal du domaine
 				</radio_item>
 				<radio_item name="Private">
-					Utiliser un canal spatial privé
+					Utiliser un canal privé
 				</radio_item>
 				<radio_item name="Disabled">
-					Désactiver les canaux spatiaux audios sur cette parcelle
+					Désactiver les canaux audios
 				</radio_item>
 			</radio_group>
 		</panel>
 		<panel label="Accès" name="land_access_panel">
-			<text type="string" length="1" name="Limit access to this parcel to:">
+			<text length="1" name="Limit access to this parcel to:" type="string">
 				Accès à cette parcelle
 			</text>
-			<check_box label="Autoriser l&apos;accès public" name="public_access" />
+			<check_box label="Autoriser l&apos;accès public" name="public_access"/>
 			<text name="Only Allow">
-				Bloquer l&apos;accès :
-			</text>
-			<check_box
-			     label="Aux résidents qui n&apos;ont pas fourni leurs informations de paiement à Linden Lab"
-			     name="limit_payment" tool_tip="Aux résidents non identifés" />
-			<check_box label="Aux résidents dont l&apos;âge n&apos;a pas été vérifié"
-			     name="limit_age_verified"
-			     tool_tip="Aux résidents dont l&apos;âge n&apos;a pas été vérifié. Pour plus d&apos;infos, consultez la page support.secondlife.com." />
+				Bloquer l&apos;accès aux résidents :
+			</text>
+			<check_box label="Qui n&apos;ont pas fourni leurs informations de paiement à Linden Lab" name="limit_payment" tool_tip="Aux résidents non identifés"/>
+			<check_box label="Dont l&apos;âge n&apos;a pas été vérifié" name="limit_age_verified" tool_tip="Aux résidents dont l&apos;âge n&apos;a pas été vérifié. Pour plus d&apos;infos, consultez la page support.secondlife.com."/>
 			<string name="estate_override">
 				Au moins une de ces options est définie au niveau du domaine.
 			</string>
-			<check_box label="Autoriser l&apos;accès au groupe : [GROUP]" name="GroupCheck"
-			     tool_tip="Définir le groupe à l&apos;onglet Général." />
-			<check_box label="Avatars : (0 dans la liste, 300 max)" name="AccessCheck" />
-			<button label="Ajouter..." label_selected="Ajouter..." name="Add..." />
-			<button label="Retirer" label_selected="Retirer" name="Remove" />
-			<check_box label="Vendre des passes à :" name="PassCheck"
-			     tool_tip="Autoriser un accès temporaire à cette parcelle" />
+			<check_box label="Autoriser l&apos;accès au groupe : [GROUP]" name="GroupCheck" tool_tip="Définir le groupe à l&apos;onglet Général."/>
+			<check_box label="Vendre des pass à :" name="PassCheck" tool_tip="Autoriser un accès temporaire à cette parcelle"/>
 			<combo_box name="pass_combo">
 				<combo_item name="Anyone">
-					N&apos;importe qui
+					Tout le monde
 				</combo_item>
 				<combo_item name="Group">
 					Groupe
 				</combo_item>
 			</combo_box>
-			<spinner label="Prix en $L :" name="PriceSpin" />
-			<spinner label="Heures d&apos;accès :" name="HoursSpin" />
+			<spinner label="Prix en L$ :" name="PriceSpin"/>
+			<spinner label="Durée en heures :" name="HoursSpin"/>
 			<text label="Toujours autoriser" name="AllowedText">
 				Résidents autorisés
 			</text>
-			<name_list name="AccessList" tool_tip="([LISTED] listés, [MAX] max)" />
-			<button label="Ajouter..." label_selected="Ajouter..." name="add_allowed" />
-			<button label="Supprimer" label_selected="Supprimer" name="remove_allowed" />
-			<text label="Interdire" name="BanCheck">
-				Résidents interdits
+			<name_list name="AccessList" tool_tip="([LISTED] listés, [MAX] max)"/>
+			<button label="Ajouter..." label_selected="Ajouter..." name="add_allowed"/>
+			<button label="Supprimer" label_selected="Supprimer" name="remove_allowed"/>
+			<text label="Bannir" name="BanCheck">
+				Résidents bannis
 			</text>
-			<name_list name="BannedList" tool_tip="([LISTED] listés, [MAX] max)" />
-			<button label="Ajouter..." label_selected="Ajouter..." name="add_banned" />
-			<button label="Supprimer" label_selected="Supprimer" name="remove_banned" />
-		</panel>
-		<panel label="Bannir" name="land_ban_panel">
-			<check_box label="Bannir les avatars suivants : (0 dans la liste, 300 max)"
-			     name="LandBanCheck" />
-			<button label="Ajouter..." label_selected="Ajouter..." name="Add..." />
-			<button label="Retirer" label_selected="Retirer" name="Remove" />
-			<text type="string" length="1" name="Deny by Payment Status:">
-				Refuser selon les infos de paiement :
-			</text>
-			<check_box label="Refuser sans infos de paiement enregistrées" name="DenyAnonymousCheck" />
-			<check_box label="Refuser avec infos de paiement enregistrées" name="DenyIdentifiedCheck" />
-			<check_box label="Refuser avec infos de paiement utilisées" name="DenyTransactedCheck" />
+			<name_list name="BannedList" tool_tip="([LISTED] listés, [MAX] max)"/>
+			<button label="Ajouter..." label_selected="Ajouter..." name="add_banned"/>
+			<button label="Supprimer" label_selected="Supprimer" name="remove_banned"/>
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_animation_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
index 8614cd0f27..ceda06b22b 100644
--- a/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Animation Preview" title="">
 	<text name="name_label">
 		Nom :
@@ -6,13 +6,11 @@
 	<text name="description_label">
 		Description :
 	</text>
-	<spinner label="Priorité" name="priority"
-	     tool_tip="Contrôle quelles animations peuvent êtres écrasées par cette animation." />
-	<text name="preview_label">
+	<spinner label="Priorité" name="priority" tool_tip="Contrôle quelles animations peuvent êtres écrasées par cette animation."/>
+	<text name="preview_label" width="110">
 		Prévisualiser pendant
 	</text>
-	<combo_box label="" name="preview_base_anim"
-	     tool_tip="Utilisez cette option pour tester votre animation pendant que votre avatar fait des choses banales.">
+	<combo_box label="" name="preview_base_anim" tool_tip="Utilisez cette option pour tester votre animation pendant que votre avatar fait des choses banales." left_delta="116" width="124">
 		<combo_item name="Standing">
 			Debout
 		</combo_item>
@@ -26,16 +24,13 @@
 			En train de voler
 		</combo_item>
 	</combo_box>
-	<check_box label="Boucle" name="loop_check" tool_tip="Joue cette animation en boucle." />
-	<spinner label="Début (%)" name="loop_in_point"
-	     tool_tip="Définit le moment de l&apos;animation où la boucle repart." />
-	<spinner label="Fin (%)" name="loop_out_point"
-	     tool_tip="Définit le moment de l&apos;animation où la boucle finit." />
-	<text name="hand_label">
+	<check_box  left="6" label="Boucle" name="loop_check" tool_tip="Joue cette animation en boucle."/>
+	<spinner left="76" label_width="55" width="105" label="Début (%)" name="loop_in_point" tool_tip="Définit le moment de l&apos;animation où la boucle repart."/>
+	<spinner left="195" label="Fin (%)" name="loop_out_point" tool_tip="Définit le moment de l&apos;animation où la boucle finit."/>
+	<text name="hand_label" width="110">
 		Mouvement de main
 	</text>
-	<combo_box label="" name="hand_pose_combo"
-	     tool_tip="Contrôle le mouvement des mains au cours de lanimation">
+	<combo_box label="" name="hand_pose_combo" tool_tip="Contrôle le mouvement des mains au cours de l&apos;animation" left_delta="116" width="124">
 		<combo_item name="Spread">
 			Doigts écartés
 		</combo_item>
@@ -73,14 +68,13 @@
 			Taper
 		</combo_item>
 		<combo_item name="PeaceRight">
-			Peace (droite)
+			Paix (main droite)
 		</combo_item>
 	</combo_box>
 	<text name="emote_label">
 		Expression
 	</text>
-	<combo_box label="" name="emote_combo"
-	     tool_tip="Contrôle l&apos;expression du visage au cours de l&apos;animation.">
+	<combo_box label="" name="emote_combo" tool_tip="Contrôle l&apos;expression du visage au cours de l&apos;animation." left_delta="116" width="124">
 		<combo_item name="[None]">
 			[None]
 		</combo_item>
@@ -142,20 +136,19 @@
 			Soucis
 		</combo_item>
 	</combo_box>
-	<spinner label="Transition début (s)" name="ease_in_time"
-	     tool_tip="Durée (en secondes) pendant laquelle l&apos;animation s&apos;intègre au mouvement." />
-	<spinner label="Transition fin (s)" name="ease_out_time"
-	     tool_tip="Durée (en secondes) pendant laquelle l&apos;animation disparaît du mouvement." />
-	<button label="" name="play_btn" tool_tip="Jouer/Pauser votre animation." />
-	<button label="" name="stop_btn" tool_tip="Arrêter le playback" />
-	<slider label="" name="playback_slider" />
+	<spinner label_width="65" label="Transition &#10;début (s)" name="ease_in_time" tool_tip="Durée (en secondes) pendant laquelle l&apos;animation s&apos;intègre au mouvement."/>
+	<spinner label_width="65" left="160" width="125" label="Transition &#10;fin (s)" name="ease_out_time" tool_tip="Durée (en secondes) pendant laquelle l&apos;animation disparaît du mouvement."/>
+	<button label="" name="play_btn" tool_tip="Jouer/Pauser votre animation." bottom_delta="-48"/>
+	<button label="" name="stop_btn" tool_tip="Arrêter le playback"/>
+	<slider label="" name="playback_slider"/>
 	<text name="bad_animation_text">
 		Impossible de lire le fichier d&apos;animation.
 
-Nous recommandons les fichiers BVH extraits de Poser 4.
+Nous recommandons les fichiers BVH extraits de
+Poser 4.
 	</text>
-	<button label="Annuler" name="cancel_btn" />
-	<button label="Charger ([AMOUNT] $L)" name="ok_btn" />
+	<button label="Annuler" name="cancel_btn"/>
+	<button label="Charger ([AMOUNT] L$)" name="ok_btn"/>
 	<string name="failed_to_initialize">
 		Echec de l&apos;initialisation du mouvement
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml b/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
index 91e30a9894..d98cb5aad3 100644
--- a/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="avatarpicker" title="Choisir le résident">
 	<text name="Type part of the person&apos;s name:">
 		Entrez les premières lettres du nom de la personne :
@@ -6,15 +6,15 @@
 	<text name="instruct_search_resident_name">
 		Saisissez une partie du nom du résident :
 	</text>
-	<button label="Trouver" label_selected="Trouver" name="Find" />
+	<button label="Chercher" label_selected="Chercher" name="Find"/>
 	<text name="Or select a calling card:">
 		Ou sélectionnez une carte de visite :
 	</text>
 	<text name="Or select their calling card:">
-		Ou choisissez une carte de visite :
+		Ou sélectionnez une carte de visite :
 	</text>
-	<button label="Sélectionner" label_selected="Sélectionner" name="Select" />
-	<button label="Fermer" label_selected="Fermer" name="Close" />
+	<button label="Sélectionner" label_selected="Sélectionner" name="Select"/>
+	<button label="Fermer" label_selected="Fermer" name="Close"/>
 	<text name="NotFound">
 		&apos;[TEXT]&apos; introuvable
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_contents.xml b/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
index a008f332bd..a305c305bf 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_buy_contents" title="Acheter des contenus">
 	<text name="contains_text">
 		[NAME] contient :
 	</text>
 	<text name="buy_text">
-		Acheter [AMOUNT] $L à [NAME] ?
+		Acheter [AMOUNT] L$ à [NAME] ?
 	</text>
-	<button label="Annuler" label_selected="Annuler" name="cancel_btn" />
-	<button label="Acheter" label_selected="Acheter" name="buy_btn" />
-	<check_box label="Porter maintenant" name="wear_check" />
+	<button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
+	<button label="Acheter" label_selected="Acheter" name="buy_btn"/>
+	<check_box label="Porter maintenant" name="wear_check"/>
 	<string name="no_copy_text">
 		(pas de copie)
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
index 91fa5a3835..f6c745566d 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="buy currency" title="Acheter des devises">
 	<text left="5" name="info_buying">
 		Achat de devises :
@@ -12,24 +12,24 @@
 	<text name="error_message">
 		Quelque chose ne va pas.
 	</text>
-	<button label="Aller sur le site" name="error_web" />
+	<button label="Aller sur le site" name="error_web"/>
 	<text name="contacting">
-		En train de contacter Lindex...
+		En train de contacter le Lindex...
 	</text>
 	<text name="buy_action_unknown" right="-5">
-		Acheter des $L sur le marché des changes du LindeX
+		Acheter des L$ sur le marché des changes du LindeX
 	</text>
 	<text name="buy_action">
-		[NAME] $L [PRICE]
+		[NAME] L$ [PRICE]
 	</text>
 	<text name="currency_action">
-		Acheter des $L
+		Acheter des L$
 	</text>
 	<line_editor name="currency_amt">
 		1234
 	</line_editor>
 	<text name="currency_est" width="138">
-		pour environ [USD] $US
+		pour environ [USD] US$
 	</text>
 	<text name="getting_data" width="138">
 		Obtention des données...
@@ -38,19 +38,19 @@
 		Actuellement, vous avez
 	</text>
 	<text name="balance_amount">
-		[AMT] $L
+		[AMT] L$
 	</text>
 	<text name="buying_label">
 		Vous achetez
 	</text>
 	<text name="buying_amount">
-		[AMT] $L
+		[AMT] L$
 	</text>
 	<text name="total_label">
 		Votre solde sera de
 	</text>
 	<text name="total_amount">
-		[AMT] $L
+		[AMT] L$
 	</text>
 	<text name="purchase_warning_repurchase">
 		En confirmant cette transaction, vous achetez uniquement les devises.
@@ -60,9 +60,9 @@ Vous devrez recommencer cette opération.
 		Vous n&apos;achetez pas assez de devises.
 Veuillez saisir un montant plus élevé.
 	</text>
-	<button label="Acheter" name="buy_btn" />
-	<button label="Annuler" name="cancel_btn" />
+	<button label="Acheter" name="buy_btn"/>
+	<button label="Annuler" name="cancel_btn"/>
 	<string name="buy_currency">
-		Acheter [LINDENS] $L pour environ [USD] $US
+		Acheter [LINDENS] L$ pour environ [USD] US$
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_land.xml b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
index 9cdb3adabe..f449ae56de 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="buy land" title="Acheter le terrain">
 	<text name="region_name_label">
 		Région :
@@ -19,7 +19,7 @@
 		(inconnu)
 	</text>
 	<text name="resellable_changeable_label">
-		Terrains achetés dans cette région :
+		Terrain acheté dans cette région :
 	</text>
 	<text name="resellable_clause">
 		Le terrain acheté dans cette région peut être revendu ou pas.
@@ -31,9 +31,9 @@
 		Vous devez accepter le règlement du domaine :
 	</text>
 	<text_editor name="covenant_editor">
-		Chargement en cours...
+		Chargement...
 	</text_editor>
-	<check_box label="J&apos;accepte le règlement ci-dessus." name="agree_covenant" />
+	<check_box label="J&apos;accepte le règlement ci-dessus." name="agree_covenant"/>
 	<text name="info_parcel_label">
 		Parcelle :
 	</text>
@@ -50,15 +50,15 @@
 		Prix :
 	</text>
 	<text name="info_price">
-		1500 $L, objets inclus
+		1500 L$, objets inclus
 	</text>
-	<text name="info_action">
+	<text name="info_action" width="275">
 		Si vous achetez ce terrain :
 	</text>
 	<text name="error_message">
 		Quelque chose ne va pas.
 	</text>
-	<button label="Aller sur le site" name="error_web" />
+	<button label="Aller sur le site" name="error_web"/>
 	<text name="account_action">
 		Vous passerez à un compte Premium.
 	</text>
@@ -67,44 +67,43 @@
 	</text>
 	<combo_box name="account_level">
 		<combo_item name="US$9.95/month,billedmonthly">
-			9,95 $US/mois, facturation mensuelle
+			9,95 US$/mois, facturation mensuelle
 		</combo_item>
 		<combo_item name="US$7.50/month,billedquarterly">
-			7,50 $US/mois, facturation trimestrielle
+			7,50 US$/mois, facturation trimestrielle
 		</combo_item>
 		<combo_item name="US$6.00/month,billedannually">
-			6,00 $US/mois, facturation annuelle
+			6,00 US$/mois, facturation annuelle
 		</combo_item>
 	</combo_box>
-	<text name="land_use_action">
-		Augmentez vos frais d&apos;occupation de terrain à 40 $US/mois.
+	<text name="land_use_action" width="210" right="430">
+		Augmentez vos frais d&apos;occupation de terrain à 40 US$/mois.
 	</text>
 	<text name="land_use_reason">
 		Vous possédez un terrain de 1,309 mètres carrés. 
 Cette parcelle fait 512 mètres carrés.
 	</text>
 	<text name="purchase_action">
-		Payez au résident X 4 000 $L pour le terrain
+		Payez au résident X 4 000 L$ pour le terrain
 	</text>
 	<text name="currency_reason">
-		Vous avez 2 100 $L.
+		Vous avez 2 100 L$.
 	</text>
 	<text name="currency_action">
-		Acheter des $L
+		Acheter des L$
 	</text>
 	<line_editor name="currency_amt">
 		1000
 	</line_editor>
 	<text name="currency_est">
-		pour environ [AMOUNT2] $US
+		pour environ [AMOUNT2] US$
 	</text>
 	<text name="currency_balance">
-		Vous avez 2 100 $L.
+		Vous avez 2 100 L$.
 	</text>
-	<check_box label="Supprimer [AMOUNT] mètres carrés de votre contribution au groupe."
-	     name="remove_contribution" />
-	<button label="Acheter" name="buy_btn" />
-	<button label="Annuler" name="cancel_btn" />
+	<check_box label="Supprimer [AMOUNT] mètres carrés de votre contribution au groupe." name="remove_contribution"/>
+	<button label="Acheter" name="buy_btn"/>
+	<button label="Annuler" name="cancel_btn"/>
 	<text name="can_resell">
 		Peut être revendu.
 	</text>
@@ -184,20 +183,20 @@ et la seule fois où vous pouvez acheter une parcelle &apos;Premier Terrain&apos
 	</text>
 	<text name="first_time_but_not_first_land">
 		Ceci est votre première acquisition de terrain, mais cette
-parcelle n&apos;est pas réservée aux nouveaux acheteurs.  Vous devriez
-peut-être chercher une parcelle &apos;Premier Terrain&apos; moins chère.
+parcelle n&apos;est pas réservée aux nouveaux acheteurs. Vous devriez
+peut-être chercher une parcelle Premier Terrain moins chère.
 	</text>
 	<text name="land_holdings">
-		Vous possédez un terrain de [BUYER] mètres carrés.
+		Vous possédez un terrain de [BUYER] m².
 	</text>
 	<text name="pay_to_for_land">
-		Payez [AMOUNT] $L à [SELLER] pour ce terrain
+		Payez [AMOUNT] L$ à [SELLER] pour ce terrain
 	</text>
 	<text name="buy_for_US">
-		Acheter [AMOUNT] $L pour environ [AMOUNT2] $US,
+		Acheter [AMOUNT] L$ pour environ [AMOUNT2] US$,
 	</text>
 	<text name="parcel_meters">
-		Cette parcelle fait [AMOUNT] mètres carrés.
+		Cette parcelle fait [AMOUNT] m².
 	</text>
 	<text name="premium_land">
 		Ce terrain est premium et les frais associés sont de [AMOUNT]/m².
@@ -206,7 +205,8 @@ peut-être chercher une parcelle &apos;Premier Terrain&apos; moins chère.
 		Ce terrain est en solde et les frais associés sont de [AMOUNT]/m².
 	</text>
 	<text name="meters_supports_object">
-		[AMOUNT] m² peuvent prendre en charge [AMOUNT2] objets
+		[AMOUNT] m²
+peuvent contenir [AMOUNT2] prims
 	</text>
 	<text name="sold_with_objects">
 		vendu avec objets
@@ -215,21 +215,21 @@ peut-être chercher une parcelle &apos;Premier Terrain&apos; moins chère.
 		Ce groupe, [GROUP], aura besoin de suffisamment de crédit pour payer les frais d&apos;occupation de terrain avant que l&apos;achat de cette parcelle ne soit finalisé.
 	</text>
 	<text name="have_enough_lindens">
-		Vous avez [AMOUNT]$L, ce qui est suffisant pour acheter ce terrain.
+		Vous avez [AMOUNT]L$, ce qui est suffisant pour acheter ce terrain.
 	</text>
 	<text name="not_enough_lindens">
-		Vous n&apos;avez que [AMOUNT] $L et vous avez besoin de [AMOUNT2] $L de plus.
+		Vous n&apos;avez que [AMOUNT] L$ et vous avez besoin de [AMOUNT2] L$ de plus.
 	</text>
 	<text name="balance_left">
-		Après cet achat, il vous restera [AMOUNT] $L.
+		Après cet achat, il vous restera [AMOUNT] L$.
 	</text>
 	<text name="balance_needed">
-		Pour avoir les moyens d&apos;acquérir ce terrain, vous devez acheter au moins [AMOUNT] $L.
+		Pour avoir les moyens d&apos;acquérir ce terrain, vous devez acheter au moins [AMOUNT] L$.
 	</text>
 	<string name="no_parcel_selected">
 		(aucune parcelle sélectionnée)
 	</string>
 	<string name="buy_currency">
-		Acheter [LINDENS] $L pour environ [USD] $US
+		Acheter [LINDENS] L$ pour environ [USD] US$
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_object.xml b/indra/newview/skins/default/xui/fr/floater_buy_object.xml
index 9cdb72ef22..2bbbbc97b4 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_object.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="contents" title="Acheter une copie de l&apos;objet">
 	<text name="contents_text">
 		et ses contenus :
 	</text>
 	<text name="buy_text">
-		Acheter pour [AMOUNT] $L à [NAME] ?
+		Acheter pour [AMOUNT] L$ à [NAME] ?
 	</text>
-	<button label="Annuler" label_selected="Annuler" name="cancel_btn" />
-	<button label="Acheter" label_selected="Acheter" name="buy_btn" />
+	<button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
+	<button label="Acheter" label_selected="Acheter" name="buy_btn"/>
 	<string name="title_buy_text">
 		Acheter
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_color_picker.xml b/indra/newview/skins/default/xui/fr/floater_color_picker.xml
index b21e1b3b61..f6c210c4ce 100644
--- a/indra/newview/skins/default/xui/fr/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/fr/floater_color_picker.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="ColorPicker" title="Sélecteur de couleurs">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="ColorPicker" title="Choix de texture et de couleur">
 	<text name="r_val_text">
 		Rouge :
 	</text>
@@ -18,14 +18,14 @@
 	<text name="l_val_text">
 		Lum :
 	</text>
-	<check_box label="Appliquer immédiatement" name="apply_immediate" left="4" width="108"/>
-	<button label="" label_selected="" name="color_pipette" left_delta="138"/>
-	<button label="Annuler" label_selected="Annuler" name="cancel_btn" />
-	<button label="Sélectionner" label_selected="Sélectionner" name="select_btn" />
-	<text name="Current color:" left="8">
+	<check_box label="Application auto" left="4" name="apply_immediate" width="108"/>
+	<button label="" label_selected="" left_delta="138" name="color_pipette"/>
+	<button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
+	<button label="Sélectionner" label_selected="Sélectionner" name="select_btn"/>
+	<text left="8" name="Current color:">
 		Couleur actuelle :
 	</text>
-	<text name="(Drag below to save.)" left="8" width="114">
+	<text left="8" name="(Drag below to save.)" width="114">
 		(Faire glisser dessous
 pour enregistrer.)
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_customize.xml b/indra/newview/skins/default/xui/fr/floater_customize.xml
index 24b5054a5c..ddbcbbdc53 100644
--- a/indra/newview/skins/default/xui/fr/floater_customize.xml
+++ b/indra/newview/skins/default/xui/fr/floater_customize.xml
@@ -1,525 +1,449 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater customize" title="Apparence" width="511">
-	<tab_container name="customize tab container" tab_min_width="113" width="509">
-		<panel label="Parties du corps" />
-		<panel label="Parties du corps" name="body_parts_placeholder" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater customize" title="Apparence" width="513">
+	<tab_container name="customize tab container" tab_min_width="115" width="511">
+		<panel label="Parties du corps"/>
+		<panel label="Parties du corps" name="body_parts_placeholder"/>
 		<panel label="Silhouette" left="119" name="Shape" width="389">
-			<button label="Créer une silhouette" label_selected="Créer une silhouette"
-			     name="Create New" width="140" />
-			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-			     width="82" />
-			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-			     name="Save As" width="105" />
-			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-			     width="82" />
-			<button label="Corps" label_selected="Corps" name="Body" />
-			<button label="Tête" label_selected="Tête" name="Head" />
-			<button label="Yeux" label_selected="Yeux" name="Eyes" />
-			<button label="Oreilles" label_selected="Oreilles" name="Ears" />
-			<button label="Nez" label_selected="Nez" name="Nose" />
-			<button label="Bouche" label_selected="Bouche" name="Mouth" />
-			<button label="Menton" label_selected="Menton" name="Chin" />
-			<button label="Torse" label_selected="Torse" name="Torso" />
-			<button label="Jambes" label_selected="Jambes" name="Legs" />
-			<button label="Aléatoire" label_selected="Aléatoire" name="Randomize" />
-			<text type="string" length="1" name="title">
+			<button label="Créer une silhouette" label_selected="Créer une silhouette" name="Create New" width="140"/>
+			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+			<button label="Corps" label_selected="Corps" name="Body"/>
+			<button label="Tête" label_selected="Tête" name="Head"/>
+			<button label="Yeux" label_selected="Yeux" name="Eyes"/>
+			<button label="Oreilles" label_selected="Oreilles" name="Ears"/>
+			<button label="Nez" label_selected="Nez" name="Nose"/>
+			<button label="Bouche" label_selected="Bouche" name="Mouth"/>
+			<button label="Menton" label_selected="Menton" name="Chin"/>
+			<button label="Torse" label_selected="Torse" name="Torso"/>
+			<button label="Jambes" label_selected="Jambes" name="Legs"/>
+			<button label="Aléatoire" label_selected="Aléatoire" name="Randomize"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: impossible de modifier
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: en cours de chargement...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: non portée
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Emplacement : [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Pour changer de silhouette, faites-en glisser une à partir de votre
-inventaire. jusqu&apos;à votre avatar. L&apos;autre possibilité est d&apos;en créer
+inventaire jusqu&apos;à votre avatar. Vous pouvez aussi en créer une nouvelle et la porter.
 une nouvelle et de la porter.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Vous n&apos;avez pas la permission de modifier cet objet.
 			</text>
 			<radio_group name="sex radio">
-				<radio_item type="string" length="1" name="radio">
+				<radio_item length="1" name="radio" type="string">
 					Femme
 				</radio_item>
-				<radio_item type="string" length="1" name="radio2">
+				<radio_item length="1" name="radio2" type="string">
 					Homme
 				</radio_item>
 			</radio_group>
 		</panel>
 		<panel label="Peau" name="Skin">
-			<button label="Créer une peau" label_selected="Créer une peau" name="Create New" />
-			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-			     width="82" />
-			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-			     name="Save As" width="105" />
-			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-			     width="82" />
-			<button label="Couleur" label_selected="Couleur" name="Skin Color" width="84" />
-			<button label="Détails visage" label_selected="Détails visage" name="Face Detail"
-			     width="84" />
-			<button label="Maquillage" label_selected="Maquillage" name="Makeup" width="84" />
-			<button label="Détails corps" label_selected="Détails corps" name="Body Detail"
-			     width="84" />
-			<button label="Aléatoire" label_selected="Aléatoire" name="Randomize" width="84" />
-			<text type="string" length="1" name="title">
+			<button label="Créer une peau" label_selected="Créer une peau" name="Create New"/>
+			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+			<button label="Couleur" label_selected="Couleur" name="Skin Color" width="84"/>
+			<button label="Détails visage" label_selected="Détails visage" name="Face Detail" width="84"/>
+			<button label="Maquillage" label_selected="Maquillage" name="Makeup" width="84"/>
+			<button label="Détails corps" label_selected="Détails corps" name="Body Detail" width="84"/>
+			<button label="Aléatoire" label_selected="Aléatoire" name="Randomize" width="84"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: impossible de modifier
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: en cours de chargement...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: non portée
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Emplacement : [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Pour changer de peau, faites-en glisser une à partir de votre inventaire.
-L&apos;autre possibilité est d&apos;en créer une nouvelle et de la porter.
+Vous pouvez aussi en créer une nouvelle et la porter.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Vous n&apos;avez pas la permission de modifier cet objet.
 			</text>
-			<texture_picker label="Tatouages tête" name="Head Tattoos"
-			     tool_tip="Cliquez pour sélectionner une image" width="78" />
-			<texture_picker label="Tatouages haut" name="Upper Tattoos"
-			     tool_tip="Cliquez pour sélectionner une image" width="78" />
-			<texture_picker label="Tatouages bas" name="Lower Tattoos"
-			     tool_tip="Cliquez pour sélectionner une image" width="78" />
+			<texture_picker label="Tatouages tête" name="Head Tattoos" tool_tip="Cliquez pour sélectionner une image" width="78"/>
+			<texture_picker label="Tatouages haut" name="Upper Tattoos" tool_tip="Cliquez pour sélectionner une image" width="78"/>
+			<texture_picker label="Tatouages bas" name="Lower Tattoos" tool_tip="Cliquez pour sélectionner une image" width="78"/>
 		</panel>
 		<panel label="Cheveux" name="Hair">
-			<button label="Créer des cheveux" label_selected="Créer des cheveux"
-			     name="Create New" />
-			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-			     width="82" />
-			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-			     name="Save As" width="105" />
-			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-			     width="82" />
-			<button label="Couleur" label_selected="Couleur" name="Color" />
-			<button label="Style" label_selected="Style" name="Style" />
-			<button label="Sourcils" label_selected="Sourcils" name="Eyebrows" />
-			<button label="Pilosité" label_selected="Pilosité" name="Facial" />
-			<button label="Aléatoire" label_selected="Aléatoire" name="Randomize" />
-			<text type="string" length="1" name="title">
+			<button label="Créer des cheveux" label_selected="Créer des cheveux" name="Create New"/>
+			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+			<button label="Couleur" label_selected="Couleur" name="Color"/>
+			<button label="Style" label_selected="Style" name="Style"/>
+			<button label="Sourcils" label_selected="Sourcils" name="Eyebrows"/>
+			<button label="Pilosité" label_selected="Pilosité" name="Facial"/>
+			<button label="Aléatoire" label_selected="Aléatoire" name="Randomize"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: impossible de modifier
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: en cours de chargement...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: non portés
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Emplacement : [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Pour changer de chevelure, faites-en glisser une de votre inventaire
-jusqu&apos;à votre avatar. L&apos;autre possibilité est d&apos;en créer une
-nouvelle et de la porter.
+jusqu&apos;à votre avatar. Vous pouvez aussi en créer une
+nouvelle et la porter.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Vous n&apos;avez pas la permission de modifier cet objet.
 			</text>
-			<texture_picker label="Texture" name="Texture" tool_tip="Cliquez pour sélectionner une image" />
+			<texture_picker label="Texture" name="Texture" tool_tip="Cliquez pour sélectionner une image"/>
 		</panel>
 		<panel label="Yeux" name="Eyes">
-			<button label="Créer des yeux" label_selected="Créer des yeux" name="Create New" />
-			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-			     width="82" />
-			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-			     name="Save As" width="105" />
-			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-			     width="82" />
-			<button label="Aléatoire" label_selected="Aléatoire" name="Randomize" />
-			<text type="string" length="1" name="title">
+			<button label="Créer des yeux" label_selected="Créer des yeux" name="Create New"/>
+			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+			<button label="Aléatoire" label_selected="Aléatoire" name="Randomize"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: impossible de modifier
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: en cours de chargement...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: non portés
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Emplacement : [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Pour changer vos yeux, faites-les glisser de votre inventaire
-jusqu&apos;à votre avatar. L&apos;autre possibilité est
-d&apos;en créer de nouveaux et de les porter.
+jusqu&apos;à votre avatar. Vous pouvez aussi en créer de nouveaux et les porter.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Vous n&apos;avez pas la permission de modifier cet objet.
 			</text>
-			<texture_picker label="Iris" name="Iris" tool_tip="Cliquez pour sélectionner une image" />
+			<texture_picker label="Iris" name="Iris" tool_tip="Cliquez pour sélectionner une image"/>
 		</panel>
-		<panel label="Vêtements" />
-		<panel label="Habits" name="clothes_placeholder" />
+		<panel label="Vêtements"/>
+		<panel label="Habits" name="clothes_placeholder"/>
 		<panel label="Chemise" name="Shirt">
-			<button label="Créer une chemise" label_selected="Créer une chemise"
-			     name="Create New" />
-			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-			     width="82" />
-			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-			     name="Save As" width="105" />
-			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-			     width="82" />
-			<text type="string" length="1" name="title">
+			<button label="Créer une chemise" label_selected="Créer une chemise" name="Create New"/>
+			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: impossible de modifier
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: en cours de chargement...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
-				[DESC]: non porté
+			<text length="1" name="title_not_worn" type="string">
+				[DESC]: non portée
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Emplacement : [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Pour changer de chemise, faites-en glisser une de votre inventaire
-jusqu&apos;à votre avatar. L&apos;autre possibilité est
-d&apos;en créer une nouvelle et de la porter.
+jusqu&apos;à votre avatar. Vous pouvez aussi en créer une nouvelle et la porter.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Vous n&apos;avez pas la permission de modifier cet objet.
 			</text>
-			<color_swatch label="Couleur/Teinte" name="Color/Tint"
-			     tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74" />
-			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"
-			     width="74" />
+			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
 		</panel>
 		<panel label="Pantalon" name="Pants">
-			<button label="Créer un pantalon" label_selected="Créer un pantalon"
-			     name="Create New" />
-			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-			     width="82" />
-			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-			     name="Save As" width="105" />
-			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-			     width="82" />
-			<text type="string" length="1" name="title">
+			<button label="Créer un pantalon" label_selected="Créer un pantalon" name="Create New"/>
+			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: impossible de modifier
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: en cours de chargement...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: non porté
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Emplacement : [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Pour changer de pantalon, faites-en glisser un de votre inventaire
-jusqu&apos;à votre avatar. L&apos;autre possibilité est
-d&apos;en créer un nouveau et de le porter.
+jusqu&apos;à votre avatar. Vous pouvez aussi en créer un nouveau et le porter.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Vous n&apos;avez pas la permission de modifier cet objet.
 			</text>
-			<color_swatch label="Couleur/Teinte" name="Color/Tint"
-			     tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74" />
-			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"
-			     width="74" />
+			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
 		</panel>
 		<panel label="Chaussures" name="Shoes">
-			<button label="Créer des chaussures" label_selected="Créer des chaussures"
-			     name="Create New" width="140" />
-			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-			     width="82" />
-			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-			     name="Save As" width="105" />
-			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-			     width="82" />
-			<text type="string" length="1" name="title">
+			<button label="Créer des chaussures" label_selected="Créer des chaussures" name="Create New" width="140"/>
+			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: impossible de modifier
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: en cours de chargement...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: non portées
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Emplacement : [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Pour changer de chaussures, faites-en glisser une paire de votre
-inventaire jusqu&apos;à votre avatar. L&apos;autre possibilité est d&apos;en créer une
-nouvelle paire et de la porter.
+inventaire jusqu&apos;à votre avatar. Vous pouvez aussi en créer une
+nouvelle paire et la porter.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Vous n&apos;avez pas la permission de modifier cet objet.
 			</text>
-			<color_swatch label="Couleur/Teinte" name="Color/Tint"
-			     tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74" />
-			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"
-			     width="74" />
+			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
 		</panel>
 		<panel label="Chaussettes" name="Socks">
-			<button label="Créer des chaussettes" label_selected="Créer des chaussettes"
-			     name="Create New" width="140" />
-			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-			     width="82" />
-			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-			     name="Save As" width="105" />
-			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-			     width="82" />
-			<text type="string" length="1" name="title">
+			<button label="Créer des chaussettes" label_selected="Créer des chaussettes" name="Create New" width="140"/>
+			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: impossible de modifier
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: en cours de chargement...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: non portées
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Emplacement : [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Pour changer de chaussettes, faites-en glisser une paire de votre
-inventaire jusqu&apos;à votre avatar. L&apos;autre possibilité est d&apos;en créer une
-nouvelle paire et de la porter.
+inventaire jusqu&apos;à votre avatar. Vous pouvez aussi en créer une
+nouvelle paire et la porter.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Vous n&apos;avez pas la permission de modifier cet objet.
 			</text>
-			<color_swatch label="Couleur/Teinte" name="Color/Tint"
-			     tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74" />
-			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"
-			     width="74" />
+			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
 		</panel>
 		<panel label="Veste" name="Jacket">
-			<button label="Créer une veste" label_selected="Créer une veste" name="Create New" />
-			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-			     width="82" />
-			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-			     name="Save As" width="105" />
-			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-			     width="82" />
-			<text type="string" length="1" name="title">
+			<button label="Créer une veste" label_selected="Créer une veste" name="Create New"/>
+			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: impossible de modifier
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: en cours de chargement...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: non portée
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Emplacement : [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Pour changer de veste, faites-en glisser une de votre inventaire
-jusqu&apos;à votre avatar. L&apos;autre possibilité est d&apos;en créer une
-nouvelle et de la porter.
+jusqu&apos;à votre avatar. Vous pouvez aussi en créer une
+nouvelle et la porter.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Vous n&apos;avez pas la permission de modifier cet objet.
 			</text>
-			<color_swatch label="Couleur/Teinte" name="Color/Tint"
-			     tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="81" />
-			<texture_picker label="Tissu (dessus)" name="Upper Fabric"
-			     tool_tip="Cliquez pour sélectionner une image" width="81" />
-			<texture_picker label="Tissu (dessous)" name="Lower Fabric"
-			     tool_tip="Cliquez pour sélectionner une image" width="81" />
+			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="81"/>
+			<texture_picker label="Tissu (dessus)" name="Upper Fabric" tool_tip="Cliquez pour sélectionner une image" width="81"/>
+			<texture_picker label="Tissu (dessous)" name="Lower Fabric" tool_tip="Cliquez pour sélectionner une image" width="81"/>
 		</panel>
 		<panel label="Gants" name="Gloves">
-			<button label="Créer des gants" label_selected="Créer des gants" name="Create New" />
-			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-			     width="82" />
-			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-			     name="Save As" width="105" />
-			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-			     width="82" />
-			<text type="string" length="1" name="title">
+			<button label="Créer des gants" label_selected="Créer des gants" name="Create New"/>
+			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: impossible de modifier
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: en cours de chargement...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: non portés
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Emplacement : [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Pour changer de gants, faites-en glisser une paire à partir de votre
-inventaire. L&apos;autre possibilité est d&apos;en créer une nouvelle paire
-et de la porter.
+inventaire. Vous pouvez aussi en créer une nouvelle paire
+et la porter.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Vous n&apos;avez pas la permission de modifier cet objet.
 			</text>
-			<color_swatch label="Couleur/Teinte" name="Color/Tint"
-			     tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74" />
-			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"
-			     width="74" />
+			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
 		</panel>
 		<panel label="Tricot de peau" name="Undershirt">
-			<button label="Créer un tricot de peau" label_selected="Créer un tricot"
-			     name="Create New" />
-			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-			     width="82" />
-			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-			     name="Save As" width="105" />
-			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-			     width="82" />
-			<text type="string" length="1" name="title">
+			<button label="Créer un tricot de peau" label_selected="Créer un tricot" name="Create New"/>
+			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: impossible de modifier
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: en cours de chargement...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: non porté
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Emplacement : [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Pour changer de tricot, faites-en glisser un à partir de votre inventaire.
-L&apos;autre possibilité est d&apos;en créer un nouveau et de le porter.
+Vous pouvez aussi en créer un nouveau et le porter.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Vous n&apos;avez pas la permission de modifier cet objet.
 			</text>
-			<color_swatch label="Couleur/Teinte" name="Color/Tint"
-			     tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74" />
-			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"
-			     width="74" />
+			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
 		</panel>
 		<panel label="Sous-vêtements" name="Underpants">
-			<button label="Créer des sous-vêtements" label_selected="Créer des sous-vêtements"
-			     name="Create New" />
-			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-			     width="82" />
-			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-			     name="Save As" width="105" />
-			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-			     width="82" />
-			<text type="string" length="1" name="title">
+			<button label="Créer des sous-vêtements" label_selected="Créer des sous-vêtements" name="Create New" width="166"/>
+			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: impossible de modifier
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: en cours de chargement...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: non portés
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Emplacement : [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
-				Pour changer de sous-vêtement, faites-en glisser un à partir de votre
-inventaire. L&apos;autre possibilité est d&apos;en créer un nouveau et de le porter.
+			<text length="1" name="not worn instructions" type="string">
+				Pour changer de sous-vêtement, faites-en glisser une paire à partir de
+votre inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Vous n&apos;avez pas la permission de modifier cet objet.
 			</text>
-			<color_swatch label="Couleur/Teinte" name="Color/Tint"
-			     tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74" />
-			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"
-			     width="74" />
+			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
 		</panel>
 		<panel label="Jupe" name="Skirt">
-			<button label="Créer une jupe" label_selected="Créer une jupe" name="Create New" />
-			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-			     width="82" />
-			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-			     name="Save As" width="105" />
-			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-			     width="82" />
-			<text type="string" length="1" name="title">
+			<button label="Créer une jupe" label_selected="Créer une jupe" name="Create New"/>
+			<button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+			<button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+			<button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: impossible de modifier
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: en cours de chargement...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: non portée
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Emplacement : [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Pour changer de jupe, faites-en glisser une à partir de votre inventaire.
-L&apos;autre possibilité est d&apos;en créer une nouvelle et de la porter.
+Vous pouvez aussi en créer une nouvelle et la porter.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Vous n&apos;avez pas la permission de modifier cet objet.
 			</text>
-			<color_swatch label="Couleur/Teinte" name="Color/Tint"
-			     tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74" />
-			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"
-			     width="74" />
+			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
 		</panel>
 	</tab_container>
-	<scroll_container left="214" name="panel_container" />
-	<button label="Créer un ensemble" label_selected="Créer un ensemble"
-	     name="Make Outfit" right="-252" width="115" />
-	<button label="Tout enregistrer" label_selected="Tout enregistrer" name="Save All"
-	     right="-131" width="115" />
-	<button label="Fermer" label_selected="Fermer" name="Close" width="115" />
+	<scroll_container left="216" name="panel_container"/>
+	<button label="Créer un ensemble" label_selected="Créer un ensemble" name="Make Outfit" right="-252" width="115"/>
+	<button label="Tout enregistrer" label_selected="Tout enregistrer" name="Save All" right="-131" width="115"/>
+	<button label="Fermer" label_selected="Fermer" name="Close" width="115"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_env_settings.xml b/indra/newview/skins/default/xui/fr/floater_env_settings.xml
index 1fe3192705..3d46559285 100644
--- a/indra/newview/skins/default/xui/fr/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_env_settings.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Environment Editor Floater" title="Editeur d&apos;environnement">
-	<text name="EnvTimeText" bottom="-45" >
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Environment Editor Floater" title="Éditeur d&apos;environnement">
+	<text bottom="-45" name="EnvTimeText">
 		Heure de la
 journée
 	</text>
-	<text name="EnvTimeText2" bottom_delta="-36" >
+	<text bottom_delta="-36" name="EnvTimeText2">
 		Midi
 	</text>
 	<text name="EnvCloudText">
 		Couverture
 nuageuse
 	</text>
-	<text name="EnvWaterColorText" bottom="-45" >
+	<text bottom="-45" name="EnvWaterColorText">
 		Couleur de
 l&apos;eau
 	</text>
-	<color_swatch name="EnvWaterColor" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" />
+	<color_swatch name="EnvWaterColor" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs"/>
 	<text name="EnvWaterFogText">
 		Brouillard
 dans l&apos;eau
 	</text>
-	<button label="Utiliser heure du domaine" name="EnvUseEstateTimeButton" bottom="-144"/>
-	<button label="Ciel avancé" name="EnvAdvancedSkyButton" />
-	<button label="Eau avancée" name="EnvAdvancedWaterButton" />
-	<button label="?" name="EnvSettingsHelpButton" />
+	<button bottom="-144" label="Utiliser heure du domaine" name="EnvUseEstateTimeButton" width="145"/>
+	<button label="Ciel avancé" name="EnvAdvancedSkyButton" width="145" left="162" />
+	<button label="Eau avancée" name="EnvAdvancedWaterButton" width="145" left="316"/>
+	<button label="?" name="EnvSettingsHelpButton"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_god_tools.xml b/indra/newview/skins/default/xui/fr/floater_god_tools.xml
index afa38f32c5..1700b8d94b 100644
--- a/indra/newview/skins/default/xui/fr/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_god_tools.xml
@@ -1,117 +1,77 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="godtools floater" title="Outils Admin">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="godtools floater" title="Outils divins">
 	<tab_container name="GodTools Tabs">
 		<panel label="Grille" name="grid">
-			<button label="Vider Tous" label_selected="Vider Tous" name="Kick all users" />
-			<button label="Vider le cache cartographique de la région"
-			     label_selected="Vider le cache cartographique de la région"
-			     name="Flush This Region&apos;s Map Visibility Caches" />
+			<button label="Éjecter tous" label_selected="Éjecter tous" name="Kick all users" width="175" />
+			<button label="Vider le cache cartographique de la région" label_selected="Vider le cache cartographique de la région" name="Flush This Region&apos;s Map Visibility Caches" width="285"/>
 		</panel>
 		<panel label="Région" name="region">
-			<text name="Sim Name:">
+			<text name="Sim Name:" width="70">
 				Nom du sim :
 			</text>
-			<check_box label="Initiation" name="check prelude"
-			     tool_tip="Définir cette région comme zone d&apos;initiation." />
-			<check_box label="Soleil fixe" name="check fixed sun"
-			     tool_tip="Définir la position du soleil (comme dans Région/Domaine &gt; Terrain.)" />
-			<check_box label="Réinitialiser le domicile à la téléportation"
-			     name="check reset home"
-			     tool_tip="Lorsqu&apos;un résident se téléporte à l&apos;extérieur, réinitialise son domicile à la position de sa destination." />
-			<check_box label="Visible" name="check visible"
-			     tool_tip="Cochez pour rendre la région visible aux non-admins." />
-			<check_box label="Dégâts" name="check damage"
-			     tool_tip="Cochez pour activer les dégâts dans cette région." />
-			<check_box label="Bloquer le suivi de trafic" name="block dwell"
-			     tool_tip="Cochez pour que la région ne comptabilise pas le trafic." />
-			<check_box label="Bloquer le terraformage" name="block terraform"
-			     tool_tip="Cochez pour empêcher les personnes de terraformer leur terrain" />
-			<check_box label="Bac à sable" name="is sandbox"
-			     tool_tip="Basculer cette région en bac à sable." />
-			<button label="Figer le terrain" label_selected="Figer le terrain" name="Bake Terrain"
-			     tool_tip="Enregistrer le terrain actuel comme terrain par défaut." />
-			<button label="Rétablir le terrain" label_selected="Rétablir le terrain"
-			     name="Revert Terrain"
-			     tool_tip="Remplacer le terrain actuel avec le terrain par défaut." />
-			<button label="Échanger le terrain" label_selected="Échanger le terrain"
-			     name="Swap Terrain"
-			     tool_tip="Échanger le terrain actuel avec le terrain par défaut." />
+			<line_editor left="85" name="region name" width="198" />
+			<check_box label="Initiation" name="check prelude" tool_tip="Définir cette région comme zone d&apos;initiation."/>
+			<check_box label="Soleil fixe" name="check fixed sun" tool_tip="Définir la position du soleil (comme dans Région et Domaine &gt; Terrain.)"/>
+			<check_box label="Réinitialiser le domicile &#10;à la téléportation" name="check reset home" tool_tip="Lorsqu&apos;un résident se téléporte à l&apos;extérieur, réinitialise son domicile à la position de sa destination."  height="32"/>
+			<check_box label="Visible" name="check visible" tool_tip="Cochez pour rendre la région visible aux non-admins."  bottom_delta="-32"/>
+			<check_box label="Dégâts" name="check damage" tool_tip="Cochez pour activer les dégâts dans cette région."/>
+			<check_box label="Bloquer le suivi de trafic" name="block dwell" tool_tip="Cochez pour que la région ne comptabilise pas le trafic."/>
+			<check_box label="Bloquer le terraformage" name="block terraform" tool_tip="Cochez pour empêcher les personnes de terraformer leur terrain"/>
+			<check_box label="Bac à sable" name="is sandbox" tool_tip="Basculer cette région en bac à sable."/>
+			<button label="Figer le terrain" label_selected="Figer le terrain" name="Bake Terrain" tool_tip="Enregistrer le terrain actuel comme terrain par défaut." width="118" />
+			<button label="Rétablir le terrain" label_selected="Rétablir le terrain" name="Revert Terrain" tool_tip="Remplacer le terrain actuel avec le terrain par défaut." width="118" />
+			<button label="Échanger le terrain" label_selected="Échanger le terrain" name="Swap Terrain" tool_tip="Échangez le terrain actuel avec le terrain par défaut." width="118" />
 			<text name="estate id">
 				ID du domaine :
 			</text>
 			<text name="parent id">
 				ID parent :
 			</text>
-			<line_editor name="parentestate"
-			     tool_tip="Il s&apos;agit du domaine parent de cette région" />
+			<line_editor name="parentestate" tool_tip="Il s&apos;agit du domaine parent de cette région"/>
 			<text name="Grid Pos: ">
 				Position sur la grille :
 			</text>
-			<line_editor name="gridposx" tool_tip="Position x de cette région sur la grille" />
-			<line_editor name="gridposy" tool_tip="Position y de cette région sur la grille" />
+			<line_editor name="gridposx" tool_tip="Position x de cette région sur la grille" left_delta="120" width="35"/>
+			<line_editor name="gridposy" tool_tip="Position y de cette région sur la grille" left_delta="40" width="35" />
 			<text name="Redirect to Grid: ">
 				Rediriger vers la grille :
 			</text>
-			<text name="billable factor text">
+			<line_editor left_delta="120" name="redirectx" width="35" />
+			<line_editor left_delta="40" name="redirecty" width="35" />
+			<spinner left="320" name="billable factor" width="70" />
+			<text name="billable factor text" font="SansSerifSmall" left_delta="-120" width="120">
 				Facteur de facturation :
 			</text>
-			<text name="land cost text">
-				$L par m² :
+			<spinner left="320" name="land cost" width="70" />
+			<text name="land cost text" left_delta="-120">
+				L$ par m² :
 			</text>
-			<button label="Rafraîchir" label_selected="Rafraîchir" name="Refresh"
-			     tool_tip="Cliquez ici pour rafraîchir les informations ci-dessus." />
-			<button label="Appliquer" label_selected="Appliquer" name="Apply"
-			     tool_tip="Cliquez ici pour appliquer les modifications effectuées ci-dessus." />
-			<button label="Sélectionner une région" label_selected="Sélectionner une région"
-			     name="Select Region"
-			     tool_tip="Sélectionnez une région entière à l&apos;aide de l&apos;outil Terrain." />
-			<button label="Sauvegarde automatique" label_selected="Sauvegarde automatique"
-			     name="Autosave now" tool_tip="Sauvegarde automatique au format gzip." />
+			<button label="Rafraîchir" label_selected="Rafraîchir" name="Refresh" tool_tip="Cliquez ici pour rafraîchir les informations ci-dessus."/>
+			<button label="Appliquer" label_selected="Appliquer" name="Apply" tool_tip="Cliquez ici pour appliquer les modifications effectuées ci-dessus."/>
+			<button label="Sélectionner une région" label_selected="Sélectionner une région" name="Select Region" tool_tip="Sélectionnez une région entière à l&apos;aide de l&apos;outil Terrain."  width="140" left="136"/>
+			<button label="Sauvegarde automatique" label_selected="Sauvegarde automatique" name="Autosave now" tool_tip="Sauvegarde automatique au format gzip." width="140" left="136"/>
 		</panel>
 		<panel label="Objets" name="objects">
-			<text name="Sim Name:">
+			<text name="Sim Name:" width="70">
 				Nom du sim :
 			</text>
-			<text name="region name">
-				Gallois
+			<text name="region name" left_delta="75">
+				Welsh
 			</text>
-			<check_box label="Désactiver les scripts" name="disable scripts"
-			     tool_tip="Cochez pour désactiver tous les scripts dans cette région" />
-			<check_box label="Désactiver les collisions" name="disable collisions"
-			     tool_tip="Cochez pour désactiver les collisions entre non-avatars dans cette région" />
-			<check_box label="Désactiver les propriétés physiques" name="disable physics"
-			     tool_tip="Cochez pour désactiver toutes les propriétés physiques dans cette région" />
-			<button label="Appliquer" label_selected="Appliquer" name="Apply"
-			     tool_tip="Cliquez ici pour appliquer les modifications effectuées ci-dessus." />
-			<button label="Définir la cible" label_selected="Définir la cible" name="Set Target"
-			     tool_tip="Définir l&apos;avatar cible pour la suppression de l&apos;objet." />
+			<check_box label="Désactiver les &#10;scripts" name="disable scripts" tool_tip="Cochez pour désactiver tous les scripts dans cette région"/>
+			<check_box label="Désactiver les &#10;collisions" name="disable collisions" tool_tip="Cochez pour désactiver les collisions entre non-avatars dans cette région"/>
+			<check_box label="Désactiver les &#10;propriétés physiques" name="disable physics" tool_tip="Cochez pour désactiver toutes les propriétés physiques dans cette région"/>
+			<button label="Appliquer" label_selected="Appliquer" name="Apply" tool_tip="Cliquez ici pour appliquer les modifications effectuées ci-dessus."  bottom="-85"/>
+			<button label="Définir la cible" label_selected="Définir la cible" name="Set Target" tool_tip="Définir l&apos;avatar cible pour la suppression de l&apos;objet."/>
 			<text name="target_avatar_name">
 				(aucune cible)
 			</text>
-			<button
-			     label="Supprimer tous les objets scriptés de la cible sur les terrains des autres"
-			     label_selected="Supprimer tous les objets scriptés de la cible sur les terrains des autres"
-			     name="Delete Target&apos;s Scripted Objects On Others Land"
-			     tool_tip="Supprimer tous les objets scriptés appartenant à la cible sur les terrains ne lui appartenant pas. Les objets non reproductibles seront renvoyés." />
-			<button label="Supprimer les objets scriptés de la cible sur *tous* les terrains"
-			     label_selected="Supprimer les objets scriptés de la cible sur *tous* les terrains"
-			     name="Delete Target&apos;s Scripted Objects On *Any* Land"
-			     tool_tip="Supprimer les objets scriptés appartenant à la cible dans cette région. Les objets non reproductibles seront renvoyés." />
-			<button label="Supprimer *tous* les objets de la cible"
-			     label_selected="Supprimer *tous* les objets de la cible"
-			     name="Delete *ALL* Of Target&apos;s Objects"
-			     tool_tip="Supprimer tous les objets appartenant à la cible dans cette région. Les objets non reproductibles seront renvoyés." />
-			<button label="Afficher les objets souvent responsables de collision"
-			     label_selected="Afficher les objets souvent responsables de collision"
-			     name="Get Top Colliders"
-			     tool_tip="Dresse une liste des objets avec les callbacks les plus fréquents. " />
-			<button label="Afficher les scripts fréquemment utilisés"
-			     label_selected="Afficher les scripts fréquemment utilisés"
-			     name="Get Top Scripts"
-			     tool_tip="Dresse une liste des objets qui passent le plus de temps à exécuter des scripts." />
-			<button label="Résumé des scripts" label_selected="Résumé des scripts"
-			     name="Scripts digest"
-			     tool_tip="Dresse une liste des scripts et de leurs occurrences." />
+			<button label="Supprimer tous les objets scriptés de la cible sur les terrains des autres" label_selected="Supprimer tous les objets scriptés de la cible sur les terrains des autres" name="Delete Target&apos;s Scripted Objects On Others Land" tool_tip="Supprimer tous les objets scriptés appartenant à la cible sur les terrains ne lui appartenant pas. Les objets non reproductibles seront renvoyés."/>
+			<button label="Supprimer les objets scriptés de la cible sur *tous* les terrains" label_selected="Supprimer les objets scriptés de la cible sur *tous* les terrains" name="Delete Target&apos;s Scripted Objects On *Any* Land" tool_tip="Supprimer les objets scriptés appartenant à la cible dans cette région. Les objets non reproductibles seront renvoyés."/>
+			<button label="Supprimer *tous* les objets de la cible" label_selected="Supprimer *tous* les objets de la cible" name="Delete *ALL* Of Target&apos;s Objects" tool_tip="Supprimer tous les objets appartenant à la cible dans cette région. Les objets non reproductibles seront renvoyés."/>
+			<button width="300" label="Afficher les objets souvent responsables de collision" label_selected="Afficher les objets souvent responsables de collision" name="Get Top Colliders" tool_tip="Dresse une liste des objets avec les callbacks les plus fréquents. "/>
+			<button width="300" label="Afficher les scripts fréquemment utilisés" label_selected="Afficher les scripts fréquemment utilisés" name="Get Top Scripts" tool_tip="Dresse une liste des objets qui passent le plus de temps à exécuter des scripts."/>
+			<button width="300" label="Résumé des scripts" label_selected="Résumé des scripts" name="Scripts digest" tool_tip="Dresse une liste des scripts et de leurs occurrences."/>
 		</panel>
 		<panel label="Requête" name="request">
 			<text name="Destination:">
@@ -145,8 +105,7 @@
 			<text name="Parameter:">
 				Paramètre :
 			</text>
-			<button label="Effectuer la requête" label_selected="Effectuer la requête"
-			     name="Make Request" />
+			<button label="Effectuer la requête" label_selected="Effectuer la requête" name="Make Request" width="140"/>
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
index 1b5bcdbea0..461bd8dae4 100644
--- a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Hardware Settings Floater" title="Configuration du matériel">
 	<text name="Filtering:">
 		Filtres :
 	</text>
-	<check_box label="Filtre anisotrope (plus lent si activé)" name="ani" />
+	<check_box label="Filtre anisotrope (plus lent si activé)" name="ani"/>
 	<text name="Antialiasing:">
 		Anti-aliasing :
 	</text>
@@ -24,17 +24,15 @@
 			16x
 		</combo_item>
 	</combo_box>
-	<spinner label="Gamma :" name="gamma" />
-	<text name="(brightness, lower is brighter)" left="217" >
-		(luminosité, valeur faible = plus lumineux, 0 = défaut)
+	<spinner label="Gamma :" name="gamma"/>
+	<text left="217" name="(brightness, lower is brighter)">
+		(0 = défaut, valeur faible = plus lumineux)
 	</text>
 	<text name="Enable VBO:">
 		Activer le VBO :
 	</text>
-	<check_box label="Activer OpenGL Vertex Buffer Objects" name="vbo"
-	     tool_tip="Sur un matériel moderne, cette option permet une meilleure performance.  Par contre, sur un matériel plus ancien, les VBO sont souvent mal implémentés et peuvent causer des crashs lorsqu&apos;ils sont activés." />
-	<slider label="Mémoire texture (Mo) :" name="GrapicsCardTextureMemory"
-	     tool_tip="Total de la mémoire alloué aux textures. Mémoire de la carte vidéo par défaut. En réduisant cette valeur, vous pouvez accroître la performance mais les textures risquent de devenir floues." />
-	<spinner label="Rapport de distance &#10;du brouillard :" name="fog" />
-	<button label="OK" label_selected="OK" name="OK" />
+	<check_box label="Activer OpenGL Vertex Buffer Objects" name="vbo" tool_tip="Sur un matériel moderne, cette option permet une meilleure performance. Par contre, sur un matériel plus ancien, les VBO sont souvent mal implémentés et peuvent causer des crashs lorsqu&apos;ils sont activés."/>
+	<slider label="Mémoire vidéo (Mo) :" name="GrapicsCardTextureMemory" tool_tip="Total de la mémoire alloué aux textures. Mémoire de la carte vidéo par défaut. En réduisant cette valeur, vous pouvez accroître la performance mais les textures risquent de devenir floues."/>
+	<spinner label="Indice du brouillard :" name="fog"/>
+	<button label="OK" label_selected="OK" name="OK"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_image_preview.xml b/indra/newview/skins/default/xui/fr/floater_image_preview.xml
index a93547f240..2477fb684f 100644
--- a/indra/newview/skins/default/xui/fr/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_image_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Image Preview" title="">
 	<text name="name_label">
 		Nom :
@@ -9,7 +9,7 @@
 	<text name="preview_label">
 		Prévisualiser comme :
 	</text>
-	<combo_box label="Habits" name="clothing_type_combo">
+	<combo_box label="Habits" name="clothing_type_combo" left="126" >
 		<combo_item name="Image">
 			Image
 		</combo_item>
@@ -38,7 +38,7 @@
 			Jupe
 		</combo_item>
 		<combo_item name="SculptedPrim">
-			Prim sculpté
+			Sculptie
 		</combo_item>
 	</combo_box>
 	<text name="bad_image_text">
@@ -46,7 +46,7 @@
 
 Sauvegardez en Targa 24 bit (.tga).
 	</text>
-	<check_box label="Utiliser une compression sans perte" name="lossless_check" />
-	<button label="Annuler" name="cancel_btn" />
-	<button label="Charger ([AMOUNT] $L)" name="ok_btn" />
+	<check_box label="Utiliser une compression sans perte" name="lossless_check"/>
+	<button label="Annuler" name="cancel_btn"/>
+	<button label="Charger ([AMOUNT] L$)" name="ok_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory.xml b/indra/newview/skins/default/xui/fr/floater_inventory.xml
index eb692db491..4a552bd286 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory.xml
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Inventory" title="Inventaire">
-	<search_editor label="Saisissez votre recherche ici" name="inventory search editor" />
+	<search_editor label="Saisissez votre recherche ici" name="inventory search editor"/>
 	<tab_container name="inventory filter tabs">
-		<inventory_panel label="Tous les objets" name="All Items" />
-		<inventory_panel label="Objets récents" name="Recent Items" />
+		<inventory_panel label="Tous les objets" name="All Items"/>
+		<inventory_panel label="Objets récents" name="Recent Items"/>
 	</tab_container>
 	<menu_bar name="Inventory Menu">
 		<menu label="Fichier" name="File">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-			<menu_item_call label="Ouvrir" name="Open" />
-			<menu_item_call label="Nouvelle fenêtre" name="New Window" />
-			<menu_item_call label="Afficher les filtres" name="Show Filters" />
-			<menu_item_call label="Réinitialiser les filtres" name="Reset Current" />
-			<menu_item_call label="Fermer tous les dossiers" name="Close All Folders" />
-			<menu_item_call label="Vider la corbeille" name="Empty Trash" />
+			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+			<menu_item_call label="Ouvrir" name="Open"/>
+			<menu_item_call label="Nouvelle fenêtre" name="New Window"/>
+			<menu_item_call label="Afficher les filtres" name="Show Filters"/>
+			<menu_item_call label="Réinitialiser les filtres" name="Reset Current"/>
+			<menu_item_call label="Fermer tous les dossiers" name="Close All Folders"/>
+			<menu_item_call label="Vider la corbeille" name="Empty Trash"/>
 		</menu>
 		<menu label="Créer" name="Create">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-			<menu_item_call label="Nouveau dossier" name="New Folder" />
-			<menu_item_call label="Nouveau script" name="New Script" />
-			<menu_item_call label="Nouvelle note" name="New Note" />
-			<menu_item_call label="Nouveau geste" name="New Gesture" />
+			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+			<menu_item_call label="Nouveau dossier" name="New Folder"/>
+			<menu_item_call label="Nouveau script" name="New Script"/>
+			<menu_item_call label="Nouvelle note" name="New Note"/>
+			<menu_item_call label="Nouveau geste" name="New Gesture"/>
 			<menu name="New Clothes">
-				<menu_item_call label="Nouvelle jupe" name="New Shirt" />
-				<menu_item_call label="Nouveau pantalon" name="New Pants" />
-				<menu_item_call label="Nouvelles chaussures" name="New Shoes" />
-				<menu_item_call label="Nouvelles chaussettes" name="New Socks" />
-				<menu_item_call label="Nouvelle veste" name="New Jacket" />
-				<menu_item_call label="Nouvelle jupe" name="New Skirt" />
-				<menu_item_call label="Nouveaux gants" name="New Gloves" />
-				<menu_item_call label="Nouveau tricot de peau" name="New Undershirt" />
-				<menu_item_call label="Nouveaux sous-vêtements" name="New Underpants" />
+				<menu_item_call label="Nouvelle chemise" name="New Shirt"/>
+				<menu_item_call label="Nouveau pantalon" name="New Pants"/>
+				<menu_item_call label="Nouvelles chaussures" name="New Shoes"/>
+				<menu_item_call label="Nouvelles chaussettes" name="New Socks"/>
+				<menu_item_call label="Nouvelle veste" name="New Jacket"/>
+				<menu_item_call label="Nouvelle jupe" name="New Skirt"/>
+				<menu_item_call label="Nouveaux gants" name="New Gloves"/>
+				<menu_item_call label="Nouveau tricot de peau" name="New Undershirt"/>
+				<menu_item_call label="Nouveaux sous-vêtements" name="New Underpants"/>
 			</menu>
 			<menu name="New Body Parts">
-				<menu_item_call label="Nouvelle silhouette" name="New Shape" />
-				<menu_item_call label="Nouvelle peau" name="New Skin" />
-				<menu_item_call label="Nouveaux cheveux" name="New Hair" />
-				<menu_item_call label="Nouveaux yeux" name="New Eyes" />
+				<menu_item_call label="Nouvelle silhouette" name="New Shape"/>
+				<menu_item_call label="Nouvelle peau" name="New Skin"/>
+				<menu_item_call label="Nouveaux cheveux" name="New Hair"/>
+				<menu_item_call label="Nouveaux yeux" name="New Eyes"/>
 			</menu>
 		</menu>
 		<menu label="Trier" name="Sort">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-			<menu_item_check label="Par nom" name="By Name" />
-			<menu_item_check label="Par date" name="By Date" />
-			<menu_item_check label="Dossiers toujours par nom" name="Folders Always By Name" />
-			<menu_item_check label="Dossiers système au dessus" name="System Folders To Top" />
+			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+			<menu_item_check label="Par nom" name="By Name"/>
+			<menu_item_check label="Par date" name="By Date"/>
+			<menu_item_check label="Trier les dossiers par nom" name="Folders Always By Name"/>
+			<menu_item_check label="Dossiers système en premier" name="System Folders To Top"/>
 		</menu>
 		<menu label="Filters" name="Filters">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-			<menu_item_check label="Modifier actuel" name="Modify Current" />
-			<menu_item_call label="Réinitialiser actuel" name="Reset Current" />
+			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+			<menu_item_check label="Modifier actuel" name="Modify Current"/>
+			<menu_item_call label="Réinitialiser actuel" name="Reset Current"/>
 		</menu>
 	</menu_bar>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
index a23a589e1f..823546e5df 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="item properties"
-     title="Propriétés de l&apos;objet de l&apos;inventaire">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="item properties" title="Propriétés de l&apos;objet de l&apos;inventaire">
 	<text name="LabelItemNameTitle">
 		Nom :
 	</text>
@@ -13,14 +12,14 @@
 	<text name="LabelCreatorName">
 		Nicole Linden
 	</text>
-	<button label="Profil..." label_selected="" name="BtnCreator" />
+	<button label="Profil..." label_selected="" name="BtnCreator"/>
 	<text name="LabelOwnerTitle">
 		Propriétaire :
 	</text>
 	<text name="LabelOwnerName">
 		Thrax Linden
 	</text>
-	<button label="Profil..." label_selected="" name="BtnOwner" />
+	<button label="Profil..." label_selected="" name="BtnOwner"/>
 	<text name="LabelAcquiredTitle">
 		Acquis :
 	</text>
@@ -30,9 +29,9 @@
 	<text name="OwnerLabel">
 		Vous pouvez :
 	</text>
-	<check_box label="Modifier" name="CheckOwnerModify" />
-	<check_box label="Copier" name="CheckOwnerCopy" />
-	<check_box label="Revendre/Donner" name="CheckOwnerTransfer" />
+	<check_box label="Modifier" name="CheckOwnerModify"/>
+	<check_box label="Copier" name="CheckOwnerCopy"/>
+	<check_box label="Revendre/Donner" name="CheckOwnerTransfer"/>
 	<text name="BaseMaskDebug">
 		B :
 	</text>
@@ -48,18 +47,18 @@
 	<text name="NextMaskDebug">
 		N :
 	</text>
-	<check_box label="Partager avec le groupe" name="CheckShareWithGroup" />
-	<check_box label="Autoriser tout le monde à copier" name="CheckEveryoneCopy" />
-	<text name="NextOwnerLabel">
+	<check_box label="Partager avec le groupe" name="CheckShareWithGroup"/>
+	<check_box label="Autoriser tout le monde à copier" name="CheckEveryoneCopy"/>
+	<text name="NextOwnerLabel" width="192">
 		Le prochain propriétaire pourra :
 	</text>
-	<check_box label="Modifier" name="CheckNextOwnerModify" />
-	<check_box label="Copier" name="CheckNextOwnerCopy" />
-	<check_box label="Revendre/Donner" name="CheckNextOwnerTransfer" />
+	<check_box label="Modifier" name="CheckNextOwnerModify"/>
+	<check_box label="Copier" name="CheckNextOwnerCopy"/>
+	<check_box label="Revendre/Donner" name="CheckNextOwnerTransfer"/>
 	<text name="SaleLabel">
 		Marquer l&apos;objet :
 	</text>
-	<check_box label="À vendre" name="CheckPurchase" />
+	<check_box label="À vendre" name="CheckPurchase"/>
 	<radio_group name="RadioSaleType">
 		<radio_item name="radio">
 			Original
@@ -69,7 +68,7 @@
 		</radio_item>
 	</radio_group>
 	<text name="TextPrice">
-		Prix :  $L
+		Prix :  L$
 	</text>
 	<string name="unknown">
 		(inconnu)
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
index 2207d50387..99bc0a2410 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Inventory Finder" title="inventory_recent_items">
-	<check_box label="Animation" name="check_animation" />
-	<check_box label="Cartes de visite" name="check_calling_card" />
-	<check_box label="Habits" name="check_clothing" />
-	<check_box label="Gestes" name="check_gesture" />
-	<check_box label="Repères" name="check_landmark" />
-	<check_box label="Notes" name="check_notecard" />
-	<check_box label="Objets" name="check_object" />
-	<check_box label="Scripts" name="check_script" />
-	<check_box label="Sons" name="check_sound" />
-	<check_box label="Textures" name="check_texture" />
-	<check_box label="Photos" name="check_snapshot" />
-	<button label="Tout" label_selected="Tout" name="All" />
-	<button label="Aucun" label_selected="Aucun" name="None" />
-	<check_box label="Toujours montrer les dossiers" name="check_show_empty" />
-	<check_box label="Depuis la déconnexion" name="check_since_logoff" />
-	<text type="string" length="1" name="- OR -">
+	<check_box label="Animations" name="check_animation"/>
+	<check_box label="Cartes de visite" name="check_calling_card"/>
+	<check_box label="Habits" name="check_clothing"/>
+	<check_box label="Gestes" name="check_gesture"/>
+	<check_box label="Repères" name="check_landmark"/>
+	<check_box label="Notes" name="check_notecard"/>
+	<check_box label="Objets" name="check_object"/>
+	<check_box label="Scripts" name="check_script"/>
+	<check_box label="Sons" name="check_sound"/>
+	<check_box label="Textures" name="check_texture"/>
+	<check_box label="Photos" name="check_snapshot"/>
+	<button label="Tout" label_selected="Tout" name="All" width="70"/>
+	<button label="Aucun" label_selected="Aucun" name="None" width="70" bottom="-260" left="83"/>
+	<check_box label="Toujours montrer &#10;les dossiers" name="check_show_empty" bottom="-284"/>
+	<check_box label="Depuis la déconnexion" name="check_since_logoff" bottom="-318"/>
+	<text length="1" name="- OR -" type="string">
 		Ou il y a...
 	</text>
-	<spinner label="Heures" name="spin_hours_ago" />
-	<spinner label="Jours" name="spin_days_ago" />
-	<button label="Fermer" label_selected="Fermer" name="Close" />
+	<spinner label="Heures" name="spin_hours_ago"/>
+	<spinner label="Jours" name="spin_days_ago"/>
+	<button label="Fermer" label_selected="Fermer" name="Close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_joystick.xml b/indra/newview/skins/default/xui/fr/floater_joystick.xml
index fcb93ae2b3..5b95a60e05 100644
--- a/indra/newview/skins/default/xui/fr/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/fr/floater_joystick.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Joystick" title="Configuration du joystick">
 	<check_box name="enable_joystick">
-		Activer le joystick :
+		Activer :
 	</check_box>
 	<spinner label="Mapping axe des X " name="JoystickAxis1" />
 	<spinner label="Mapping axe des Y" name="JoystickAxis2" />
@@ -78,6 +78,6 @@
 		Axe [NUM]
 	</string>
 	<string name="NoDevice">
-		aucun dispositif détecté
+		aucun joystick détecté
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_lagmeter.xml b/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
index d6837c3291..da51b1b426 100644
--- a/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_lagmeter" title="Calcul du lag">
-	<button name="client_lagmeter" tool_tip="Statut du lag client" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_lagmeter" title="Mesure du lag">
+	<button name="client_lagmeter" tool_tip="Statut du lag client"/>
 	<text name="client">
 		Client :
 	</text>
 	<text name="client_text">
 		Normal
 	</text>
-	<button name="network_lagmeter" tool_tip="Statut du lag réseau" />
+	<button name="network_lagmeter" tool_tip="Statut du lag réseau"/>
 	<text name="network">
 		Réseau :
 	</text>
 	<text name="network_text">
 		Normal
 	</text>
-	<button name="server_lagmeter" tool_tip="Statut du lag serveur" />
+	<button name="server_lagmeter" tool_tip="Statut du lag serveur"/>
 	<text name="server">
 		Serveur :
 	</text>
 	<text name="server_text">
 		Normal
 	</text>
-	<button label="?" name="server_help" />
-	<button label="&gt;&gt;" name="minimize" />
+	<button label="?" name="server_help"/>
+	<button label="&gt;&gt;" name="minimize"/>
 	<string name="max_title_msg">
-		Calcul du lag
+		Mesure du lag
 	</string>
 	<string name="max_width_px">
 		360
@@ -57,7 +57,7 @@
 		Normal
 	</string>
 	<string name="client_draw_distance_cause_msg">
-		Cause possible : la distance d&apos;affichage est trop élevée
+		Cause possible : la limite d&apos;affichage est trop élevée
 	</string>
 	<string name="client_texture_loading_cause_msg">
 		Cause possible : images en cours de chargement
diff --git a/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml b/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
index 45810513f6..ea39098a41 100644
--- a/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="script ed float" title="Wiki LSL">
 	<check_box label="Suivre le curseur" name="lock_check" />
-	<combo_box label="Verrouiller" name="history_combo" />
-	<button label="Précédente" name="back_btn" />
+	<combo_box label="Verrouiller" name="history_combo" left_delta="120" width="70"/>
+	<button label="Précédente" name="back_btn" left_delta="75"/>
 	<button label="Suivante" name="fwd_btn" />
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_media_browser.xml b/indra/newview/skins/default/xui/fr/floater_media_browser.xml
index 6d6d4fcbce..f27ba60c7a 100644
--- a/indra/newview/skins/default/xui/fr/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/fr/floater_media_browser.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_about" title="Navigateur média">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_about" title="Navigateur">
 	<layout_stack name="stack1">
 		<layout_panel name="nav_controls">
-			<button label="Précédente" name="back" width="75" />
-			<button label="Suivante" name="forward"  width="70" left_delta="75" />
-			<button label="Recharger" name="reload" left_delta="75" />
-			<combo_box left_delta="75" name="address" width="250" />
-			<button label="Aller" name="go" left_delta="255"/>
+			<button label="Précédente" name="back" width="75"/>
+			<button label="Suivante" left_delta="75" name="forward" width="70"/>
+			<button label="Rafraîchir" left_delta="75" name="reload"/>
+			<combo_box left_delta="75" name="address" width="250"/>
+			<button label="OK" left_delta="255" name="go"/>
 		</layout_panel>
 		<layout_panel name="parcel_owner_controls">
-			<button label="Envoyer URL actuelle sur parcelle" name="assign" />
+			<button label="Envoyer l&apos;URL sur la parcelle" name="assign"/>
 		</layout_panel>
 		<layout_panel name="external_controls">
-			<button label="Ouvrir dans mon navigateur web" name="open_browser" width="190" />
-			<check_box label="Toujours ouvrir dans mon navigateur web" name="open_always" left_delta="195"/>
-			<button label="Fermer" name="close" />
+			<button label="Ouvrir dans mon navigateur web" name="open_browser" width="196"/>
+			<check_box label="Toujours ouvrir dans mon navigateur web" left_delta="201" name="open_always"/>
+			<button label="Fermer" name="close"/>
 		</layout_panel>
 	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_moveview.xml b/indra/newview/skins/default/xui/fr/floater_moveview.xml
index 002dcce514..7da1b46680 100644
--- a/indra/newview/skins/default/xui/fr/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_moveview.xml
@@ -1,15 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="move floater" title="">
-	<button label="" label_selected="" name="turn left btn" tool_tip="Tourner à gauche" />
-	<button label="" label_selected="" name="turn right btn" tool_tip="Tourner à droite" />
-	<button label="" label_selected="" name="move up btn"
-	     tool_tip="Sauter ou voler vers le haut" />
-	<button label="" label_selected="" name="move down btn"
-	     tool_tip="S&apos;accroupir ou voler vers le bas" />
-	<button label="Voler" label_selected="Voler" name="fly btn"
-	     tool_tip="Démarrer/arrêter vol" />
-	<joystick_slide name="slide left btn" tool_tip="Se déplacer vers la gauche" />
-	<joystick_slide name="slide right btn" tool_tip="Se déplacer vers la droite" />
-	<joystick_turn name="forward btn" tool_tip="Se déplacer vers l&apos;avant" />
-	<joystick_turn name="backward btn" tool_tip="Se déplacer vers l&apos;arrière" />
+	<button label="" label_selected="" name="turn left btn" tool_tip="Tourner à gauche"/>
+	<button label="" label_selected="" name="turn right btn" tool_tip="Tourner à droite"/>
+	<button label="" label_selected="" name="move up btn" tool_tip="Sauter ou voler vers le haut"/>
+	<button label="" label_selected="" name="move down btn" tool_tip="S&apos;accroupir ou voler vers le bas"/>
+	<button label="Voler" label_selected="Voler" name="fly btn" tool_tip="Démarrer/arrêter le vol"/>
+	<joystick_slide name="slide left btn" tool_tip="Se déplacer vers la gauche"/>
+	<joystick_slide name="slide right btn" tool_tip="Se déplacer vers la droite"/>
+	<joystick_turn name="forward btn" tool_tip="Se déplacer vers l&apos;avant"/>
+	<joystick_turn name="backward btn" tool_tip="Se déplacer vers l&apos;arrière"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_mute_object.xml b/indra/newview/skins/default/xui/fr/floater_mute_object.xml
index 0ce234a40c..61f40e8010 100644
--- a/indra/newview/skins/default/xui/fr/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/fr/floater_mute_object.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="mute by name" title="Ignorer les objets par nom">
 	<text name="message">
-		Ignorer par nom ne marche que pour les chats et IM, pas les sons.
-Vous devez saisir le nom exact de l&apos;objet.
+		Cette fonction ne marche que pour les chats et les IM,
+pas les sons. Saisissez le nom exact de l&apos;objet.
 	</text>
 	<line_editor name="object_name">
 		Nom de l&apos;objet
 	</line_editor>
-	<button label="OK" name="OK" />
-	<button label="Annuler" name="Cancel" />
+	<button label="OK" name="OK"/>
+	<button label="Annuler" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_openobject.xml b/indra/newview/skins/default/xui/fr/floater_openobject.xml
index 0e598660e2..5d8f0bed46 100644
--- a/indra/newview/skins/default/xui/fr/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/fr/floater_openobject.xml
@@ -3,9 +3,6 @@
 	<text type="string" length="1" name="object_name">
 		[DESC]:
 	</text>
-	<button label="Copier vers l&apos;inventaire"
-	     label_selected="Copier vers l&apos;inventaire"
-	     name="copy_to_inventory_button" />
-	<button label="Copier et porter" label_selected="Copier et porter"
-	     name="copy_and_wear_button" />
+	<button label="Copier vers l&apos;inventaire" label_selected="Copier vers l&apos;inventaire" name="copy_to_inventory_button" width="132" />
+	<button label="Copier et porter" label_selected="Copier et porter" name="copy_and_wear_button" left="152"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_pay.xml b/indra/newview/skins/default/xui/fr/floater_pay.xml
index 70146eb7de..a0db92af85 100644
--- a/indra/newview/skins/default/xui/fr/floater_pay.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pay.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="">
-	<button label="1 $L" label_selected="1 $L" name="fastpay 1" />
-	<button label="5 $L" label_selected="5 $L" name="fastpay 5" />
-	<button label="10 $L" label_selected="10 $L" name="fastpay 10" />
-	<button label="20 $L" label_selected="20 $L" name="fastpay 20" />
-	<button label="Payer" label_selected="Payer" name="pay btn" />
-	<button label="Annuler" label_selected="Annuler" name="cancel btn" />
-	<text type="string" length="1" name="payee_label">
+	<button label="1 L$" label_selected="1 L$" name="fastpay 1"/>
+	<button label="5 L$" label_selected="5 L$" name="fastpay 5"/>
+	<button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
+	<button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
+	<button label="Payer" label_selected="Payer" name="pay btn"/>
+	<button label="Annuler" label_selected="Annuler" name="cancel btn"/>
+	<text length="1" name="payee_label" type="string" left="5">
 		Payer :
 	</text>
-	<text type="string" length="1" name="payee_name">
+	<text length="1" name="payee_name" type="string">
 		[FIRST] [LAST]
 	</text>
-	<text type="string" length="1" name="fastpay text">
+	<text length="1" name="fastpay text" type="string">
 		Paiement rapide :
 	</text>
-	<text type="string" length="1" name="amount text" left="4">
+	<text left="4" length="1" name="amount text" type="string">
 		Montant :
 	</text>
-	<line_editor left="60" name="amount" width="55" />
+	<line_editor left="60" name="amount" width="55"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_pay_object.xml b/indra/newview/skins/default/xui/fr/floater_pay_object.xml
index 13675f7586..53599554fb 100644
--- a/indra/newview/skins/default/xui/fr/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pay_object.xml
@@ -1,30 +1,31 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="">
-	<text type="string" length="1" name="payee_group">
+	<text length="1" name="payee_group" type="string" width="95">
 		Payer le groupe :
 	</text>
-	<text type="string" length="1" name="payee_resident">
+	<text length="1" name="payee_resident" type="string" width="100" halign="left" >
 		Payer le résident :
 	</text>
-	<text type="string" length="1" name="payee_name">
+	<text length="1" name="payee_name" type="string" left="105">
 		[FIRST] [LAST]
 	</text>
-	<text type="string" length="1" name="object_name_label">
+	<text length="1" name="object_name_label" type="string" left="25">
 		Via un objet :
 	</text>
-	<text type="string" length="1" name="object_name_text">
+	<text length="1" name="object_name_text" type="string" left="105">
 		...
 	</text>
-	<text type="string" length="1" name="fastpay text">
+	<text length="1" name="fastpay text" type="string" width="95">
 		Paiement rapide :
 	</text>
-	<text type="string" length="1" name="amount text">
+	<text length="1" name="amount text" type="string" left="5" halign="left">
 		Montant :
 	</text>
-	<button label="1 $L" label_selected="1 $L" name="fastpay 1" />
-	<button label="5 $L" label_selected="5 $L" name="fastpay 5" />
-	<button label="10 $L" label_selected="10 $L" name="fastpay 10" />
-	<button label="20 $L" label_selected="20 $L" name="fastpay 20" />
-	<button label="Payer" label_selected="Payer" name="pay btn" />
-	<button label="Annuler" label_selected="Annuler" name="cancel btn" />
+	<button label="1 L$" label_selected="1 L$" name="fastpay 1" left="105" />
+	<button label="5 L$" label_selected="5 L$" name="fastpay 5" left="190"/>
+	<button label="10 L$" label_selected="10 L$" name="fastpay 10" left="105" />
+	<button label="20 L$" label_selected="20 L$" name="fastpay 20" left="190"/>
+	<button label="Payer" label_selected="Payer" name="pay btn"/>
+	<button label="Annuler" label_selected="Annuler" name="cancel btn"/>
+	<line_editor left="65" name="amount" width="50" />
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preferences.xml b/indra/newview/skins/default/xui/fr/floater_preferences.xml
index 45e7623a5c..cb1e245ee4 100644
--- a/indra/newview/skins/default/xui/fr/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preferences.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Preferences" title="Préférences">
+<floater name="Preferences" title="Préférences" min_width="330" width="626">
 	<button label="À propos" label_selected="À propos" name="About..." />
 	<button label="OK" label_selected="OK" name="OK" />
 	<button label="Annuler" label_selected="Annuler" name="Cancel" />
 	<button label="Appliquer" label_selected="Appliquer" name="Apply" />
 	<button label="Aide" label_selected="Aide" name="Help" />
+	<tab_container name="pref core" tab_width="126" width="626" />
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
index 751ffa60b1..bdb1e9eda5 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
@@ -4,7 +4,7 @@
 		Description :
 	</text>
 	<button label="Jouer dans le Monde" label_selected="Stop" name="Anim play btn"
-	     tool_tip="Jouer cette animation et partagez-la avec d&apos;autres." width="125" left="20"/>
+	     tool_tip="Jouer cette animation et partagez-la avec d&apos;autres." width="131" left="20"/>
 	<button label="Jouer localement" label_selected="Stop" name="Anim audition btn"
-	     tool_tip="Jouer cette animation et soyez le seul à la voir." width="125" left="160"/>
+	     tool_tip="Jouer cette animation et soyez le seul à la voir." width="125" left="162"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
index e8441ea6b9..3f7d0973b9 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
@@ -33,12 +33,14 @@
 	<text name="steps_label">
 		Étapes :
 	</text>
+	<!-- Revert translations as interim fix to VWR-9985 while the code is not properly internationalized
 	<scroll_list name="library_list">
 		Animation
 Son
 Chat
 Attendre
 	</scroll_list>
+	-->
 	<button label="Ajouter &gt;&gt;" name="add_btn" />
 	<button label="Monter" name="up_btn" />
 	<button label="Descendre" name="down_btn" />
@@ -60,6 +62,6 @@ ajoutez des pauses.
 	<check_box label="temps en secondes" name="wait_time_check" />
 	<check_box label="Actifs" name="active_check"
 	     tool_tip="Les gestes actifs peuvent être déclenchés en saisissant leur raccourci dans le chat ou en appuyant sur les raccourcis. Les gestes deviennent généralement inactifs lorsqu&apos;il y a un conflit entre les raccourcis." />
-	<button label="Prévisualiser" name="preview_btn" />
-	<button label="Enregistrer" name="save_btn" />
+	<button label="Prévisualiser" name="preview_btn" width="86" />
+	<button label="Enregistrer" name="save_btn" width="86" left_delta="96"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
index 9bc587a990..0de77b30cb 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
@@ -5,7 +5,7 @@
 		Description :
 	</text>
 	<text_editor type="string" length="1" name="Notecard Editor">
-		Chargement en cours...
+		Chargement...
 	</text_editor>
 	<string name="no_object">
 		Impossible de trouver l&apos;objet contenant cette note.
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_sound.xml b/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
index 8dc63ae5df..030ef7951e 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
@@ -5,7 +5,7 @@
 	</text>
 	<button label="Jouer dans le Monde" label_selected="Jouer dans le Monde"
 	     name="Sound play btn"
-	     tool_tip="Jouer ce son et partagez-le avec d&apos;autres." width="125" left_delta="-136"/>
+	     tool_tip="Jouer ce son et partagez-le avec d&apos;autres." width="131" left_delta="-142"/>
 	<button label="Jouer localement" label_selected="Jouer localement"
 	     name="Sound audition btn"
 	     tool_tip="Jouer ce son et soyez le seul à l&apos;entendre." width="125" left="162"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_region_info.xml b/indra/newview/skins/default/xui/fr/floater_region_info.xml
index 631d37ab65..be36b41f27 100644
--- a/indra/newview/skins/default/xui/fr/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/fr/floater_region_info.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="regioninfo" title="Région/Domaine" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="regioninfo" title="Région et domaine"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
index 7b90653c6c..1fbc727009 100644
--- a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_report_abuse" title="Signaler une infraction">
+	<texture_picker label="" name="screenshot"/>
+	<check_box label="Inclure une capture d&apos;écran" name="screen_check"/>
 	<text name="reporter_title" width="60">
 		Déposant :
 	</text>
@@ -15,19 +17,26 @@
 	<text name="pos_title">
 		Position :
 	</text>
-	<texture_picker name="screenshot" />
-	<check_box label="Inclure une capture d&apos;écran" name="screen_check" />
 	<text name="pos_field">
 		{128.1, 128.1, 15.4}
 	</text>
+	<text name="select_object_label">
+		Cliquez sur le bouton puis l&apos;objet :
+	</text>
+	<button label="" label_selected="" name="pick_btn" tool_tip="Le sélecteur d&apos;objet vous permet d&apos;identifier un objet comme sujet du rapport."/>
+	<text name="object_name_label">
+		Nom :
+	</text>
 	<text left_delta="70" name="object_name" width="105">
 		Consetetur Sadipscing
 	</text>
+	<text name="owner_name_label" width="66">
+		Propriétaire :
+	</text>
 	<text left_delta="70" name="owner_name" width="105">
 		Hendrerit Vulputate
 	</text>
-	<combo_box name="category_combo"
-	     tool_tip="Choisissez la catégorie qui décrit le mieux ce rapport">
+	<combo_box name="category_combo" tool_tip="Choisissez la catégorie qui décrit le mieux ce rapport">
 		<combo_item name="Select_category">
 			Sélectionnez une catégorie
 		</combo_item>
@@ -49,14 +58,11 @@
 		<combo_item name="Assault__Weapons_testing_sandbox">
 			Assaut &gt; Bac à sable pour tests d&apos;armes à feu
 		</combo_item>
-		<combo_item name="Copyright_or_intellectual_property_violation">
-			Violation de droits d&apos;auteur ou de propriété intellectuelle
-		</combo_item>
 		<combo_item name="Commerce__Failure_to_deliver_product_or_service">
 			Commerce &gt; Incapacité à fournir un produit ou service
 		</combo_item>
-		<combo_item name="Disclosure__First_Life_information">
-			Divulgation &gt; Informations sur la première vie (First Life)
+		<combo_item name="Disclosure__Real_world_information">
+			Divulgation &gt; Informations sur la vie réelle
 		</combo_item>
 		<combo_item name="Disclosure__Remotely_monitoring chat">
 			Divulgation &gt; Écoute d&apos;un chat à distance
@@ -80,7 +86,7 @@
 			Trouble de la paix &gt; Spam à caractère commercial
 		</combo_item>
 		<combo_item name="Fraud__L$">
-			Fraude &gt; $L
+			Fraude &gt; L$
 		</combo_item>
 		<combo_item name="Fraud__Land">
 			Fraude &gt; Terrain
@@ -89,7 +95,7 @@
 			Fraude &gt; Vente pyramidale ou lettre-chaîne
 		</combo_item>
 		<combo_item name="Fraud__US$">
-			Fraude &gt; $US
+			Fraude &gt; US$
 		</combo_item>
 		<combo_item name="Harassment__Advert_farms___visual_spam">
 			Harcèlement &gt; Spam visuel
@@ -119,10 +125,16 @@
 			Indécence &gt; Nom d&apos;avatar inapproprié
 		</combo_item>
 		<combo_item name="Indecency__Mature_content_in_PG_region">
-			Indécence &gt; Contenu Adulte dans une région où l&apos;accompagnement parental est requis
+			Indécence &gt; Contenu Adultes dans une région Tout public
+		</combo_item>
+		<combo_item name="Intellectual_property_infringement_Content_Removal">
+			Violation de droits de propriété intellectuelle &gt; Suppression de contenu
+		</combo_item>
+		<combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
+			Violation de droits de propriété intellectuelle &gt; CopyBot ou exploitation abusive des permissions
 		</combo_item>
 		<combo_item name="Intolerance">
-			Intolerance
+			Intolérance
 		</combo_item>
 		<combo_item name="Land__Abuse_of_sandbox_resources">
 			Terrain &gt; Utilisation abusive des ressources du bac à sable
@@ -136,9 +148,6 @@
 		<combo_item name="Land__Encroachment__Trees_plants">
 			Terrain &gt; Empiètement &gt; Arbres/plantes
 		</combo_item>
-		<combo_item name="Trademark_violation">
-			Violation des droits de marque
-		</combo_item>
 		<combo_item name="Wagering_gambling">
 			Paris/jeux d&apos;argent
 		</combo_item>
@@ -146,26 +155,13 @@
 			Autre
 		</combo_item>
 	</combo_box>
-	<button label="" label_selected="" name="pick_btn"
-	     tool_tip="Le sélecteur d&apos;objet vous permet d&apos;identifier un objet comme sujet du rapport." />
-	<text name="select_object_label">
-		Cliquez sur le bouton puis l&apos;objet :
-	</text>
-	<text name="object_name_label">
-		Nom :
-	</text>
-	<text name="owner_name_label" width="66">
-		Propriétaire :
-	</text>
 	<text name="abuser_name_title">
 		Nom du contrevenant :
 	</text>
-	<button label="Choisir le résident" label_selected="" name="select_abuser"
-	     tool_tip="Sélectionnez le nom du résident dans une liste" />
-	<check_box label="Ne connaît pas le nom du contrevenant" name="omit_abuser_name"
-	     tool_tip="Cochez cette case si vous ne connaissez pas le nom du contrevenant" />
+	<button label="Choisir le résident" label_selected="" name="select_abuser" tool_tip="Sélectionnez le nom du résident dans une liste"/>
+	<check_box label="Ne connaît pas le nom du contrevenant" name="omit_abuser_name" tool_tip="Cochez cette case si vous ne connaissez pas le nom du contrevenant"/>
 	<text name="abuser_name_title2">
-		Lieu où l&apos;infraction a eu lieu :
+		Indiquez où l&apos;infraction a eu lieu :
 	</text>
 	<text name="sum_title">
 		Récapitulatif :
@@ -176,13 +172,12 @@
 	<text name="bug_aviso">
 		Indiquez la date, le lieu, la nature de l&apos;infraction, ainsi que
 tout chat ou IM relatif à l&apos;infraction, en étant aussi précis
-que possible. Essayez aussi d&apos;indiquer un sujet.
+que possible. Pensez à indiquer un objet.
 	</text>
 	<text bottom_delta="-16" name="incomplete_title">
 		Remarque : les rapports incomplets ne feront pas l&apos;objet d&apos;une
 enquête.
 	</text>
-	<button label="Signaler une infraction" label_selected="Signaler une infraction"
-	     name="send_btn" />
-	<button label="Annuler" label_selected="Annuler" name="cancel_btn" />
+	<button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
+	<button label="Signaler une infraction" label_selected="Signaler une infraction" name="send_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_sell_land.xml b/indra/newview/skins/default/xui/fr/floater_sell_land.xml
index e3256c89a2..f14a5e4ea6 100644
--- a/indra/newview/skins/default/xui/fr/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_sell_land.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="sell land" title="Vendre terrain">
-	<text name="info_parcel_label">
+	<text name="info_parcel_label" width="48">
 		Parcelle :
 	</text>
-	<text name="info_parcel">
-		Nom de la parcelle
+	<text name="info_parcel" left="66">
+		PARCEL NAME
 	</text>
 	<text name="info_size_label">
 		Taille :
 	</text>
-	<text name="info_size">
+	<text name="info_size"  left="66">
 		[AREA] m²
 	</text>
-	<text name="info_action">
-		Pour vendre cette parcelle :
+	<text name="info_action" bottom_delta="-60">
+		Pour vendre cette
+parcelle :
 	</text>
+	<icon bottom_delta="-86" name="step_price" />
 	<text name="price_label">
 		Votre prix de vente :
 	</text>
@@ -22,18 +24,19 @@
 		Fixez un prix convenable pour ce terrain.
 	</text>
 	<text name="price_ld">
-		$L
+		L$
 	</text>
 	<text name="price_per_m">
-		([PER_METER] $L par mètre carré)
+		([PER_METER] L$ par mètre carré)
 	</text>
 	<text name="sell_to_label">
 		Vos acheteurs :
 	</text>
 	<text name="sell_to_text">
-		Vendez votre terrain à n&apos;importe qui ou uniquement à un acheteur spécifique.
+		Vendez votre terrain à n&apos;importe qui ou uniquement à un acheteur
+spécifique.
 	</text>
-	<combo_box name="sell_to">
+	<combo_box name="sell_to" bottom_delta="-32">
 		<combo_item name="--selectone--">
 			-- Sélectionnez --
 		</combo_item>
@@ -44,14 +47,15 @@
 			Acheteur spécifique :
 		</combo_item>
 	</combo_box>
-	<button label="Sélectionner..." name="sell_to_select_agent" />
+	<button label="Sélectionner..." name="sell_to_select_agent" width="100"/>
 	<text name="sell_objects_label">
 		Vendez-vous des objets avec ce terrain ?
 	</text>
 	<text name="sell_objects_text">
-		Les objets transférables se trouvant sur la parcelle changeront de propriétaire.
+		Les objets transférables se trouvant sur la parcelle changeront
+de propriétaire.
 	</text>
-	<radio_group name="sell_objects">
+	<radio_group name="sell_objects" right="430" bottom_delta="-54">
 		<radio_item name="no">
 			Non, rester le propriétaire des objets
 		</radio_item>
@@ -59,10 +63,10 @@
 			Oui, vendre les objets avec le terrain
 		</radio_item>
 	</radio_group>
-	<button label="Afficher les objets" name="show_objects" />
-	<text name="nag_message_label">
-		Rappel : toute vente est définitive.
+	<button label="Afficher les objets" name="show_objects" right="420" width="120"/>
+	<text name="nag_message_label" bottom_delta="-30">
+		Rappel : Toute vente est définitive.
 	</text>
-	<button label="Mettre le terrain en vente" name="sell_btn" />
-	<button label="Annuler" name="cancel_btn" />
+	<button label="Mettre le terrain en vente" name="sell_btn" width="165"/>
+	<button label="Annuler" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
index f98046e97b..8d6249bf52 100644
--- a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
@@ -8,7 +8,7 @@
 			FALSE
 		</combo_item>
 	</combo_box>
-	<color_swatch label="Couleur" name="color_swatch" />
+	<color_swatch label="Couleur" name="color_swatch" width="43" />
 	<spinner label="x" name="val_spinner_1" />
 	<spinner label="x" name="val_spinner_2" />
 	<spinner label="x" name="val_spinner_3" />
diff --git a/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
index 8fee6dc03f..0fadd44fee 100644
--- a/indra/newview/skins/default/xui/fr/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater height="536" name="Snapshot" title="Prévisualiser la photo" width="245">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Snapshot" title="Prévisualiser la photo" width="247">
 	<text name="type_label">
 		Destination de la photo
 	</text>
@@ -8,14 +8,14 @@
 			Envoyer par e-mail
 		</radio_item>
 		<radio_item name="texture">
-			Enregistrer dans votre inventaire (10 $L)
+			Enregistrer dans votre inventaire (10 L$)
 		</radio_item>
 		<radio_item name="local">
 			Enregistrer sur votre disque dur
 		</radio_item>
 	</radio_group>
-	<button label="Plus &gt;&gt;" name="more_btn" tool_tip="Options avancées" />
-	<button label="&lt;&lt; Moins" name="less_btn" tool_tip="Options avancées" />
+	<button label="Plus &gt;&gt;" name="more_btn" tool_tip="Options avancées"/>
+	<button label="&lt;&lt; Moins" name="less_btn" tool_tip="Options avancées"/>
 	<text name="type_label2">
 		Taille
 	</text>
@@ -93,9 +93,9 @@
 			BMP
 		</combo_item>
 	</combo_box>
-	<spinner label="Largeur" label_width="41" name="snapshot_width" width="101" />
-	<spinner label="Hauteur" label_width="41" left="121" name="snapshot_height" width="101" />
-	<slider label="Qualité de l&apos;image" name="image_quality_slider" />
+	<spinner label="Largeur" label_width="41" name="snapshot_width" width="101"/>
+	<spinner label="Hauteur" label_width="41" left="121" name="snapshot_height" width="101"/>
+	<slider label="Qualité de l&apos;image" name="image_quality_slider"/>
 	<text name="layer_type_label">
 		Capturer :
 	</text>
@@ -113,20 +113,16 @@
 	<text name="file_size_label">
 		Taille du fichier : [SIZE] Ko
 	</text>
-	<check_box bottom_delta="-20" label="Voir l&apos;interface sur la photo" name="ui_check" />
-	<check_box bottom_delta="-18" label="Voir les éléments HUD sur la photo"
-	     name="hud_check" />
-	<check_box bottom_delta="-18" label="Garder ouvert après enregistrement"
-	     name="keep_open_check" />
-	<check_box label="Imposer les proportions" name="keep_aspect_check" />
-	<check_box bottom_delta="-18" label="Geler le cadre (prévisualisation &#10;plein écran)"
-	     name="freeze_frame_check" />
-	<button bottom_delta="-18" label="Rafraîchir" name="new_snapshot_btn" />
-	<check_box bottom_delta="-30" label="Auto-rafraîchir" name="auto_snapshot_check" />
-	<button label="Enregistrer (10 $L)" name="upload_btn" />
-	<button label="Envoyer" name="send_btn" />
-	<flyout_button label="Enregistrer" name="save_btn"
-	     tool_tip="Enregistrer l&apos;image dans un fichier">
+	<check_box label="Voir l&apos;interface sur la photo" name="ui_check"/>
+	<check_box label="Voir les éléments HUD sur la photo" name="hud_check"/>
+	<check_box label="Garder ouvert après enregistrement" name="keep_open_check"/>
+	<check_box label="Imposer les proportions" name="keep_aspect_check"/>
+	<check_box label="Prévisualisation plein écran (geler l&apos;écran)" name="freeze_frame_check"/>
+	<button label="Rafraîchir" name="new_snapshot_btn"/>
+	<check_box label="Rafraîchissement automatique" name="auto_snapshot_check"/>
+	<button label="Enregistrer (10 L$)" name="upload_btn" width="118"/>
+	<button label="Envoyer" name="send_btn" width="118"/>
+	<flyout_button label="Enregistrer" name="save_btn" tool_tip="Enregistrer l&apos;image dans un fichier" width="118">
 		<flyout_button_item name="save_item">
 			Enregistrer
 		</flyout_button_item>
@@ -134,7 +130,7 @@
 			Enregistrer sous...
 		</flyout_button_item>
 	</flyout_button>
-	<button label="Annuler" name="discard_btn" />
+	<button label="Annuler" name="discard_btn" left="133" width="72" />
 	<string name="unknown">
 		inconnu
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_sound_preview.xml b/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
index 9c9c63074a..22bf929754 100644
--- a/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Name/Description" title="sound.wav">
 	<text name="name_label">
 		Nom :
@@ -6,8 +6,8 @@
 	<text name="description_label">
 		Description :
 	</text>
-	<button label="Annuler" label_selected="Annuler" name="cancel_btn" />
-	<button label="Charger (10 $L)" label_selected="Charger (10 $L)" name="ok_btn" />
+	<button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
+	<button label="Charger (10 L$)" label_selected="Charger (10 L$)" name="ok_btn"/>
 	<text name="text">
 		Débit (kbps) :
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_telehub.xml b/indra/newview/skins/default/xui/fr/floater_telehub.xml
index 0cc19806ce..59d41fdaf3 100644
--- a/indra/newview/skins/default/xui/fr/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/fr/floater_telehub.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="telehub" title="Téléhub">
+<floater name="telehub" title="Téléhub" min_height="310" height="310" >
 	<text name="status_text_connected">
 		Téléhub connecté à l&apos;objet [OBJECT]
 	</text>
@@ -9,20 +9,23 @@
 	<text name="help_text_connected">
 		Pour supprimer, cliquez sur Déconnecter.
 	</text>
-	<text name="help_text_not_connected">
-		Sélectionner l&apos;objet et cliquez sur Connecter le téléhub.
+	<text name="help_text_not_connected" height="38" bottom_delta="-18">
+		Sélectionner l&apos;objet et cliquez sur Connecter
+le téléhub.
 	</text>
-	<button label="Connecter le téléhub" name="connect_btn" />
-	<button label="Déconnecter" name="disconnect_btn" />
-	<text name="spawn_points_text">
-		Points d&apos;apparition (positions, pas objets):
+	<button label="Connecter le téléhub" name="connect_btn" width="122"/>
+	<button label="Déconnecter" name="disconnect_btn" left="142" width="98"/>
+	<text name="spawn_points_text" width="230">
+		Points d&apos;apparition (positions, pas objets) :
 	</text>
 	<button label="Ajouter point" name="add_spawn_point_btn" />
 	<button label="Supprimer point" name="remove_spawn_point_btn" />
 	<text name="spawn_point_help">
-		Sélectionnez l&apos;objet et cliquez sur Ajouter pour indiquer la position.
-Vous pourrez ensuite déplacer ou supprimer l&apos;objet.
+		Sélectionnez l&apos;objet et cliquez sur Ajouter pour
+indiquer la position. Vous pourrez ensuite
+déplacer ou supprimer l&apos;objet.
 Les positions sont relatives au centre du téléhub.
-Sélectionnez l&apos;élément dans la liste pour afficher sa position dans le Monde.
+Sélectionnez l&apos;élément dans la liste pour afficher
+sa position dans le Monde.
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
index 115d0068f6..1a8e57e604 100644
--- a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="texture picker" title="Choisir : Texture">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="texture picker" title="Texture">
 	<string name="choose_picture">
 		Cliquez pour sélectionner une image
 	</string>
-	<text type="string" length="1" name="Multiple">
+	<text length="1" name="Multiple" type="string">
 		Multiple
 	</text>
-	<text type="string" length="1" name="unknown">
+	<text length="1" name="unknown" type="string">
 		Dimensions : [DIMENSIONS]
 	</text>
-	<button label="Défaut" label_selected="Défaut" name="Default" />
-	<button label="Aucune" label_selected="Aucune" name="None" />
-	<button label="Vierge" label_selected="Vierge" name="Blank" />
-	<check_box label="Afficher les dossiers" name="show_folders_check" />
-	<search_editor label="Saisissez votre recherche ici" name="inventory search editor" />
+	<button label="Défaut" label_selected="Défaut" name="Default" width="60" />
+	<button label="Aucune" label_selected="Aucune" name="None" width="60" left="68" />
+	<button label="Vierge" label_selected="Vierge" name="Blank" width="60" />
+	<check_box label="Afficher les dossiers" name="show_folders_check"/>
+	<search_editor label="Saisissez votre recherche ici" name="inventory search editor"/>
 	<check_box label="Appliquer immédiatement" name="apply_immediate_check" />
-	<button label="" label_selected="" name="Pipette" />
-	<button label="Annuler" label_selected="Annuler" name="Cancel" />
-	<button label="Sélectionner" label_selected="Sélectionner" name="Select" />
+	<button label="" label_selected="" name="Pipette" bottom="-240" />
+	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
+	<button label="Sélectionner" label_selected="Sélectionner" name="Select"/>
 	<string name="pick title">
 		Choisir :
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index 35d9d8a739..2914dab887 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -1,45 +1,46 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="toolbox floater" title="">
-	<button label="" label_selected="" name="button focus" tool_tip="Mise au point" />
+	<button label="" label_selected="" name="button focus" tool_tip="Mise au point"/>
 	<text name="tool label">
-		Faire le point
+		Mise au point
 	</text>
-	<button label="" label_selected="" name="button move" tool_tip="Déplacer" />
+	<button label="" label_selected="" name="button move" tool_tip="Déplacer"/>
 	<text name="tool label2">
 		Se déplacer
 	</text>
-	<button label="" label_selected="" name="button edit" tool_tip="Modifier" />
+	<button label="" label_selected="" name="button edit" tool_tip="Modifier"/>
 	<text name="tool label3">
 		Edition
 	</text>
-	<button label="" label_selected="" name="button create" tool_tip="Créer" />
+	<button label="" label_selected="" name="button create" tool_tip="Créer"/>
 	<text name="tool label4">
 		Créer
 	</text>
-	<button label="" label_selected="" name="button land" tool_tip="Terrain" />
+	<button label="" label_selected="" name="button land" tool_tip="Terrain"/>
 	<text name="tool label5">
 		Terrain
 	</text>
-	<check_box label="Zoom" name="radio zoom" />
-	<check_box label="Orbite (Ctrl)" name="radio orbit" />
-	<check_box label="Panoramique (Ctrl-Maj)" name="radio pan" />
-	<check_box label="Déplacer" name="radio move" />
-	<check_box label="Orbite (Ctrl)" name="radio lift" />
-	<check_box label="Faire tourner (Ctrl-Maj)" name="radio spin" />
-	<check_box label="Position" name="radio position" />
-	<check_box label="Faire pivoter (Ctrl)" name="radio rotate" />
-	<check_box label="Étirer (Ctrl-Maj)" name="radio stretch" />
-	<check_box label="Sélectionner une texture" name="radio select face" />
-	<check_box label="Modifier les parties liées" name="checkbox edit linked parts" />
-	<check_box label="Utiliser la grille" name="checkbox snap to grid" />
-	<button label="Options..." label_selected="Options..." name="Options..." />
-	<check_box label="Étirer les deux côtés" name="checkbox uniform" />
-	<check_box label="Étirer les textures" name="checkbox stretch textures" />
+	<check_box label="Zoom" name="radio zoom"/>
+	<check_box label="Orbite (Ctrl)" name="radio orbit"/>
+	<check_box label="Panoramique (Ctrl-Maj)" name="radio pan"/>
+	<check_box label="Déplacer" name="radio move"/>
+	<check_box label="Orbite (Ctrl)" name="radio lift"/>
+	<check_box label="Faire tourner (Ctrl-Maj)" name="radio spin"/>
+	<check_box label="Positionner" name="radio position"/>
+	<check_box label="Pivoter (Ctrl)" name="radio rotate"/>
+	<check_box label="Étirer (Ctrl-Maj)" name="radio stretch"/>
+	<check_box label="Sélectionner une face" name="radio select face"/>
+	<check_box label="Modifier les parties liées" name="checkbox edit linked parts"/>
+	<check_box label="Utiliser la grille" name="checkbox snap to grid"/>
+	<button label="Options..." label_selected="Options..." name="Options..."/>
+	<check_box label="Étirer les deux côtés" name="checkbox uniform"/>
+	<check_box label="Étirer les textures" name="checkbox stretch textures"/>
 	<text name="text ruler mode">
-		Règle :
+		Axe :
 	</text>
 	<text name="text status">
-		Faîtes glisser pour déplacer, Maj-faire glisser pour copier.
+		Faîtes glisser pour déplacer, Maj-faire glisser pour
+		copier.
 	</text>
 	<combo_box name="combobox grid mode">
 		<combo_item name="World">
@@ -52,32 +53,32 @@
 			Référence
 		</combo_item>
 	</combo_box>
-	<button label="" label_selected="" name="ToolCube" tool_tip="Cube" />
-	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisme" />
-	<button label="" label_selected="" name="ToolPyramid" tool_tip="Pyramide" />
-	<button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tétraèdre" />
-	<button label="" label_selected="" name="ToolCylinder" tool_tip="Cylindre" />
-	<button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Demi-cylindre" />
-	<button label="" label_selected="" name="ToolCone" tool_tip="Cône" />
-	<button label="" label_selected="" name="ToolHemiCone" tool_tip="Demi-cône" />
-	<button label="" label_selected="" name="ToolSphere" tool_tip="Sphère" />
-	<button label="" label_selected="" name="ToolHemiSphere" tool_tip="Demi-sphère" />
-	<check_box label="Copier la sélection" name="checkbox copy selection" />
-	<button label="" label_selected="" name="ToolTorus" tool_tip="Tore" />
-	<button label="" label_selected="" name="ToolTube" tool_tip="Tube" />
-	<button label="" label_selected="" name="ToolRing" tool_tip="Anneau" />
-	<button label="" label_selected="" name="ToolTree" tool_tip="Arbre" />
-	<button label="" label_selected="" name="ToolGrass" tool_tip="Herbe" />
-	<check_box label="Maintenir l&apos;outil sélectionné" name="checkbox sticky" />
-	<check_box label="Centrer la copie" name="checkbox copy centers" />
-	<check_box label="Faire pivoter la copie" name="checkbox copy rotates" />
-	<check_box label="Sélectionner le terrain" name="radio select land" />
-	<check_box label="Aplatir le terrain" name="radio flatten" />
-	<check_box label="Surélever le terrain" name="radio raise" />
-	<check_box label="Abaisser le terrain" name="radio lower" />
-	<check_box label="Lisser le terrain" name="radio smooth" />
-	<check_box label="Bosseler le terrain" name="radio noise" />
-	<check_box label="Rétablir le terrain" name="radio revert" />
+	<button label="" label_selected="" name="ToolCube" tool_tip="Cube"/>
+	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisme"/>
+	<button label="" label_selected="" name="ToolPyramid" tool_tip="Pyramide"/>
+	<button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tétraèdre"/>
+	<button label="" label_selected="" name="ToolCylinder" tool_tip="Cylindre"/>
+	<button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Demi-cylindre"/>
+	<button label="" label_selected="" name="ToolCone" tool_tip="Cône"/>
+	<button label="" label_selected="" name="ToolHemiCone" tool_tip="Demi-cône"/>
+	<button label="" label_selected="" name="ToolSphere" tool_tip="Sphère"/>
+	<button label="" label_selected="" name="ToolHemiSphere" tool_tip="Demi-sphère"/>
+	<check_box label="Copier la sélection" name="checkbox copy selection"/>
+	<button label="" label_selected="" name="ToolTorus" tool_tip="Tore"/>
+	<button label="" label_selected="" name="ToolTube" tool_tip="Tube"/>
+	<button label="" label_selected="" name="ToolRing" tool_tip="Anneau"/>
+	<button label="" label_selected="" name="ToolTree" tool_tip="Arbre"/>
+	<button label="" label_selected="" name="ToolGrass" tool_tip="Herbe"/>
+	<check_box label="Maintenir l&apos;outil sélectionné" name="checkbox sticky"/>
+	<check_box label="Centrer la copie" name="checkbox copy centers"/>
+	<check_box label="Pivoter la copie" name="checkbox copy rotates"/>
+	<check_box label="Sélectionner le terrain" name="radio select land"/>
+	<check_box label="Aplatir le terrain" name="radio flatten"/>
+	<check_box label="Élever le terrain" name="radio raise"/>
+	<check_box label="Abaisser le terrain" name="radio lower"/>
+	<check_box label="Lisser le terrain" name="radio smooth"/>
+	<check_box label="Bosseler le terrain" name="radio noise"/>
+	<check_box label="Annuler modification" name="radio revert"/>
 	<combo_box name="combobox brush size">
 		<combo_item name="Small">
 			Petit
@@ -92,12 +93,10 @@
 	<text name="Strength:">
 		Force :
 	</text>
-	<button label="Appliquer à la sélection" label_selected="Appliquer à la sélection"
-	     name="button apply to selection"
-	     tool_tip="Modifier le terrain sélectionné" />
-	<check_box label="Afficher les propriétaires" name="checkbox show owners" />
-	<button label="Plus &gt;&gt;" name="button more" tool_tip="Options avancées" />
-	<button label="&lt;&lt; Moins" name="button less" tool_tip="Options avancées" />
+	<button label="Appliquer à la sélection" label_selected="Appliquer à la sélection" name="button apply to selection" tool_tip="Modifier le terrain sélectionné"/>
+	<check_box label="Afficher les limites" name="checkbox show owners"/>
+	<button label="Plus &gt;&gt;" name="button more" tool_tip="Options avancées"/>
+	<button label="&lt;&lt; Moins" name="button less" tool_tip="Options avancées"/>
 	<tab_container name="Object Info Tabs">
 		<panel label="Général" name="General">
 			<text name="Name:">
@@ -112,21 +111,21 @@
 			<text name="Creator Name">
 				Thrax Linden
 			</text>
-			<button label="Profil..." label_selected="Profil..." name="button creator profile" />
+			<button label="Profil..." label_selected="Profil..." name="button creator profile"/>
 			<text name="Owner:">
 				Propriétaire :
 			</text>
 			<text name="Owner Name">
 				Thrax Linden
 			</text>
-			<button label="Profil..." label_selected="Profil..." name="button owner profile" />
+			<button label="Profil..." label_selected="Profil..." name="button owner profile"/>
 			<text name="Group:">
 				Groupe :
 			</text>
 			<text name="Group Name Proxy">
-				Les Linden
+				Les Lindens
 			</text>
-			<button label="Définir..." label_selected="Définir..." name="button set group" />
+			<button label="Définir..." label_selected="Définir..." name="button set group"/>
 			<text name="prim info">
 				1 objet, 1 prim
 			</text>
@@ -136,34 +135,30 @@
 			<text name="perm_modify">
 				Vous pouvez modifier cet objet.
 			</text>
-			<check_box label="Partager avec le groupe" name="checkbox share with group"
-			     tool_tip="Autoriser les membres du groupe à déplacer, copier et supprimer." />
+			<check_box label="Partager avec le groupe" name="checkbox share with group" tool_tip="Autoriser les membres du groupe à déplacer, copier et supprimer."/>
 			<text name="text deed continued">
 				Transférer...
 			</text>
 			<text name="text deed">
 				Transférer
 			</text>
-			<button label="Transférer..." label_selected="Transférer..." name="button deed"
-			     tool_tip="Les objets partagés par un groupe peuvent être transférés par un officier." />
-			<check_box label="Autoriser tout le monde à déplacer"
-			     name="checkbox allow everyone move" />
-			<check_box label="Autoriser tout le monde à copier" name="checkbox allow everyone copy" />
-			<check_box label="Afficher dans la recherche" name="search_check"
-			     tool_tip="Afficher l&apos;objet dans les résultats de recherche" />
-			<check_box label="À vendre" name="checkbox for sale" />
+			<button label="Céder..." label_selected="Céder..." name="button deed" tool_tip="Les objets partagés par un groupe peuvent être cédés par un officier."/>
+			<check_box label="Autoriser tout le monde à déplacer" name="checkbox allow everyone move"/>
+			<check_box label="Autoriser tout le monde à copier" name="checkbox allow everyone copy"/>
+			<check_box label="Afficher dans la recherche" name="search_check" tool_tip="Afficher l&apos;objet dans les résultats de recherche"/>
+			<check_box label="À vendre" name="checkbox for sale"/>
 			<text name="Price:  L$">
-				Prix :  L$
+				Prix : L$
 			</text>
 			<text name="Cost">
-				Prix :  $L
+				Prix : L$
 			</text>
 			<radio_group name="sale type">
 				<radio_item name="Original">
 					Original
 				</radio_item>
 				<radio_item name="Copy">
-					Copier
+					Copie
 				</radio_item>
 				<radio_item name="Contents">
 					Contenus
@@ -172,18 +167,18 @@
 			<text name="Next owner can:">
 				Le prochain propriétaire pourra :
 			</text>
-			<check_box label="Modifier" name="checkbox next owner can modify" />
-			<check_box label="Copier" name="checkbox next owner can copy" />
-			<check_box label="Revendre/Donner" name="checkbox next owner can transfer" />
+			<check_box label="Modifier" name="checkbox next owner can modify"/>
+			<check_box label="Copier" name="checkbox next owner can copy" left_delta="66" />
+			<check_box label="Revendre/Donner" name="checkbox next owner can transfer"/>
 			<text name="label click action">
-				Action clic-gauche :
+				Action du clic-gauche :
 			</text>
-			<combo_box name="clickaction">
+			<combo_box name="clickaction" width="178">
 				<combo_item name="Touch/grab(default)">
 					Toucher/attraper (défaut)
 				</combo_item>
 				<combo_item name="Sitonobject">
-					M&apos;asseoir sur l&apos;objet
+					S&apos;asseoir sur l&apos;objet
 				</combo_item>
 				<combo_item name="Buyobject">
 					Acheter l&apos;objet
@@ -195,10 +190,10 @@
 					Ouvrir
 				</combo_item>
 				<combo_item name="Play">
-					Jouer le média sur la parcelle
+					Jouer le média de la parcelle
 				</combo_item>
 				<combo_item name="Opemmedia">
-					Ouvrir le média sur la parcelle
+					Ouvrir le média de la parcelle
 				</combo_item>
 			</combo_box>
 			<text name="B:">
@@ -232,16 +227,16 @@
 				Vous ne pouvez pas modifier ces objets.
 			</text>
 			<text name="text modify warning">
-				Pour définir les permissions, vous devez sélectionner l&apos;objet en entier.
+				Sélectionnez l&apos;objet en entier.
 			</text>
 			<string name="Cost Default">
-				Prix :           $L
+				Prix :           L$
 			</string>
 			<string name="Cost Total">
-				Prix total :  $L
+				Prix total :  L$
 			</string>
 			<string name="Cost Per Unit">
-				Prix par :     $L
+				Prix par :     L$
 			</string>
 			<string name="Cost Mixed">
 				Prix mixte
@@ -252,37 +247,33 @@
 		</panel>
 		<panel label="Objet" name="Object">
 			<text name="select_single">
-				Sélectionnez un seul prim pour modifier les paramètres.
+				Sélectionnez un prim pour modifier les paramètres.
 			</text>
 			<text name="edit_object">
 				Modifier les paramètres de l&apos;objet :
 			</text>
-			<check_box label="Verrouillé" name="checkbox locked"
-			     tool_tip="Empêche l&apos;objet d&apos;être déplacé ou supprimé. Utile pendant la construction pour éviter les modifications involontaires." />
-			<check_box label="Physique" name="Physical Checkbox Ctrl"
-			     tool_tip="Permet à l&apos;objet d&apos;être poussé et affecté par la gravité" />
-			<check_box label="Temporaire" name="Temporary Checkbox Ctrl"
-			     tool_tip="L&apos;objet est supprimé 1 mn après sa création." />
-			<check_box label="Fantôme" name="Phantom Checkbox Ctrl"
-			     tool_tip="Permet à l&apos;objet de ne pas entrer en collision avec d&apos;autres objets ou avatars." />
+			<check_box label="Verrouillé" name="checkbox locked" tool_tip="Empêche l&apos;objet d&apos;être déplacé ou supprimé. Utile pendant la construction pour éviter les modifications involontaires."/>
+			<check_box label="Physique" name="Physical Checkbox Ctrl" tool_tip="Permet à l&apos;objet d&apos;être poussé et affecté par la gravité"/>
+			<check_box label="Temporaire" name="Temporary Checkbox Ctrl" tool_tip="L&apos;objet est supprimé 1 mn après sa création."/>
+			<check_box label="Fantôme" name="Phantom Checkbox Ctrl" tool_tip="Permet à l&apos;objet de ne pas entrer en collision avec d&apos;autres objets ou avatars."/>
 			<text name="label position">
 				Position (mètres)
 			</text>
-			<spinner label="X" name="Pos X" />
-			<spinner label="Y" name="Pos Y" />
-			<spinner label="Z" name="Pos Z" />
+			<spinner label="X" name="Pos X"/>
+			<spinner label="Y" name="Pos Y"/>
+			<spinner label="Z" name="Pos Z"/>
 			<text name="label size">
 				Taille (mètres)
 			</text>
-			<spinner label="X" name="Scale X" />
-			<spinner label="Y" name="Scale Y" />
-			<spinner label="Z" name="Scale Z" />
+			<spinner label="X" name="Scale X"/>
+			<spinner label="Y" name="Scale Y"/>
+			<spinner label="Z" name="Scale Z"/>
 			<text name="label rotation">
 				Rotation (degrés)
 			</text>
-			<spinner label="X" name="Rot X" />
-			<spinner label="Y" name="Rot Y" />
-			<spinner label="Z" name="Rot Z" />
+			<spinner label="X" name="Rot X"/>
+			<spinner label="Y" name="Rot Y"/>
+			<spinner label="Z" name="Rot Z"/>
 			<text name="label material">
 				Matériau
 			</text>
@@ -335,19 +326,19 @@
 					Anneau
 				</combo_item>
 				<combo_item name="Sculpted">
-					Sculpté
+					Sculptie
 				</combo_item>
 			</combo_box>
 			<text name="text cut">
-				Début et fin de la découpe du tracé
+				Début et fin de découpe du tracé
 			</text>
-			<spinner label="D" name="cut begin" />
-			<spinner label="F" name="cut end" />
+			<spinner label="D" name="cut begin"/>
+			<spinner label="F" name="cut end"/>
 			<text name="text hollow">
 				Creux
 			</text>
 			<text name="text skew">
-				Biaiser
+				Biais
 			</text>
 			<text name="Hollow Shape">
 				Forme du creux
@@ -367,50 +358,47 @@
 				</combo_item>
 			</combo_box>
 			<text name="text twist">
-				Début et fin de la vrille
+				Début et fin de vrille
 			</text>
-			<spinner label="D" name="Twist Begin" />
-			<spinner label="F" name="Twist End" />
+			<spinner label="D" name="Twist Begin"/>
+			<spinner label="F" name="Twist End"/>
 			<text name="scale_taper">
-				Biseauter
+				Biseautage
 			</text>
 			<text name="scale_hole">
 				Taille du trou
 			</text>
-			<spinner label="X" name="Taper Scale X" />
-			<spinner label="Y" name="Taper Scale Y" />
+			<spinner label="X" name="Taper Scale X"/>
+			<spinner label="Y" name="Taper Scale Y"/>
 			<text name="text topshear">
 				Inclinaison
 			</text>
-			<spinner label="X" name="Shear X" />
-			<spinner label="Y" name="Shear Y" />
+			<spinner label="X" name="Shear X"/>
+			<spinner label="Y" name="Shear Y"/>
 			<text name="advanced_cut">
-				Début et fin de la découpe du profilé
+				Début et fin de découpe du profilé
 			</text>
 			<text name="advanced_dimple">
 				Début et fin du creux
 			</text>
-			<spinner label="D" name="Path Limit Begin" />
-			<spinner label="F" name="Path Limit End" />
+			<spinner label="D" name="Path Limit Begin"/>
+			<spinner label="F" name="Path Limit End"/>
 			<text name="text taper2">
-				Biseauter
+				Biseautage
 			</text>
-			<spinner label="X" name="Taper X" />
-			<spinner label="Y" name="Taper Y" />
+			<spinner label="X" name="Taper X"/>
+			<spinner label="Y" name="Taper Y"/>
 			<text name="text radius delta">
 				Rayon
 			</text>
 			<text name="text revolutions">
 				Révolutions
 			</text>
-			<texture_picker label="Sculpter la texture" name="sculpt texture control"
-			     tool_tip="Cliquez pour sélectionner une image" />
-			<check_box label="Mirroir" name="sculpt mirror control"
-			     tool_tip="Retourne le prim sculpté le long de l&apos;axe des X." />
-			<check_box label="A l&apos;envers" name="sculpt invert control"
-			     tool_tip="Inverse les valeurs normales d&apos;un prim sculpté et le fait apparaître à l&apos;envers." />
+			<texture_picker label="Texture du sculptie" name="sculpt texture control" tool_tip="Cliquez pour sélectionner une image"/>
+			<check_box label="Mirroir" name="sculpt mirror control" tool_tip="Retourne le sculptie le long de l&apos;axe des X."/>
+			<check_box label="A l&apos;envers" name="sculpt invert control" tool_tip="Inverse les valeurs normales d&apos;un sculptie et le fait apparaître à l&apos;envers."/>
 			<text name="label sculpt type">
-				Type de couture
+				Type de raccord
 			</text>
 			<combo_box name="sculpt type control">
 				<combo_item name="None">
@@ -432,44 +420,39 @@
 		</panel>
 		<panel label="Attributs" name="Features">
 			<text name="select_single">
-				Sélectionnez un seul prim pour modifier les attributs.
+				Sélectionnez un prim pour modifier les attributs.
 			</text>
 			<text name="edit_object">
 				Modifier les attributs de l&apos;objet :
 			</text>
-			<check_box label="Tracé flexible" name="Flexible1D Checkbox Ctrl"
-			     tool_tip="Donne à l&apos;objet de la souplesse sur l&apos;axe des Z.  (côté client uniquement)" />
-			<spinner label="Souplesse" name="FlexNumSections" />
-			<spinner label="Gravité" name="FlexGravity" />
-			<spinner label="Faire glisser" name="FlexFriction" />
-			<spinner label="Vent" name="FlexWind" />
-			<spinner label="Tension" name="FlexTension" />
-			<spinner label="Force X" name="FlexForceX" />
-			<spinner label="Force Y" name="FlexForceY" />
-			<spinner label="Force Z" name="FlexForceZ" />
-			<check_box label="Lumière" name="Light Checkbox Ctrl"
-			     tool_tip="Permet aux objets d&apos;émettre de la lumière" />
+			<check_box label="Flexibilité" name="Flexible1D Checkbox Ctrl" tool_tip="Donne à l&apos;objet de la souplesse sur l&apos;axe des Z (côté client uniquement)."/>
+			<spinner label="Souplesse" name="FlexNumSections"/>
+			<spinner label="Gravité" name="FlexGravity"/>
+			<spinner label="Élasticité" name="FlexFriction"/>
+			<spinner label="Vent" name="FlexWind"/>
+			<spinner label="Tension" name="FlexTension"/>
+			<spinner label="Force X" name="FlexForceX"/>
+			<spinner label="Force Y" name="FlexForceY"/>
+			<spinner label="Force Z" name="FlexForceZ"/>
+			<check_box label="Lumière" name="Light Checkbox Ctrl" tool_tip="Permet aux objets d&apos;émettre de la lumière"/>
 			<text name="label color">
 				Couleur
 			</text>
-			<color_swatch label="" name="colorswatch"
-			     tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" />
-			<spinner label="Intensité" name="Light Intensity" />
-			<spinner label="Rayon" name="Light Radius" />
-			<spinner label="Atténuation" name="Light Falloff" />
+			<color_swatch label="" name="colorswatch" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+			<spinner label="Intensité" name="Light Intensity"/>
+			<spinner label="Portée" name="Light Radius"/>
+			<spinner label="Atténuation" name="Light Falloff"/>
 		</panel>
 		<panel label="Texture" name="Texture">
-			<texture_picker label="Texture" name="texture control"
-			     tool_tip="Cliquez pour sélectionner une image" />
-			<color_swatch label="Couleur" name="colorswatch"
-			     tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" />
+			<texture_picker label="Texture" name="texture control" tool_tip="Cliquez pour sélectionner une image"/>
+			<color_swatch label="Couleur" name="colorswatch" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs"/>
 			<text name="color trans" width="88">
-				Transparence (%)
+				Transparence
 			</text>
 			<text name="glow label">
 				Rayonnement
 			</text>
-			<check_box label="Luminosité &#10;maximale" name="checkbox fullbright" />
+			<check_box label="Lumineux" name="checkbox fullbright"/>
 			<text name="tex gen">
 				Application
 			</text>
@@ -478,7 +461,7 @@
 					Défaut
 				</combo_item>
 				<combo_item name="Planar">
-					Planaire
+					Planar
 				</combo_item>
 			</combo_box>
 			<text name="label shininess">
@@ -512,102 +495,100 @@
 					Obscurité
 				</combo_item>
 				<combo_item name="woodgrain">
-					aggloméré
+					Aggloméré
 				</combo_item>
 				<combo_item name="bark">
-					écorce
+					Écorce
 				</combo_item>
 				<combo_item name="bricks">
-					briques
+					Briques
 				</combo_item>
 				<combo_item name="checker">
-					damier
+					Damier
 				</combo_item>
 				<combo_item name="concrete">
-					béton
+					Béton
 				</combo_item>
 				<combo_item name="crustytile">
-					carrelage
+					Carrelage
 				</combo_item>
 				<combo_item name="cutstone">
-					pierre de taille
+					Pierre de taille
 				</combo_item>
 				<combo_item name="discs">
-					rondelles
+					Disques
 				</combo_item>
 				<combo_item name="gravel">
-					gravier
+					Gravier
 				</combo_item>
 				<combo_item name="petridish">
-					boîte de Petri
+					Boîte de Petri
 				</combo_item>
 				<combo_item name="siding">
-					bardage
+					Lattes
 				</combo_item>
 				<combo_item name="stonetile">
-					carreau
+					Carreaux
 				</combo_item>
 				<combo_item name="stucco">
-					stuc
+					Stuc
 				</combo_item>
 				<combo_item name="suction">
-					ventouses
+					Ventouses
 				</combo_item>
 				<combo_item name="weave">
-					tissage
+					Tissage
 				</combo_item>
 			</combo_box>
 			<text name="tex scale">
 				Répétitions par face
 			</text>
-			<spinner label="Horizontal (U)" name="TexScaleU" />
-			<check_box label="Retourner" name="checkbox flip s" />
-			<spinner label="Vertical (V)" name="TexScaleV" />
-			<check_box label="Retourner" name="checkbox flip t" />
+			<spinner label="Horizontal (U)" name="TexScaleU"/>
+			<check_box label="Inverser" name="checkbox flip s"/>
+			<spinner label="Vertical (V)" name="TexScaleV"/>
+			<check_box label="Inverser" name="checkbox flip t"/>
 			<text name="tex rotate">
 				Rotation (degrés)
 			</text>
-			<text name="string repeats per meter">
+			<spinner left="122" name="TexRot" width="58" />
+			<string name="string repeats per meter">
 				Répétitions au mètre
-			</text>
-			<text name="string repeats per face">
+			</string>
+			<string name="string repeats per face">
 				Répétitions par face
-			</text>
-			<text name="rpt">
+			</string>
+			<text name="rpt" width="160">
 				Répétitions au mètre
 			</text>
-			<button label="Appliquer" label_selected="Appliquer" name="button apply" />
+			<spinner left="122" name="rptctrl" width="58" />
+			<button label="Appliquer" label_selected="Appliquer" name="button apply" left_delta="68" width="75"/>
 			<text name="tex offset">
-				Décaler
+				Décalage
 			</text>
-			<spinner label="Horizontal (U)" name="TexOffsetU" />
-			<spinner label="Vertical (V)" name="TexOffsetV" />
+			<spinner label="Horizontal (U)" name="TexOffsetU"/>
+			<spinner label="Vertical (V)" name="TexOffsetV"/>
 			<text name="textbox autofix">
 				Ajuster la texture du média
 (chargement préalable)
 			</text>
-			<button label="Ajuster" label_selected="Ajuster" name="button align" />
+			<button left="150" label="Ajuster" label_selected="Ajuster" name="button align"/>
 		</panel>
 		<panel label="Contenu" name="Contents">
-			<button label="Nouveau script..." label_selected="Nouveau script..."
-			     name="button new script" />
+			<button label="Nouveau script..." label_selected="Nouveau script..." name="button new script"/>
 		</panel>
 	</tab_container>
 	<panel name="land info panel">
 		<text name="label_area_price">
-			Prix : [PRICE] $L pour [AREA] m².
+			Prix : [PRICE] L$ pour [AREA] m².
 		</text>
 		<text name="label_area">
 			Surface : [AREA] m²
 		</text>
-		<button label="Acheter le terrain..." label_selected="Acheter le terrain..."
-		     name="button buy land" width="132" />
-		<button label="Céder le terrain..." label_selected="Céder le terrain..."
-		     name="button abandon land" width="132" />
-		<button label="Diviser..." label_selected="Diviser..." name="button subdivide land" width="132" />
-		<button label="Fusionner..." label_selected="Fusionner..." name="button join land" width="132" />
-		<button label="À propos du terrain..." label_selected="À propos du terrain..."
-		     name="button about land"  width="132" />
+		<button label="Acheter le terrain..." label_selected="Acheter le terrain..." name="button buy land" width="132"/>
+		<button label="Abandonner le terrain..." label_selected="Abandonner le terrain..." name="button abandon land" width="132"/>
+		<button label="Diviser..." label_selected="Diviser..." name="button subdivide land" width="132"/>
+		<button label="Fusionner..." label_selected="Fusionner..." name="button join land" width="132"/>
+		<button label="À propos du terrain..." label_selected="À propos du terrain..." name="button about land" width="132"/>
 	</panel>
 	<string name="status_rotate">
 		Pour faire tourner l&apos;objet, faîtes glisser les bandes de couleur.
@@ -634,7 +615,7 @@
 		Cliquez et faîtes glisser pour sélectionner le terrain
 	</string>
 	<string name="grid_screen_text">
-		Ecran
+		Écran
 	</string>
 	<string name="grid_local_text">
 		Local
diff --git a/indra/newview/skins/default/xui/fr/floater_top_objects.xml b/indra/newview/skins/default/xui/fr/floater_top_objects.xml
index be9232893e..0aa21d313e 100644
--- a/indra/newview/skins/default/xui/fr/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/fr/floater_top_objects.xml
@@ -1,51 +1,55 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="top_objects" title="en cours de chargement...">
 	<text name="title_text">
-		Chargement en cours...
+		Chargement...
 	</text>
 	<scroll_list name="objects_list">
-		<column label="Score" name="score" />
-		<column label="Nom" name="name" />
-		<column label="Propriétaire" name="owner" />
-		<column label="Emplacement" name="location" />
-		<column label="Heure" name="time" />
+		<column label="Score" name="score"/>
+		<column label="Nom" name="name"/>
+		<column label="Propriétaire" name="owner"/>
+		<column label="Lieu" name="location"/>
+		<column label="Heure" name="time"/>
+		<column label="Heure Mono" name="mono_time"/>
 	</scroll_list>
 	<text name="id_text">
 		ID de l&apos;objet :
 	</text>
-	<button label="Afficher balise" name="show_beacon_btn" />
+	<button label="Afficher balise" name="show_beacon_btn"/>
 	<text name="obj_name_text">
 		Nom :
 	</text>
-	<button label="Filtre" name="filter_object_btn" />
+	<button label="Filtre" name="filter_object_btn"/>
 	<text name="owner_name_text">
 		Nom :
 	</text>
-	<button label="Filtre" name="filter_owner_btn" />
-	<button label="Renvoyer" name="return_selected_btn" />
-	<button label="Renvoyer tous" name="return_all_btn" />
-	<button label="Désactiver" name="disable_selected_btn" />
-	<button label="Désactiver tous" name="disable_all_btn" />
-	<button label="Rafraîchir" name="refresh_btn" />
-	<text name="top_scripts_title">
+	<button label="Filtre" name="filter_owner_btn"/>
+	<button label="Renvoyer" name="return_selected_btn"/>
+	<button label="Renvoyer tous" name="return_all_btn"/>
+	<button label="Désactiver" name="disable_selected_btn"/>
+	<button label="Désactiver tous" name="disable_all_btn"/>
+	<button label="Rafraîchir" name="refresh_btn"/>
+	<string name="top_scripts_title">
 		Scripts principaux
-	</text>
-	<text name="top_scripts_text">
+	</string>
+	<string name="top_scripts_text">
 		[COUNT] scripts prenant un total de [TIME] ms
-	</text>
-	<text name="scripts_score_label">
+	</string>
+	<string name="scripts_score_label">
 		Heure
-	</text>
-	<text name="top_colliders_title">
+	</string>
+	<string name="scripts_mono_time_label">
+		Heure Mono
+	</string>
+	<string name="top_colliders_title">
 		Objets souvent responsables de collision
-	</text>
-	<text name="top_colliders_text">
-		[COUNT] objets le plus souvent responsables de collisions
-	</text>
-	<text name="colliders_score_label">
+	</string>
+	<string name="top_colliders_text">
+		[COUNT] objets souvent responsables de collisions
+	</string>
+	<string name="colliders_score_label">
 		Score
-	</text>
-	<text name="none_descriptor">
+	</string>
+	<string name="none_descriptor">
 		Aucun résultat.
-	</text>
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_url_entry.xml b/indra/newview/skins/default/xui/fr/floater_url_entry.xml
index b744bf1586..fce1f483cf 100644
--- a/indra/newview/skins/default/xui/fr/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/fr/floater_url_entry.xml
@@ -3,10 +3,11 @@
 	<text name="media_label">
 		URL du média :
 	</text>
+	<combo_box left="100" name="media_entry" width="360" />
 	<button label="OK" name="ok_btn" />
 	<button label="Annuler" name="cancel_btn" />
 	<button label="Effacer" name="clear_btn" />
 	<text name="loading_label">
-		Chargement en cours...
+		Chargement...
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
index 57c3dfdcd1..1aa6cd5a45 100644
--- a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="WindLight floater" title="Éditeur de ciel avancé">
+<floater name="WindLight floater" title="Éditeur de ciel avancé" width="706">
 	<text name="KeyFramePresetsText">
 		Préréglages ciel :
 	</text>
@@ -8,7 +8,7 @@
 	<button label="Supprimer" label_selected="Supprimer" name="WLDeletePreset" left_delta="80"/>
 	<button label="Éditeur du cycle du jour" label_selected="Éditeur du cycle du jour"
 	     name="WLDayCycleMenuButton" width="150" left_delta="95" />
-	<tab_container name="WindLight Tabs">
+	<tab_container name="WindLight Tabs" width="706">
 		<panel label="Atmosphère" name="Atmosphere">
 			<text name="BHText">
 				Bleu de l&apos;horizon
diff --git a/indra/newview/skins/default/xui/fr/floater_world_map.xml b/indra/newview/skins/default/xui/fr/floater_world_map.xml
index f2219c8c6f..c628b11ca3 100644
--- a/indra/newview/skins/default/xui/fr/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/fr/floater_world_map.xml
@@ -1,107 +1,90 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="worldmap" title="Carte du monde">
 	<tab_container name="maptab" width="955">
-		<panel label="Objets" name="objects_mapview" width="953" />
-		<panel label="Terrain" name="terrain_mapview" width="953" />
+		<panel label="Objets" name="objects_mapview" width="953"/>
+		<panel label="Terrain" name="terrain_mapview" width="953"/>
 	</tab_container>
-	<icon left="973" name="square" />
+	<icon left="973" name="square"/>
 	<text name="land_for_sale_label">
 		Terrain à vendre
 	</text>
-	<icon left="1113" name="square2" />
+	<icon left="1113" name="square2"/>
 	<text name="auction_label">
 		Enchère
 	</text>
-	<icon left="973" name="self" />
+	<icon left="973" name="self"/>
 	<text name="you_label">
 		Vous
 	</text>
-	<icon left="1033" name="home" />
+	<icon left="1033" name="home"/>
 	<text name="home_label">
 		Domicile
 	</text>
-	<button label="Aller chez moi" label_selected="Aller chez moi" name="Go Home"
-	     tool_tip="Vous téléporte à votre domicile" />
-	<icon left="977" name="person" />
+	<button label="Aller chez moi" label_selected="Aller chez moi" name="Go Home" tool_tip="Vous téléporte à votre domicile"/>
+	<icon left="977" name="person"/>
 	<text name="person_label">
-		Personne
+		Résident
 	</text>
-	<icon left="973" name="infohub" />
-	<check_box label=" " left_delta="60" name="people_chk" />
+	<icon left="973" name="infohub"/>
+	<check_box label=" " left_delta="60" name="people_chk"/>
 	<text name="infohub_label">
 		Infohub
 	</text>
-	<icon left="973" name="telehub" />
-	<check_box label=" " left_delta="60" name="infohub_chk" />
+	<icon left="973" name="telehub"/>
+	<check_box label=" " left_delta="60" name="infohub_chk"/>
 	<text name="telehub_label">
 		Téléhub
 	</text>
-	<check_box label=" " left_delta="60" name="telehubchk" />
-	<icon left="1113" name="landforsale" />
+	<check_box label=" " left_delta="60" name="telehubchk"/>
+	<icon left="1113" name="landforsale"/>
 	<text name="land_for_sale_label2">
 		Terrain à vendre
 	</text>
-	<check_box label=" " name="land_for_sale_chk" />
-	<icon left="1113" name="event" />
+	<check_box label=" " name="land_for_sale_chk"/>
+	<icon left="1113" name="event"/>
 	<text name="events_label">
 		Événements
 	</text>
-	<check_box label=" " name="event_chk" />
-	<icon left="1113" name="events_mature_icon" />
+	<check_box label=" " name="event_chk"/>
+	<icon left="1113" name="events_mature_icon"/>
 	<text name="events_mature_label">
 		Événements (A)
 	</text>
-	<check_box label=" " name="event_mature_chk" />
-	<icon left="973" name="avatar_icon" />
-	<combo_box label="Amis connectés" name="friend combo"
-	     tool_tip="Ami à afficher sur la carte" width="232">
+	<check_box label=" " name="event_mature_chk"/>
+	<icon left="973" name="avatar_icon"/>
+	<combo_box label="Amis connectés" name="friend combo" tool_tip="Ami à afficher sur la carte" width="232">
 		<combo_item name="none_selected">
 			Amis connectés
 		</combo_item>
 	</combo_box>
-	<icon left="973" name="landmark_icon" />
-	<combo_box label="Repères" name="landmark combo"
-	     tool_tip="Repère à afficher sur la carte" width="232">
+	<icon left="973" name="landmark_icon"/>
+	<combo_box label="Repères" name="landmark combo" tool_tip="Repère à afficher sur la carte" width="232">
 		<combo_item name="none_selected">
 			Repères
 		</combo_item>
 	</combo_box>
-	<icon left="973" name="location_icon" />
-	<line_editor label="Rechercher par nom de région" name="location"
-	     tool_tip="Saisissez le nom d&apos;une région" width="155">
+	<icon left="973" name="location_icon"/>
+	<line_editor label="Rechercher par nom de région" name="location" tool_tip="Saisissez le nom d&apos;une région" width="155">
 		Recherche par nom de région
 	</line_editor>
-	<button label="Rechercher" label_selected="&gt;" left_delta="160" name="DoSearch"
-	     tool_tip="Rechercher dans la région" width="75" />
+	<button label="Rechercher" label_selected="&gt;" left_delta="160" name="DoSearch" tool_tip="Rechercher dans la région" width="75"/>
 	<text left="973" name="search_label">
 		Résultats de la recherche :
 	</text>
 	<scroll_list left="973" name="search_results" width="252">
-		<column label="" name="icon" />
-		<column label="" name="sim_name" />
+		<column label="" name="icon"/>
+		<column label="" name="sim_name"/>
 	</scroll_list>
 	<text left="973" name="location_label">
 		Emplacement :
 	</text>
-	<spinner left="993" name="spin x"
-	     tool_tip="Coordonnées des X du lieu à afficher sur la carte" />
-	<spinner left="993" name="spin y"
-	     tool_tip="Coordonnées des Y du lieu à afficher sur la carte" />
-	<spinner left="993" name="spin z"
-	     tool_tip="Coordonnées des Z du lieu à afficher sur la carte" />
-	<button label="Téléporter" label_selected="Téléporter" left="-270" name="Teleport"
-	     tool_tip="Téléporter à l&apos;endroit sélectionné" />
-	<button label="Afficher la destination" label_selected="Afficher la destination"
-	     name="Show Destination"
-	     tool_tip="Centrer la carte sur l&apos;endroit sélectionné" width="165" />
-	<button label="Effacer" label_selected="Effacer" left="-270" name="Clear"
-	     tool_tip="Arrêter de suivre" />
-	<button label="Afficher mon emplacement" label_selected="Afficher mon emplacement"
-	     name="Show My Location"
-	     tool_tip="Centrer la carte sur l&apos;emplacement de votre avatar"
-	     width="165" />
-	<button label="Copier la SLURL sur le presse-papier" left="-270" name="copy_slurl"
-	     tool_tip="Copier l&apos;emplacement actuel comme SLURL pour l&apos;utiliser sur le Web."
-	     width="262" />
-	<slider label="Zoom" left="-270" name="zoom slider" />
+	<spinner left="993" name="spin x" tool_tip="Coordonnées des X du lieu à afficher sur la carte"/>
+	<spinner left="993" name="spin y" tool_tip="Coordonnées des Y du lieu à afficher sur la carte"/>
+	<spinner left="993" name="spin z" tool_tip="Coordonnées des Z du lieu à afficher sur la carte"/>
+	<button label="Téléporter" label_selected="Téléporter" left="-270" name="Teleport" tool_tip="Téléporter à l&apos;endroit sélectionné"/>
+	<button label="Afficher la destination" label_selected="Afficher la destination" name="Show Destination" tool_tip="Centrer la carte sur l&apos;endroit sélectionné" width="165"/>
+	<button label="Effacer" label_selected="Effacer" left="-270" name="Clear" tool_tip="Arrêter de suivre"/>
+	<button label="Afficher mon emplacement" label_selected="Afficher mon emplacement" name="Show My Location" tool_tip="Centrer la carte sur l&apos;emplacement de votre avatar" width="165"/>
+	<button label="Copier la SLURL dans le presse-papier" left="-270" name="copy_slurl" tool_tip="Copier l&apos;emplacement actuel comme SLURL pour l&apos;utiliser sur le Web." width="262"/>
+	<slider label="Zoom" left="-270" name="zoom slider"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory.xml b/indra/newview/skins/default/xui/fr/menu_inventory.xml
index da1773eb29..8391e3b48b 100644
--- a/indra/newview/skins/default/xui/fr/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inventory.xml
@@ -1,70 +1,67 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="Acheter" name="Task Buy" />
-	<menu_item_call label="Ouvrir" name="Task Open" />
-	<menu_item_call label="Jouer" name="Task Play" />
-	<menu_item_call label="Propriétés" name="Task Properties" />
-	<menu_item_call label="Renommer" name="Task Rename" />
-	<menu_item_call label="Supprimer" name="Task Remove" />
-	<menu_item_call label="Vider la corbeille" name="Empty Trash" />
-	<menu_item_call label="Vider les objets trouvés" name="Empty Lost And Found" />
-	<menu_item_call label="Nouveau dossier" name="New Folder" />
-	<menu_item_call label="Nouveau script" name="New Script" />
-	<menu_item_call label="Nouvelle note" name="New Note" />
-	<menu_item_call label="Nouveau geste" name="New Gesture" />
+	<menu_item_call label="Acheter" name="Task Buy"/>
+	<menu_item_call label="Ouvrir" name="Task Open"/>
+	<menu_item_call label="Jouer" name="Task Play"/>
+	<menu_item_call label="Propriétés" name="Task Properties"/>
+	<menu_item_call label="Renommer" name="Task Rename"/>
+	<menu_item_call label="Supprimer" name="Task Remove"/>
+	<menu_item_call label="Vider la corbeille" name="Empty Trash"/>
+	<menu_item_call label="Vider les objets trouvés" name="Empty Lost And Found"/>
+	<menu_item_call label="Nouveau dossier" name="New Folder"/>
+	<menu_item_call label="Nouveau script" name="New Script"/>
+	<menu_item_call label="Nouvelle note" name="New Note"/>
+	<menu_item_call label="Nouveau geste" name="New Gesture"/>
 	<menu name="New Clothes">
-		<menu_item_call label="Nouvelle jupe" name="New Shirt" />
-		<menu_item_call label="Nouveau pantalon" name="New Pants" />
-		<menu_item_call label="Nouvelles chaussures" name="New Shoes" />
-		<menu_item_call label="Nouvelles chaussettes" name="New Socks" />
-		<menu_item_call label="Nouvelle veste" name="New Jacket" />
-		<menu_item_call label="Nouvelle jupe" name="New Skirt" />
-		<menu_item_call label="Nouveaux gants" name="New Gloves" />
-		<menu_item_call label="Nouveau tricot de peau" name="New Undershirt" />
-		<menu_item_call label="Nouveaux sous-vêtements" name="New Underpants" />
+		<menu_item_call label="Nouvelle chemise" name="New Shirt"/>
+		<menu_item_call label="Nouveau pantalon" name="New Pants"/>
+		<menu_item_call label="Nouvelles chaussures" name="New Shoes"/>
+		<menu_item_call label="Nouvelles chaussettes" name="New Socks"/>
+		<menu_item_call label="Nouvelle veste" name="New Jacket"/>
+		<menu_item_call label="Nouvelle jupe" name="New Skirt"/>
+		<menu_item_call label="Nouveaux gants" name="New Gloves"/>
+		<menu_item_call label="Nouveau tricot de peau" name="New Undershirt"/>
+		<menu_item_call label="Nouveaux sous-vêtements" name="New Underpants"/>
 	</menu>
 	<menu name="New Body Parts">
-		<menu_item_call label="Nouvelle silhouette" name="New Shape" />
-		<menu_item_call label="Nouvelle peau" name="New Skin" />
-		<menu_item_call label="Nouveaux cheveux" name="New Hair" />
-		<menu_item_call label="Nouveaux yeux" name="New Eyes" />
+		<menu_item_call label="Nouvelle silhouette" name="New Shape"/>
+		<menu_item_call label="Nouvelle peau" name="New Skin"/>
+		<menu_item_call label="Nouveaux cheveux" name="New Hair"/>
+		<menu_item_call label="Nouveaux yeux" name="New Eyes"/>
 	</menu>
-	<menu_item_call label="Téléporter" name="Landmark Open" />
-	<menu_item_call label="Ouvrir" name="Animation Open" />
-	<menu_item_call label="Ouvrir" name="Sound Open" />
-	<menu_item_call label="Purger l&apos;objet" name="Purge Item" />
-	<menu_item_call label="Restaurer l&apos;objet" name="Restore Item" />
-	<menu_item_call label="Ouvrir" name="Open" />
-	<menu_item_call label="Propriétés" name="Properties" />
-	<menu_item_call label="Renommer" name="Rename" />
-	<menu_item_call label="Copier l&apos;identifiant universel unique (UUID) de l&apos;actif"
-	     name="Copy Asset UUID" />
-	<menu_item_call label="Copier" name="Copy" />
-	<menu_item_call label="Coller" name="Paste" />
-	<menu_item_call label="Supprimer" name="Delete" />
-	<menu_item_call label="Ajouter à l&apos;ensemble" name="Add To Outfit" />
-	<menu_item_call label="Remplacer l&apos;ensemble" name="Replace Outfit" />
-	<menu_item_call label="Enlever les objets" name="Take Off Items" />
-	<menu_item_call label="Envoyer un IM aux contacts en ligne dans le dossier"
-	     name="IM Online Contacts In Folder" />
-	<menu_item_call label="Envoyer un IM à tous les contacts dans le dossier"
-	     name="IM All Contacts In Folder" />
-	<menu_item_call label="Démarrer le chat conférence" name="Conference Chat Folder" />
-	<menu_item_call label="Jouer" name="Sound Play" />
-	<menu_item_call label="Au sujet du repère" name="Teleport To Landmark" />
-	<menu_item_call label="Jouer dans le Monde" name="Animation Play" />
-	<menu_item_call label="Jouer localement" name="Animation Audition" />
-	<menu_item_call label="Envoyer un message instantané" name="Send Instant Message" />
-	<menu_item_call label="Offrir de téléporter..." name="Offer Teleport..." />
-	<menu_item_call label="Démarrer le chat conférence" name="Conference Chat" />
-	<menu_item_call label="Activer" name="Activate" />
-	<menu_item_call label="Désactiver" name="Deactivate" />
-	<menu_item_call label="Détacher de vous" name="Detach From Yourself" />
-	<menu_item_call label="Porter" name="Object Wear" />
-	<menu label="Attacher à" name="Attach To" />
-	<menu label="Attacher au HUD " name="Attach To HUD" />
-	<menu_item_call label="Porter" name="Wearable Wear" />
-	<menu_item_call label="Éditer" name="Wearable Edit" />
-	<menu_item_call label="Enlever" name="Take Off" />
-	<menu_item_call label="--aucune option--" name="--no options--" />
+	<menu_item_call label="Téléporter" name="Landmark Open"/>
+	<menu_item_call label="Ouvrir" name="Animation Open"/>
+	<menu_item_call label="Ouvrir" name="Sound Open"/>
+	<menu_item_call label="Purger l&apos;objet" name="Purge Item"/>
+	<menu_item_call label="Restaurer l&apos;objet" name="Restore Item"/>
+	<menu_item_call label="Ouvrir" name="Open"/>
+	<menu_item_call label="Propriétés" name="Properties"/>
+	<menu_item_call label="Renommer" name="Rename"/>
+	<menu_item_call label="Copier l&apos;UUID (identifiant universel unique)" name="Copy Asset UUID"/>
+	<menu_item_call label="Copier" name="Copy"/>
+	<menu_item_call label="Coller" name="Paste"/>
+	<menu_item_call label="Supprimer" name="Delete"/>
+	<menu_item_call label="Ajouter à l&apos;ensemble" name="Add To Outfit"/>
+	<menu_item_call label="Remplacer l&apos;ensemble" name="Replace Outfit"/>
+	<menu_item_call label="Enlever les objets" name="Take Off Items"/>
+	<menu_item_call label="Envoyer un IM aux contacts en ligne dans le dossier" name="IM Online Contacts In Folder"/>
+	<menu_item_call label="Envoyer un IM à tous les contacts dans le dossier" name="IM All Contacts In Folder"/>
+	<menu_item_call label="Démarrer le chat conférence" name="Conference Chat Folder"/>
+	<menu_item_call label="Jouer" name="Sound Play"/>
+	<menu_item_call label="Au sujet du repère" name="Teleport To Landmark"/>
+	<menu_item_call label="Jouer dans le Monde" name="Animation Play"/>
+	<menu_item_call label="Jouer localement" name="Animation Audition"/>
+	<menu_item_call label="Envoyer un message instantané" name="Send Instant Message"/>
+	<menu_item_call label="Offrir de téléporter..." name="Offer Teleport..."/>
+	<menu_item_call label="Démarrer le chat conférence" name="Conference Chat"/>
+	<menu_item_call label="Activer" name="Activate"/>
+	<menu_item_call label="Désactiver" name="Deactivate"/>
+	<menu_item_call label="Détacher de vous" name="Detach From Yourself"/>
+	<menu_item_call label="Porter" name="Object Wear"/>
+	<menu label="Attacher à" name="Attach To"/>
+	<menu label="Attacher au HUD " name="Attach To HUD"/>
+	<menu_item_call label="Porter" name="Wearable Wear"/>
+	<menu_item_call label="Éditer" name="Wearable Edit"/>
+	<menu_item_call label="Enlever" name="Take Off"/>
+	<menu_item_call label="--aucune option--" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 6e34d27cdc..4893f26058 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -1,279 +1,207 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Main Menu">
 	<menu label="Fichier" name="File">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-		<menu_item_call label="Charger une image ([COST] $L)..." name="Upload Image" />
-		<menu_item_call label="Charger un son ([COST] $L)..." name="Upload Sound" />
-		<menu_item_call label="Charger une animation ([COST] $L)..." name="Upload Animation" />
-		<menu_item_call label="Charger un lot de fichiers ([COST] $L par fichier)..."
-		     name="Bulk Upload" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="Fermer la fenêtre" name="Close Window" />
-		<menu_item_call label="Fermer toutes les fenêtres" name="Close All Windows" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="Enregistrer la texture sous..." name="Save Texture As..." />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="Prendre une photo" name="Take Snapshot" />
-		<menu_item_call label="Enregistrer la photo sur le disque" name="Snapshot to Disk"
-		     shortcut="control|shift|X" />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu label="Définir taille de la fenêtre" name="Set Window Size">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-			<menu_item_call label="320x240" name="320x240" />
-			<menu_item_call label="640x480" name="640x480" />
-			<menu_item_call label="800x600" name="800x600" />
-			<menu_item_separator label="-----------" name="separator" />
-			<menu_item_call label="720x480 (NTSC)" name="720x480 (NTSC)" />
-			<menu_item_call label="768x576 (PAL)" name="768x576 (PAL)" />
-		</menu>
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="Quitter" name="Quit" />
+		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+		<menu_item_call label="Charger une image ([COST] L$)..." name="Upload Image"/>
+		<menu_item_call label="Charger un son ([COST] L$)..." name="Upload Sound"/>
+		<menu_item_call label="Charger une animation ([COST] L$)..." name="Upload Animation"/>
+		<menu_item_call label="Charger un lot de fichiers ([COST] L$ par fichier)..." name="Bulk Upload"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Fermer la fenêtre" name="Close Window"/>
+		<menu_item_call label="Fermer toutes les fenêtres" name="Close All Windows"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Enregistrer la texture sous..." name="Save Texture As..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Prendre une photo" name="Take Snapshot"/>
+		<menu_item_call label="Enregistrer la photo sur le disque" name="Snapshot to Disk" shortcut="control|shift|X"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Quitter" name="Quit"/>
 	</menu>
 	<menu label="Édition" name="Edit">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-		<menu_item_call label="Annuler" name="Undo" />
-		<menu_item_call label="Recommencer" name="Redo" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="Couper" name="Cut" />
-		<menu_item_call label="Copier" name="Copy" />
-		<menu_item_call label="Coller" name="Paste" />
-		<menu_item_call label="Supprimer" name="Delete" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="Rechercher..." name="Search..." />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="Tout sélectionner" name="Select All" />
-		<menu_item_call label="Désélectionner" name="Deselect" />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu_item_call label="Dupliquer" name="Duplicate" />
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu label="Attacher objet" name="Attach Object" />
-		<menu label="Détacher objet" name="Detach Object" />
+		<menu_item_call label="Annuler" name="Undo"/>
+		<menu_item_call label="Recommencer" name="Redo"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Couper" name="Cut"/>
+		<menu_item_call label="Copier" name="Copy"/>
+		<menu_item_call label="Coller" name="Paste"/>
+		<menu_item_call label="Supprimer" name="Delete"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Rechercher..." name="Search..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Tout sélectionner" name="Select All"/>
+		<menu_item_call label="Désélectionner" name="Deselect"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Dupliquer" name="Duplicate"/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu label="Attacher l&apos;objet" name="Attach Object"/>
+		<menu label="Détacher l&apos;objet" name="Detach Object"/>
 		<menu label="Enlever mes habits" name="Take Off Clothing">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-			<menu_item_call label="Chemise" name="Shirt" />
-			<menu_item_call label="Pantalon" name="Pants" />
-			<menu_item_call label="Chaussures" name="Shoes" />
-			<menu_item_call label="Chaussettes" name="Socks" />
-			<menu_item_call label="Veste" name="Jacket" />
-			<menu_item_call label="Gants" name="Gloves" />
-			<menu_item_call label="Tricot de peau" name="Menu Undershirt" />
-			<menu_item_call label="Sous-vêtements" name="Menu Underpants" />
-			<menu_item_call label="Jupe" name="Skirt" />
-			<menu_item_call label="Tous les habits" name="All Clothes" />
+			<menu_item_call label="Chemise" name="Shirt"/>
+			<menu_item_call label="Pantalon" name="Pants"/>
+			<menu_item_call label="Chaussures" name="Shoes"/>
+			<menu_item_call label="Chaussettes" name="Socks"/>
+			<menu_item_call label="Veste" name="Jacket"/>
+			<menu_item_call label="Gants" name="Gloves"/>
+			<menu_item_call label="Tricot de peau" name="Menu Undershirt"/>
+			<menu_item_call label="Sous-vêtements" name="Menu Underpants"/>
+			<menu_item_call label="Jupe" name="Skirt"/>
+			<menu_item_call label="Tous les habits" name="All Clothes"/>
 		</menu>
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu_item_call label="Gestes..." name="Gestures..." />
-		<menu_item_call label="Profil..." name="Profile..." />
-		<menu_item_call label="Apparence..." name="Appearance..." />
-		<menu_item_separator label="-----------" name="separator7" />
-		<menu_item_check label="Amis..." name="Friends..." />
-		<menu_item_call label="Groupes..." name="Groups..." />
-		<menu_item_separator label="-----------" name="separator8" />
-		<menu_item_call label="Préférences..." name="Preferences..." />
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call label="Gestes..." name="Gestures..."/>
+		<menu_item_call label="Profil..." name="Profile..."/>
+		<menu_item_call label="Apparence..." name="Appearance..."/>
+		<menu_item_separator label="-----------" name="separator7"/>
+		<menu_item_check label="Amis..." name="Friends..."/>
+		<menu_item_call label="Groupes..." name="Groups..."/>
+		<menu_item_separator label="-----------" name="separator8"/>
+		<menu_item_call label="Préférences..." name="Preferences..."/>
 	</menu>
 	<menu label="Affichage" name="View">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-		<menu_item_call label="Vue subjective" name="Mouselook" />
-		<menu_item_check label="Construire" name="Build" />
-		<menu_item_check label="Joystick Flycam" name="Joystick Flycam" />
-		<menu_item_call label="Réinitialiser l&apos;affichage" name="Reset View" />
-		<menu_item_call label="Regarder la dernière personne qui a parlé" name="Look at Last Chatter"
-		     shortcut="alt|V" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_check label="Barre d&apos;outils" name="Toolbar" />
-		<menu_item_check label="Chat local" name="Chat History" />
-		<menu_item_check label="Communiquer" name="Instant Message" />
-		<menu_item_call label="Inventaire" name="Inventory" />
-		<menu_item_check label="Intervenants actifs" name="Active Speakers" />
-		<menu_item_check label="Liste des ignorés" name="Mute List" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_check label="Contrôles de la caméra" name="Camera Controls" />
-		<menu_item_check label="Contrôle des déplacements" name="Movement Controls" />
-		<menu_item_check label="Carte du monde" name="World Map" />
-		<menu_item_check label="Mini-carte" name="Mini-Map" />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_check label="Barre de statistiques" name="Statistics Bar" />
-		<menu_item_check label="Limites de la propriété" name="Property Lines" />
-		<menu_item_check label="Propriétaires fonciers" name="Land Owners" />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu label="Astuces en survol" name="Hover Tips">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-			<menu_item_check label="Afficher les astuces" name="Show Tips" />
-			<menu_item_separator label="-----------" name="separator" />
-			<menu_item_check label="Astuces sur les terrains" name="Land Tips" />
-			<menu_item_check label="Astuces sur tous les objets" name="Tips On All Objects" />
-		</menu>
-		<menu_item_check label="Alt affiche les propriétés physiques" name="Alt Shows Physical" />
-		<menu_item_check label="Voir les objets invisibles" name="Highlight Transparent" />
-		<menu_item_check label="Balises toujours activées" name="Beacons Always On" />
-		<menu label="Balises" name="Beacons">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-			<menu_item_check label="Objets scriptés avec Toucher uniquement"
-			     name="Scripted Objects With Touch Only" />
-			<menu_item_check label="Objets scriptés" name="Scripted Objects" />
-			<menu_item_check label="Objets physiques" name="Physical Objects" />
-			<menu_item_check label="Sources sonores" name="Sound Sources" />
-			<menu_item_check label="Sources des particules" name="Particle Sources" />
-			<menu_item_separator label="-----------" name="separator" />
-			<menu_item_check label="Montrer les surbrillances" name="Render Highlights" />
-			<menu_item_check label="Montrer les balises" name="Render Beacons" />
-			<menu_item_separator label="-----------" name="separator2" />
-			<menu_item_check label="Masquer les particules" name="Hide Particles" />
-			<menu_item_separator label="-----------" name="separator3" />
-			<menu label="Largeur de la balise" name="Beacon Width">
-				<menu_item_call label="1" name="Beacon Width 1" />
-				<menu_item_call label="4" name="Beacon Width 4" />
-				<menu_item_call label="16" name="Beacon Width 16" />
-				<menu_item_call label="32" name="Beacon Width 32" />
-			</menu>
+		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+		<menu_item_call label="Vue subjective" name="Mouselook"/>
+		<menu_item_check label="Construire" name="Build"/>
+		<menu_item_check label="Vue avec le joystick" name="Joystick Flycam"/>
+		<menu_item_call label="Réinitialiser l&apos;affichage" name="Reset View"/>
+		<menu_item_call label="Regarder le dernier intervenant" name="Look at Last Chatter" shortcut="alt|V"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_check label="Barre d&apos;outils" name="Toolbar"/>
+		<menu_item_check label="Chat local" name="Chat History"/>
+		<menu_item_check label="Communiquer" name="Instant Message"/>
+		<menu_item_call label="Inventaire" name="Inventory"/>
+		<menu_item_check label="Intervenants actifs" name="Active Speakers"/>
+		<menu_item_check label="Liste des ignorés" name="Mute List"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_check label="Contrôles de la caméra" name="Camera Controls"/>
+		<menu_item_check label="Contrôle des déplacements" name="Movement Controls"/>
+		<menu_item_check label="Carte du monde" name="World Map"/>
+		<menu_item_check label="Mini-carte" name="Mini-Map"/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_check label="Statistiques" name="Statistics Bar"/>
+		<menu_item_check label="Limites des parcelles" name="Property Lines"/>
+		<menu_item_check label="Propriétaires fonciers" name="Land Owners"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu label="Infobulles" name="Hover Tips">
+			<menu_item_check label="Affichez les astuces" name="Show Tips"/>
+			<menu_item_separator label="-----------" name="separator"/>
+			<menu_item_check label="Astuces sur les terrains" name="Land Tips"/>
+			<menu_item_check label="Astuces sur tous les objets" name="Tips On All Objects"/>
 		</menu>
-		<menu_item_check label="Afficher les éléments HUD" name="Show HUD Attachments" />
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="Zoomer" name="Zoom In" />
-		<menu_item_call label="Zoom par défaut" name="Zoom Default" />
-		<menu_item_call label="Zoomer en arrière" name="Zoom Out" />
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu label="Plus" name="More">
-			<menu_item_call label="Passer en plein écran" name="Toggle Fullscreen" />
-			<menu_item_call label="Définir la taille de l&apos;IU à sa valeur par défaut"
-			     name="Set UI Size to Default" />
-		</menu>
-		<menu_item_call label="Plein écran en mode bascule" name="Toggle Fullscreen" />
-		<menu_item_call label="Taille de l&apos;interface par défaut" name="Set UI Size to Default" />
+		<menu_item_check label="Voir les objets invisibles" name="Highlight Transparent"/>
+		<menu_item_check label="Balises" name="beacons"/>
+		<menu_item_check label="Masquer les particules" name="Hide Particles"/>
+		<menu_item_check label="Afficher les HUD" name="Show HUD Attachments"/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu_item_call label="Zoomer" name="Zoom In"/>
+		<menu_item_call label="Zoom par défaut" name="Zoom Default"/>
+		<menu_item_call label="Zoomer en arrière" name="Zoom Out"/>
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call label="Activer/Quitter le plein écran" name="Toggle Fullscreen"/>
+		<menu_item_call label="Taille de l&apos;interface par défaut" name="Set UI Size to Default"/>
 	</menu>
 	<menu label="Monde" name="World">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-		<menu_item_call label="Chat" name="Chat" />
-		<menu_item_call label="Démarrer geste" name="Start Gesture" />
-		<menu_item_check label="Toujours courir" name="Always Run" />
-		<menu_item_check label="Voler" name="Fly" shortcut="F" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="Créer un repère ici" name="Create Landmark Here" />
-		<menu_item_call label="Définir comme domicile" name="Set Home to Here" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="Téléporter chez moi" name="Teleport Home" />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="Définir comme absent(e)" name="Set Away" />
-		<menu_item_call label="Définir comme occupé(e)" name="Set Busy" />
-		<menu_item_call label="Arrêter toutes les animations" name="Stop All Animations" />
-		<menu_item_call label="Libérer les touches" name="Release Keys" />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu_item_call label="Historique du compte..." name="Account History..." />
-		<menu_item_call label="Gérer mon compte..." name="Manage My Account..." />
-		<menu_item_call label="Acheter des $L..." name="Buy and Sell L$..." />
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="Mon terrain..." name="My Land..." />
-		<menu_item_call label="À propos du terrain..." name="About Land..." />
-		<menu_item_call label="Acheter le terrain..." name="Buy Land..." />
-		<menu_item_call label="Région/Domaine..." name="Region/Estate..." />
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu label="Forcer le soleil" name="Force Sun">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-			<menu_item_call label="Soleil Levant" name="Sunrise" />
-			<menu_item_call label="Midi" name="Noon" />
-			<menu_item_call label="Soleil Couchant" name="Sunset" />
-			<menu_item_call label="Minuit" name="Midnight" />
-			<menu_item_separator label="-----------" name="separator" />
-			<menu_item_call label="Revenir aux valeurs par défaut de la région"
-			     name="Revert to Region Default" />
-		</menu>
-		<menu label="Paramètres de l&apos;environnement" name="Environment Settings">
-			<menu_item_call label="Lever de soleil" name="Sunrise" />
-			<menu_item_call label="Milieu de journée" name="Noon" />
-			<menu_item_call label="Coucher de soleil" name="Sunset" />
-			<menu_item_call label="Minuit" name="Midnight" />
-			<menu_item_call label="Revenir aux options par défaut" name="Revert to Region Default" />
-			<menu_item_separator label="-----------" name="separator" />
-			<menu_item_call label="Éditeur d&apos;environnement" name="Environment Editor" />
+		<menu_item_call label="Chat" name="Chat"/>
+		<menu_item_check label="Toujours courir" name="Always Run"/>
+		<menu_item_check label="Voler" name="Fly" shortcut="F"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Créer un repère ici" name="Create Landmark Here"/>
+		<menu_item_call label="Définir comme domicile" name="Set Home to Here"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Me téléporter chez moi" name="Teleport Home"/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Me mettre absent(e)" name="Set Away"/>
+		<menu_item_call label="Me mettre occupé(e)" name="Set Busy"/>
+		<menu_item_call label="Arrêter mes animations" name="Stop All Animations"/>
+		<menu_item_call label="Reprendre le contrôle" name="Release Keys"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Historique de mon compte..." name="Account History...">
+			<on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=fr" />
+		</menu_item_call>
+		<menu_item_call label="Gérer mon compte..." name="Manage My Account...">
+			<on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=fr" />
+		</menu_item_call>
+		<menu_item_call label="Acheter des L$..." name="Buy and Sell L$..."/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu_item_call label="Mes terrains..." name="My Land..."/>
+		<menu_item_call label="À propos du terrain..." name="About Land..."/>
+		<menu_item_call label="Acheter le terrain..." name="Buy Land..."/>
+		<menu_item_call label="Région et domaine..." name="Region/Estate..."/>
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu label="Environnement" name="Environment Settings">
+			<menu_item_call label="Aube" name="Sunrise"/>
+			<menu_item_call label="Milieu de journée" name="Noon"/>
+			<menu_item_call label="Coucher de soleil" name="Sunset"/>
+			<menu_item_call label="Minuit" name="Midnight"/>
+			<menu_item_call label="Revenir aux options par défaut" name="Revert to Region Default"/>
+			<menu_item_separator label="-----------" name="separator"/>
+			<menu_item_call label="Éditeur d&apos;environnement" name="Environment Editor"/>
 		</menu>
 	</menu>
 	<menu label="Outils" name="Tools">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
 		<menu label="Sélectionner un outil" name="Select Tool">
-			<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-			<menu_item_call label="Mise au point" name="Focus" />
-			<menu_item_call label="Déplacer" name="Move" />
-			<menu_item_call label="Éditer" name="Edit" />
-			<menu_item_call label="Créer" name="Create" />
-			<menu_item_call label="Terrain" name="Land" />
+			<menu_item_call label="Mise au point" name="Focus"/>
+			<menu_item_call label="Déplacer" name="Move"/>
+			<menu_item_call label="Éditer" name="Edit"/>
+			<menu_item_call label="Créer" name="Create"/>
+			<menu_item_call label="Terrain" name="Land"/>
 		</menu>
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_check label="Sélectionner mes objets uniquement" name="Select Only My Objects" />
-		<menu_item_check label="Sélectionner les objets déplaçables uniquement"
-		     name="Select Only Movable Objects" />
-		<menu_item_check label="Sélectionner mes alentours" name="Select By Surrounding" />
-		<menu_item_check label="Afficher la sélection cachée" name="Show Hidden Selection" />
-		<menu_item_check label="Afficher le marquage lumineux de la sélection"
-		     name="Show Light Radius for Selection" />
-		<menu_item_check label="Afficher le faisceau de sélection" name="Show Selection Beam" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_check label="Fixer sur la grille" name="Snap to Grid" />
-		<menu_item_call label="Fixer sur les axes XY de la grille" name="Snap Object XY to Grid" />
-		<menu_item_call label="Utiliser la sélection pour la grille" name="Use Selection for Grid" />
-		<menu_item_call label="Options de la grille..." name="Grid Options..." />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_check label="Modifier les parties liées" name="Edit Linked Parts" />
-		<menu_item_call label="Lier" name="Link" />
-		<menu_item_call label="Délier" name="Unlink" />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="Mise au point sur la sélection" name="Focus on Selection" />
-		<menu_item_call label="Zoom sur la sélection" name="Zoom to Selection" />
-		<menu_item_call label="Acheter l&apos;objet" name="Menu Object Take" />
-		<menu_item_call label="Prendre une copie" name="Take Copy" />
-		<menu_item_call label="Remettre et enregistrer l&apos;objet dans mon inventaire"
-		     name="Save Object Back to My Inventory" />
-		<menu_item_call label="Remettre et enregistrer l&apos;objet dans les Contenus de l&apos;objet"
-		     name="Save Object Back to Object Contents" />
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu_item_call label="Afficher fenêtre d&apos;alertes/erreurs de script"
-		     name="Show Script Warning/Error Window" />
-		<menu_item_call label="Recompiler les scripts dans la sélection"
-		     name="Recompile Scripts in Selection">
-			<menu_item_call label="Mono" name="Mono" />
-			<menu_item_call label="LSL" name="LSL" />
-		</menu_item_call>
-		<menu_item_call label="Réinitialiser les scripts dans la sélection"
-		     name="Reset Scripts in Selection" />
-		<menu_item_call label="Activer les scripts dans la sélection"
-		     name="Set Scripts to Running in Selection" />
-		<menu_item_call label="Désactiver les scripts dans la sélection"
-		     name="Set Scripts to Not Running in Selection" />
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_check label="Sélectionner mes objets uniquement" name="Select Only My Objects"/>
+		<menu_item_check label="Sélectionner les objets déplaçables uniquement" name="Select Only Movable Objects"/>
+		<menu_item_check label="Sélectionner en entourant" name="Select By Surrounding"/>
+		<menu_item_check label="Afficher les parties cachées de la sélection" name="Show Hidden Selection"/>
+		<menu_item_check label="Afficher la sphère de lumière de la sélection" name="Show Light Radius for Selection"/>
+		<menu_item_check label="Afficher le faisceau de sélection" name="Show Selection Beam"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_check label="Aligner sur la grille" name="Snap to Grid"/>
+		<menu_item_call label="Aligner sur les axes XY de la grille" name="Snap Object XY to Grid"/>
+		<menu_item_call label="Utiliser la sélection pour la grille" name="Use Selection for Grid"/>
+		<menu_item_call label="Options de la grille..." name="Grid Options..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_check label="Modifier les parties liées" name="Edit Linked Parts"/>
+		<menu_item_call label="Lier" name="Link"/>
+		<menu_item_call label="Délier" name="Unlink"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Mise au point sur la sélection" name="Focus on Selection"/>
+		<menu_item_call label="Zoom sur la sélection" name="Zoom to Selection"/>
+		<menu_item_call label="Acheter l&apos;objet" name="Menu Object Take"/>
+		<menu_item_call label="Prendre une copie" name="Take Copy"/>
+		<menu_item_call label="Remplacer l&apos;objet dans mon inventaire" name="Save Object Back to My Inventory"/>
+		<menu_item_call label="Remplacer l&apos;objet dans le contenu de l&apos;objet" name="Save Object Back to Object Contents"/>
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call label="Afficher la fenêtre d&apos;alertes/erreurs de script" name="Show Script Warning/Error Window"/>
+		<menu label="Recompiler les scripts dans la sélection" name="Recompile Scripts in Selection">
+			<menu_item_call label="Mono" name="Mono"/>
+			<menu_item_call label="LSL" name="LSL"/>
+		</menu>
+		<menu_item_call label="Réinitialiser les scripts dans la sélection" name="Reset Scripts in Selection"/>
+		<menu_item_call label="Activer les scripts dans la sélection" name="Set Scripts to Running in Selection"/>
+		<menu_item_call label="Désactiver les scripts dans la sélection" name="Set Scripts to Not Running in Selection"/>
 	</menu>
 	<menu label="Aide" name="Help">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-		<menu_item_call label="Aide Second Life" name="Second Life Help" />
-		<menu_item_call label="Base de connaissances…" name="Knowledge Base..." />
-		<menu_item_call label="Aide en ligne" name="Live Help..." />
-		<menu_item_call label="Didacticiel" name="Tutorial" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="Blog officiel des Linden..." name="Official Linden Blog..." />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="Guide de scripting..." name="Scripting Guide..." />
-		<menu_item_call label="Scripting Wiki..." name="Scripting Wiki..." />
-		<menu_item_call label="Portail de scripting..." name="Scripting Portal..." />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="Message du jour..." name="Message of the Day..." />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu_item_call label="Signaler une infraction..." name="Report Abuse..." />
-		<menu_item_call label="Collisions, coups et bousculades…"
-		     name="Bumps, Pushes &amp;amp; Hits..." />
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="Signaler un bug..." name="Report Bug..." />
-		<menu_item_call label="Notes de version…" name="Release Notes..." />
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu_item_call label="Calcul du lag" name="Lag Meter" />
-		<menu_item_separator label="-----------" name="separator7" />
+		<menu_item_call label="Aide Second Life" name="Second Life Help"/>
+		<menu_item_call label="Didacticiel" name="Tutorial"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Blog officiel des Lindens..." name="Official Linden Blog..."/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Portail pour l&apos;écriture de scripts..." name="Scripting Portal..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Signaler une infraction..." name="Report Abuse..."/>
+		<menu_item_call label="Collisions, coups et bousculades…" name="Bumps, Pushes &amp;amp; Hits..."/>
+		<menu_item_call label="Mesure du lag" name="Lag Meter"/>
+		<menu_item_separator label="-----------" name="separator7"/>
 		<menu label="Signaler des bugs" name="Bug Reporting">
-			<menu_item_call label="Suivi des problèmes..." name="Public Issue Tracker..." />
-			<menu_item_call label="Aide au suivi des problèmes..." name="Publc Issue Tracker Help..." />
-			<menu_item_separator label="-----------" name="separator7" />
-			<menu_item_call label="Comment signaler des bugs ?" name="Bug Reporing 101..." />
-			<menu_item_call label="Problèmes de sécurité..." name="Security Issues..." />
-			<menu_item_call label="Wiki Assurance Qualité…" name="QA Wiki..." />
-			<menu_item_separator label="-----------" name="separator9" />
-			<menu_item_call label="Signaler un bug..." name="Report Bug..." />
+			<menu_item_call label="Ouvrir un JIRA..." name="Public Issue Tracker..."/>
+			<menu_item_call label="Comment utiliser JIRA ?" name="Publc Issue Tracker Help..."/>
+			<menu_item_separator label="-----------" name="separator7"/>
+			<menu_item_call label="Comment signaler des bugs ?" name="Bug Reporing 101..."/>
+			<menu_item_call label="Comment signaler un problème de sécurité ?" name="Security Issues...">
+				<on_click name="SecurityIssues_url" userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
+			</menu_item_call>
+			<menu_item_call label="Wiki Assurance Qualité…" name="QA Wiki..."/>
+			<menu_item_separator label="-----------" name="separator9"/>
+			<menu_item_call label="Signaler un bug..." name="Report Bug..."/>
 		</menu>
-		<menu_item_call label="À propos de Second Life..." name="About Second Life..." />
+		<menu_item_call label="À propos de Second Life..." name="About Second Life..."/>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/fr/mime_types.xml b/indra/newview/skins/default/xui/fr/mime_types.xml
index 3e5c96d148..5b8b7ca2fb 100644
--- a/indra/newview/skins/default/xui/fr/mime_types.xml
+++ b/indra/newview/skins/default/xui/fr/mime_types.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <mimetypes name="default">
 	<widgetset name="web">
 		<label name="web_label">
 			Contenu web
 		</label>
 		<tooltip name="web_tooltip">
-			Il y a du contenu web à cet endroit
+			Cette parcelle propose du contenu multimédia
 		</tooltip>
 		<playtip name="web_playtip">
 			Afficher le contenu web
@@ -35,7 +35,7 @@
 			Image
 		</label>
 		<tooltip name="image_tooltip">
-			Il y a une image ici
+			Cette parcelle contient une image
 		</tooltip>
 		<playtip name="image_playtip">
 			Afficher l&apos;image qui se trouve ici
@@ -46,7 +46,7 @@
 			Audio
 		</label>
 		<tooltip name="audio_tooltip">
-			Il y a du contenu audio ici
+			Cette parcelle propose du contenu audio
 		</tooltip>
 		<playtip name="audio_playtip">
 			Jouer le contenu audio qui se trouve ici
diff --git a/indra/newview/skins/default/xui/fr/panel_audio_device.xml b/indra/newview/skins/default/xui/fr/panel_audio_device.xml
index 8663fe1947..7ca53b7c0d 100644
--- a/indra/newview/skins/default/xui/fr/panel_audio_device.xml
+++ b/indra/newview/skins/default/xui/fr/panel_audio_device.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="device_settings">
 	<text name="Audio Devices">
 		Matériel audio
@@ -7,16 +7,15 @@
 		Périphérique d&apos;entrée (micro) :
 	</text>
 	<text name="Output device (speakers):">
-		Périphérique de sortie (speakers) :
+		Périphérique de sortie (haut-parleurs) :
 	</text>
 	<text name="Input level:">
 		Volume d&apos;entrée
 	</text>
 	<text_editor name="voice_intro_text1">
-		Pour que les autres résidents vous entendent plus ou moins fort, utilisez le curseur. Pour tester le volume d&apos;entrée, il vous suffit de parler dans le micro.
+		Pour que les autres résidents vous entendent plus ou moins fort, utilisez le curseur. Pour tester le volume, parlez dans le micro.
 	</text_editor>
-	<volume_slider name="mic_volume_slider"
-	     tool_tip="Réglez le volume à l&apos;aide de ce curseur." />
+	<volume_slider name="mic_volume_slider" tool_tip="Réglez le volume avec ce curseur."/>
 	<text name="wait_text">
 		Veuillez patienter
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_friends.xml b/indra/newview/skins/default/xui/fr/panel_friends.xml
index f553287928..e43305b89e 100644
--- a/indra/newview/skins/default/xui/fr/panel_friends.xml
+++ b/indra/newview/skins/default/xui/fr/panel_friends.xml
@@ -1,29 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="friends">
 	<string name="Multiple">
 		Amis multiples...
 	</string>
-	<scroll_list name="friend_list"
-	     tool_tip="Pour sélectionner plusieurs amis, cliquez en maintenant la touche Maj ou Ctrl appuyée">
-		<column name="icon_online_status" tool_tip="Statut en ligne" />
-		<column label="Nom" name="friend_name" tool_tip="Nom" />
-		<column name="icon_visible_online"
-		     tool_tip="Vos amis voient si vous êtes connecté(e)" />
-		<column name="icon_visible_map" tool_tip="Vos amis peuvent vous situer sur la carte" />
-		<column name="icon_edit_mine"
-		     tool_tip="Vos amis peuvent modifier, supprimer ou prendre vos objets" />
-		<column name="icon_edit_theirs" tool_tip="Vous pouvez modifier les objets de cet ami" />
+	<scroll_list name="friend_list" tool_tip="Pour sélectionner plusieurs amis, cliquez en maintenant la touche Maj ou Ctrl appuyée">
+		<column name="icon_online_status" tool_tip="Statut en ligne"/>
+		<column label="Nom" name="friend_name" tool_tip="Nom"/>
+		<column name="icon_visible_online" tool_tip="Vos amis voient si vous êtes connecté(e)"/>
+		<column name="icon_visible_map" tool_tip="Vos amis peuvent vous situer sur la carte"/>
+		<column name="icon_edit_mine" tool_tip="Vos amis peuvent modifier, supprimer ou prendre vos objets"/>
+		<column name="icon_edit_theirs" tool_tip="Vous pouvez modifier les objets de cet ami"/>
 	</scroll_list>
-	<button label="IM/Appel" name="im_btn"
-	     tool_tip="Ouvrez une session de messagerie instantanée" />
-	<button label="Profil" name="profile_btn"
-	     tool_tip="Affichez une photo, vos groupes et autres infos" />
-	<button label="Téléporter..." name="offer_teleport_btn"
-	     tool_tip="Proposez à cet ami d&apos;être téléporté là où vous êtes" />
-	<button label="Payer..." name="pay_btn"
-	     tool_tip="Donnez des dollars Linden ($L) à cet ami" />
-	<button label="Supprimer..." name="remove_btn"
-	     tool_tip="Supprimez cette personne de votre liste d&apos;amis" />
-	<button label="Ajouter..." name="add_btn"
-	     tool_tip="Demandez à un résident de devenir votre ami" />
+	<button label="IM/Appel" name="im_btn" tool_tip="Ouvrez une session de messagerie instantanée"/>
+	<button label="Profil" name="profile_btn" tool_tip="Affichez une photo, vos groupes et autres infos"/>
+	<button label="Téléporter..." name="offer_teleport_btn" tool_tip="Proposez à cet ami d&apos;être téléporté là où vous êtes"/>
+	<button label="Payer..." name="pay_btn" tool_tip="Donnez des L$ à cet ami"/>
+	<button label="Supprimer..." name="remove_btn" tool_tip="Supprimez cette personne de votre liste d&apos;amis"/>
+	<button label="Ajouter..." name="add_btn" tool_tip="Demandez à un résident de devenir votre ami"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_general.xml b/indra/newview/skins/default/xui/fr/panel_group_general.xml
index 16e9890a80..b1ace4577f 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_general.xml
@@ -1,37 +1,33 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Général" name="general_tab">
 	<text name="help_text">
-		L&apos;onglet Général contient des infos générales sur le groupe, une liste des propriétaires et des membres visibles, les préférences relatives au groupe ainsi que différentes options concernant les membres.
+		L&apos;onglet Général contient les infos générales et les préférences du groupe ainsi que la liste des propriétaires et des membres visibles.
 
-Pour obtenir de l&apos;aide, survolez les options avec votre souris.
 	</text>
 	<string name="group_info_unchanged">
-		Les infos générales du groupe ont changé.
+		Le profil du groupe a changé.
 	</string>
-	<button label="?" label_selected="?" name="help_button" />
+	<button label="?" label_selected="?" name="help_button"/>
 	<line_editor label="Saisissez le nom du groupe ici" name="group_name_editor">
-		Entrez le nom de votre nouveau groupe ici
+		Saisissez le nom du groupe ici
 	</line_editor>
 	<text name="group_name">
 		Saisissez le nom du groupe ici
 	</text>
 	<text name="prepend_founded_by">
-		Fondé par
-	</text>
-	<text name="founder_name">
+		Fondé par </text>
+	<text name="founder_name" left_delta="54">
 		(en attente)
 	</text>
 	<text name="group_charter_label">
 		Charte du groupe
 	</text>
-	<texture_picker label="Emblème du groupe" name="insignia"
-	     tool_tip="Cliquez pour sélectionner une image" />
+	<texture_picker label="Logo du groupe" name="insignia" tool_tip="Cliquez pour sélectionner une image"/>
 	<text_editor name="charter">
-		Charte du groupe
+		Indiquez ici la charte de votre groupe
 	</text_editor>
-	<button label="Rejoindre (0$L)" label_selected="Rejoindre (0$L)" name="join_button" />
-	<button label="Affichage détaillé" label_selected="Affichage détaillé"
-	     name="info_button" />
+	<button label="Rejoindre (0L$)" label_selected="Rejoindre (0L$)" name="join_button"/>
+	<button label="Affichage détaillé" label_selected="Affichage détaillé" name="info_button"/>
 	<text>
 		Propriétaires et membres visibles
 	</text>
@@ -50,54 +46,44 @@ Pour obtenir de l&apos;aide, survolez les options avec votre souris.
 		<column label="Dernière connexion" name="online" relwidth="0.35"/>
 	</name_list>
 	<text name="text_group_preferences">
-		Préférences du groupe
+		Préférences
 	</text>
 	<text name="incomplete_member_data_str">
 		Extraction des données du résident en cours
 	</text>
 	<text name="confirm_group_create_str">
-		La création de ce groupe coûte 100 $L. 
-Êtes-vous vraiment certain de vouloir dépenser 100 $L pour créer ce groupe ?
-Sachez que si personne ne rejoint ce groupe sous 48h, il sera démantelé et ne pourra plus être utilisé à l&apos;avenir.
+		La création de ce groupe coûte 100 L$. 
+Êtes-vous vraiment certain de vouloir dépenser 100 L$ pour créer ce groupe ?
+Sachez que si personne ne rejoint ce groupe sous 48h, il sera démantelé et ne pourra plus être utilisé.
 	</text>
 	<text>
-		Préférences du Groupe
+		Préférences
 	</text>
 	<panel name="preferences_container">
-		<check_box label="Afficher dans la recherche" name="show_in_group_list"
-		     tool_tip="Afficher ce groupe dans les résultats de recherche." />
-		<check_box label="Publier sur le web" name="publish_on_web"
-		     tool_tip="Cochez pour publier les informations de ce groupe sur le web." />
-		<check_box label="Inscription libre" name="open_enrollement"
-		     tool_tip="Indique si une invitation est nécessaire pour devenir membre de ce groupe." />
-		<check_box label="Frais d&apos;inscription : $L" name="check_enrollment_fee"
-		     tool_tip="Indique s&apos;il y a des frais d&apos;inscription pour devenir membre." />
-		<spinner name="spin_enrollment_fee"
-		     tool_tip="Lorsque la case Frais d&apos;inscription est cochée, cela signifie qu&apos;il faut payer des frais pour devenir membre." />
-		<check_box label="Adulte" name="mature"
-		     tool_tip="Cochez si les informations de votre groupe sont à caractère adulte." />
-		<combo_box width="195" name="group_mature_check"
-		     tool_tip="Indique si les informations de votre groupe sont considérées comme étant réservées aux adultes.">
-			<combo_item name="select_mature" >
-				- Sélectionner Pour adultes -
+		<check_box label="Afficher dans la recherche" name="show_in_group_list" tool_tip="Afficher ce groupe dans les résultats de recherche."/>
+		<check_box label="Publier sur le web" name="publish_on_web" tool_tip="Cochez pour publier les informations de ce groupe sur le web."/>
+		<check_box label="Inscription libre" name="open_enrollement" tool_tip="Indique si une invitation est nécessaire pour devenir membre de ce groupe."/>
+		<check_box label="Frais d&apos;inscription : L$" name="check_enrollment_fee" tool_tip="Indique s&apos;il y a des frais d&apos;inscription pour devenir membre."/>
+		<spinner name="spin_enrollment_fee" tool_tip="Si la case Frais d&apos;inscription est cochée, cela signifie qu&apos;il faut payer des frais pour devenir membre."/>
+		<check_box label="Adulte" name="mature" tool_tip="Cochez si les informations de votre groupe sont à caractère adulte."/>
+		<combo_box name="group_mature_check" tool_tip="Indique si les informations de votre groupe sont considérées comme étant réservées aux adultes." width="195">
+			<combo_item name="select_mature">
+				- Type de public -
 			</combo_item>
 			<combo_item name="mature">
-				Contenu pour adultes
+				Adulte
 			</combo_item>
 			<combo_item name="not_mature">
-				Contenu non réservé aux adultes
+				Tout public
 			</combo_item>
 		</combo_box>
 		<panel name="title_container">
 			<text name="active_title_label">
 				Mon titre actuel
 			</text>
-			<combo_box name="active_title"
-			     tool_tip="Définit le titre qui apparaît près du nom de votre avatar lorsque ce groupe est actif." />
+			<combo_box name="active_title" tool_tip="Définit le titre qui apparaît près du nom de votre avatar lorsque ce groupe est actif."/>
 		</panel>
-		<check_box label="Recevoir des notes de groupe" name="receive_notices"
-		     tool_tip="Définit si vous souhaitez recevoir les notes envoyées au groupe.  Décochez si ce groupe vous envoie des spams." />
-		<check_box label="Afficher dans mon profil" name="list_groups_in_profile"
-		     tool_tip="Indique si vous voulez que ce groupe apparaisse dans votre profil" />
+		<check_box label="Recevoir les notices" name="receive_notices" tool_tip="Cochez si vous souhaitez recevoir les notices envoyées au groupe. Décochez si ce groupe vous envoie des spams."/>
+		<check_box label="Afficher dans mon profil" name="list_groups_in_profile" tool_tip="Indique si vous voulez que ce groupe apparaisse dans votre profil"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_invite.xml b/indra/newview/skins/default/xui/fr/panel_group_invite.xml
index e989fa0e0a..68c5a22ebf 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_invite.xml
@@ -1,30 +1,27 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Inviter un membre" name="invite_panel">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Inviter un résident" name="invite_panel">
 	<text>
 		Vous pouvez sélectionner plusieurs résidents
 à inviter dans votre groupe. Cliquez sur &apos;Ouvrir 
 le Sélecteur de Personnes&apos; pour commencer.
 	</text>
 	<text name="help_text">
-		Vous pouvez inviter plusieurs résidents. 
-Cliquez sur Sélecteur 
-de personnes pour commencer.
+		Vous pouvez inviter plusieurs résidents.
+Pour commencer, cliquez sur
+Choisir un résident.
 	</text>
-	<button label="Sélecteur de personnes" name="add_button" tool_tip="" />
-	<name_list name="invitee_list"
-	     tool_tip="Pour sélectionner plusieurs noms, maintenez la touche Ctrl enfoncée en cliquant sur le nom des résidents." />
-	<button label="Supprimer de la liste" name="remove_button"
-	     tool_tip="Supprime les résidents sélectionnés de la liste des invités." />
+	<button label="Choisir un résident" name="add_button" tool_tip=""/>
+	<name_list name="invitee_list" tool_tip="Pour sélectionner plusieurs noms, maintenez la touche Ctrl enfoncée en cliquant sur le nom des résidents."/>
+	<button label="Supprimer de la liste" name="remove_button" tool_tip="Supprime les résidents sélectionnés de la liste des invités."/>
 	<text>
-		Choisissez le Rôle à leur attribuer :
+		Assignez-leur un rôle :
 	</text>
 	<text name="role_text">
 		Assignez-leur un rôle :
 	</text>
-	<combo_box name="role_name"
-	     tool_tip="Choisissez des rôles à assigner aux membres dans la liste." />
-	<button label="Envoyer des invitations" name="ok_button" />
-	<button label="Annuler" name="cancel_button" />
+	<combo_box name="role_name" tool_tip="Choisissez des rôles à assigner aux membres dans la liste."/>
+	<button label="Envoyer les invitations" name="ok_button"/>
+	<button label="Annuler" name="cancel_button"/>
 	<string name="confirm_invite_owner_str">
 		Etes-vous certain de vouloir inviter un/de nouveau(x) propriétaire(s) ? Ce choix est permanent !
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
index 17beac23f4..1267689bd3 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
@@ -1,42 +1,43 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Terrain &amp; $L" name="land_money_tab">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Terrain et L$" name="land_money_tab">
 	<text name="help_text">
-		Les parcelles appartenant au groupe apparaissent avec les détails des contributions.  Un avertissement apparaîtra tant que le Total du terrain utilisé sera inférieur ou égal aux Contributions totales.  Les onglets Planification, Détails et Ventes fournissent des détails sur les finances du groupe.
+		Les parcelles appartenant au groupe sont indiquées avec le détail des contributions. Un avertissement apparaît si la surface utilisée par le groupe est supérieure ou égale au total des contributions. Les onglets Planification, Détails et Ventes correspondent aux finances du groupe.
 	</text>
-	<button label="?" name="help_button" />
+	<button label="?" name="help_button"/>
 	<text name="cant_view_group_land_text">
 		Vous n&apos;avez pas la permission de voir quel terrain possède ce groupe.
 	</text>
 	<text name="cant_view_group_accounting_text">
-		Vous n&apos;avez pas la permission d&apos;accéder aux informations financières de ce groupe.
+		Vous n&apos;avez pas la permission d&apos;accéder aux informations
+financières de ce groupe.
 	</text>
 	<string name="loading_txt">
-		Chargement en cours...
+		Chargement...
 	</string>
 	<text name="group_land_heading">
 		Terrain du groupe
 	</text>
 	<scroll_list name="group_parcel_list">
-		<column label="Nom de la parcelle" name="name" />
-		<column label="Région" name="location" />
-		<column label="Surface" name="area" />
-		<column label="" name="hidden" />
+		<column label="Nom de la parcelle" name="name"/>
+		<column label="Région" name="location"/>
+		<column label="Surface" name="area"/>
+		<column label="" name="hidden"/>
 	</scroll_list>
-	<button label="Voir sur la carte" label_selected="Voir sur la carte" name="map_button" />
+	<button label="Voir sur la carte" label_selected="Voir sur la carte" name="map_button"/>
 	<text name="total_contributed_land_label">
-		Contributions totales :
+		Total des contributions :
 	</text>
 	<text name="total_contributed_land_value">
 		[AREA] m²
 	</text>
 	<text name="total_land_in_use_label">
-		Total du terrain utilisé :
+		Superficie déjà utilisée :
 	</text>
 	<text name="total_land_in_use_value">
 		[AREA] m²
 	</text>
 	<text name="land_available_label">
-		Terrain disponible :
+		Superficie disponible :
 	</text>
 	<text name="land_available_value">
 		[AREA] m²
@@ -58,7 +59,7 @@
 charge le terrain utilisé.
 	</text>
 	<text name="group_money_heading">
-		$L du groupe
+		Finances
 	</text>
 	<tab_container name="group_money_tab_container">
 		<panel label="Planification" name="group_money_planning_tab">
@@ -70,19 +71,15 @@ charge le terrain utilisé.
 			<text_editor name="group_money_details_text">
 				Calcul en cours...
 			</text_editor>
-			<button label="&lt; Plus tôt" label_selected="&lt; Plus tôt"
-			     name="earlier_details_button" tool_tip="Reculer dans le temps" />
-			<button label="Plus tard &gt;" label_selected="Plus tard &gt;"
-			     name="later_details_button" tool_tip="Avancer dans le temps" />
+			<button label="&lt; Plus tôt" label_selected="&lt; Plus tôt" name="earlier_details_button" tool_tip="Reculer dans le temps"/>
+			<button label="Plus tard &gt;" label_selected="Plus tard &gt;" name="later_details_button" tool_tip="Avancer dans le temps"/>
 		</panel>
 		<panel label="Ventes" name="group_money_sales_tab">
 			<text_editor name="group_money_sales_text">
 				Calcul en cours...
 			</text_editor>
-			<button label="&lt; Plus tôt" label_selected="&lt; Plus tôt"
-			     name="earlier_sales_button" tool_tip="Reculer dans le temps" />
-			<button label="Plus tard &gt;" label_selected="Plus tard &gt;"
-			     name="later_sales_button" tool_tip="Avancer dans le temps" />
+			<button label="&lt; Plus tôt" label_selected="&lt; Plus tôt" name="earlier_sales_button" tool_tip="Reculer dans le temps"/>
+			<button label="Plus tard &gt;" label_selected="Plus tard &gt;" name="later_sales_button" tool_tip="Avancer dans le temps"/>
 		</panel>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_notices.xml b/indra/newview/skins/default/xui/fr/panel_group_notices.xml
index a0658399de..d89c4313b5 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_notices.xml
@@ -1,70 +1,64 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Notes" name="notices_tab">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Notices" name="notices_tab">
 	<text name="help_text">
-		Les notes vous permettent d&apos;envoyer des messages et pièces-jointes à tous les membres du groupe en même temps. Ces messages ne sont envoyés qu&apos;aux membres dont le rôle les autorise à recevoir des notes. Vous pouvez désactiver les notes à l&apos;onglet Général.
+		Les notices vous permettent d&apos;envoyer des messages et pièces-jointes aux membres du groupe autorisés à les recevoir. Vous pouvez désactiver la réception des notices à l&apos;onglet Général.
 	</text>
 	<text name="no_notices_text">
-		Aucune note précédemment envoyée.
+		Aucune notice
 	</text>
-	<button label="?" label_selected="?" name="help_button" />
+	<button label="?" label_selected="?" name="help_button"/>
 	<text name="lbl">
-		Archive des notes du groupe
+		Anciennes notices du groupe
 	</text>
 	<text name="lbl2">
-		Les notes sont conservées pendant 14 jours. Cliquez sur la note que vous
-voulez afficher. Pour voir si vous avez reçu de nouvelles notes, cliquez sur
-Rafraîchir. Chaque groupe a une limite quotidienne de 200 notes.
+		Double-cliquez sur une notice pour l'afficher. Les notices sont conservées
+pendant 14 jours et chaque groupe a une limite quotidienne de 200 notices.
 	</text>
 	<scroll_list name="notice_list">
-		<column label="" name="icon" />
-		<column label="Sujet" name="subject" />
-		<column label="De" name="from" />
-		<column label="Date" name="date" />
+		<column label="" name="icon"/>
+		<column label="Sujet" name="subject"/>
+		<column label="De" name="from"/>
+		<column label="Date" name="date"/>
 	</scroll_list>
 	<text name="notice_list_none_found">
 		Aucun résultat.
 	</text>
-	<button label="Créer une note" label_selected="Créer une note"
-	     name="create_new_notice" />
-	<button label="Rafraîchir" label_selected="Rafraîchir la liste"
-	     name="refresh_notices" />
-	<panel label="Créer une note" name="panel_create_new_notice">
+	<button label="Créer une notice" label_selected="Créer une notice" name="create_new_notice"/>
+	<button label="Rafraîchir" label_selected="Rafraîchir la liste" name="refresh_notices"/>
+	<panel label="Créer une notice" name="panel_create_new_notice">
 		<text name="lbl">
-			Créer une note
+			Créer une notice
 		</text>
 		<text name="lbl2">
-			Pour envoyer une note, vous devez saisir un sujet. Pour joindre
-une pièce-jointe à cette note, faites-la glisser depuis votre 
+			Pour envoyer une notice, saisissez un sujet. Pour joindre
+une pièce-jointe à cette notice, faites-la glisser depuis votre 
 inventaire vers cette fenêtre. Les pièces-jointes doivent être
 copiables et transférables. Il n&apos;est pas possible d&apos;envoyer de
 dossiers.
 		</text>
-		<text name="lbl3" bottom_delta="-79" >
+		<text bottom_delta="-79" name="lbl3" left="20">
 			Sujet :
 		</text>
-		<line_editor name="create_subject" width="346" />
-		<text name="lbl4">
+		<line_editor name="create_subject" width="331" left_delta="61"/>
+		<text name="lbl4" left="20">
 			Message :
 		</text>
-		<text_editor bottom_delta="-90" height="104" name="create_message" />
-		<text name="lbl5">
-			Attacher :
+		<text_editor name="create_message" bottom_delta="-90" height="104" left_delta="61" width="330"/>
+		<text name="lbl5" width="68">
+			Pièce-jointe :
 		</text>
-		<line_editor name="create_inventory_name" width="206" />
-		<button label="Supprimer pièce-jointe" label_selected="Supprimer pièce-jointe"
-		     name="remove_attachment" left="274" width="140"/>
-		<button label="Envoyer note" label_selected="Envoyer note" name="send_notice" left="274" width="140"/>
-		<panel name="drop_target2"
-		     tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice." />
-		<panel name="drop_target"
-		     tool_tip="Pour joindre un objet de l&apos;inventaire à la note, faites-le glisser dans la boîte de message. Pour envoyer l&apos;objet avec la note, vous devez avoir la permission de le copier et de le transférer." />
+		<line_editor name="create_inventory_name" width="190" left_delta="74"/>
+		<button label="Supprimer pièce-jointe" label_selected="Supprimer pièce-jointe" left="274" name="remove_attachment" width="140"/>
+		<button label="Envoyer la notice" label_selected="Envoyer la notice" left="274" name="send_notice" width="140"/>
+		<panel name="drop_target2" tool_tip="Pour joindre un objet de l&apos;inventaire à la notice, faites-le glisser dans la boîte de message. Pour envoyer l&apos;objet avec la notice, vous devez avoir la permission de le copier et de le transférer."/>
+		<panel name="drop_target" tool_tip="Pour joindre un objet de l&apos;inventaire à la notice, faites-le glisser dans la boîte de message. Pour envoyer l&apos;objet avec la notice, vous devez avoir la permission de le copier et de le transférer."/>
 	</panel>
-	<panel label="Voir ancienne note" name="panel_view_past_notice">
+	<panel label="Voir ancienne notice" name="panel_view_past_notice">
 		<text name="lbl">
-			Note archivée
+			Détails
 		</text>
 		<text name="lbl2">
-			Pour envoyer une nouvelle note, cliquez sur Créer une note ci-dessus.
+			Pour envoyer une nouvelle notice, cliquez sur Créer une notice ci-dessus.
 		</text>
 		<text name="lbl3">
 			Sujet :
@@ -72,8 +66,7 @@ dossiers.
 		<text name="lbl4">
 			Message :
 		</text>
-		<button label="Ouvrir pièce-jointe" label_selected="Ouvrir pièce-jointe"
-		     name="open_attachment" width="118" />
-		<line_editor left="128" name="view_inventory_name" width="256" />
+		<button label="Ouvrir pièce-jointe" label_selected="Ouvrir pièce-jointe" name="open_attachment" width="118"/>
+		<line_editor left="128" name="view_inventory_name" width="256"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_roles.xml b/indra/newview/skins/default/xui/fr/panel_group_roles.xml
index ab32917054..84e2e5e01e 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_roles.xml
@@ -1,23 +1,22 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Membres et rôles" name="roles_tab">
 	<text name="default_needs_apply_text">
 		Certains changements n&apos;ont pas été appliqués sur ce sous-onglet.
 	</text>
 	<text name="want_apply_text">
-		Voulez-vous les appliquer ?
+		Voulez-vous enregistrer les modifications ?
 	</text>
 	<text name="cant_delete_role">
-		Les Rôles &apos;Tout le monde&apos; et &apos;Propriétaires&apos; sont particuliers, et ne peuvent être supprimés.
+		Les Rôles Tout le monde et Propriétaires sont spéciaux et ne peuvent être supprimés.
 	</text>
-	<button label="?" name="help_button" />
+	<button label="?" name="help_button"/>
 	<panel name="members_header">
 		<text name="static">
-			Membres et rôles
+			Membres
 		</text>
 		<text name="static2">
-			Chaque membre reçoit un rôle auquel sont associés certains pouvoirs. Ces
-paramètres peuvent être facilement personnalisés, ce qui permet une
-meilleure organisation et plus de flexibilité.
+			Les rôles de chaque membre peuvent être personnalisés, ce qui permet une
+meilleure organisation du groupe.
 		</text>
 	</panel>
 	<panel name="roles_header">
@@ -32,7 +31,7 @@ description et le titre du membre.
 			Sélectionnez un rôle ci-dessous pour en connaître les propriétés, les
 membres et les pouvoirs.
 		</text>
-		<text name="role_actions_modifiable" bottom_delta="-28">
+		<text bottom_delta="-28" name="role_actions_modifiable">
 			Vous pouvez aussi assigner des pouvoirs au rôle.
 		</text>
 		<text name="role_actions_not_modifiable">
@@ -48,52 +47,51 @@ membres et les pouvoirs.
 quels membres ces pouvoirs sont assignés.
 		</text>
 	</panel>
-	<tab_container name="roles_tab_container" height="164">
-		<panel label="Membres" name="members_sub_tab" tool_tip="Membres" height="148">
-			<line_editor bottom="127" name="search_text" />
-			<button label="Rechercher" name="search_button" width="75" />
-			<button label="Afficher tout" name="show_all_button" left_delta="80" />
-			<name_list name="member_list" height="104" bottom_delta="-105">
-				<column label="Nom du membre" name="name" />
-				<column label="Terrain donné" name="donated" width="116"/>
+	<tab_container height="164" name="roles_tab_container">
+		<panel height="148" label="Membres" name="members_sub_tab" tool_tip="Membres">
+			<line_editor bottom="127" name="search_text"/>
+			<button label="Rechercher" name="search_button" width="75"/>
+			<button label="Afficher tout" left_delta="80" name="show_all_button"/>
+			<name_list bottom_delta="-105" height="104" name="member_list">
+				<column label="Nom du membre" name="name"/>
+				<column label="Surface donnée" name="donated" width="116"/>
 				<column label="Dernière connexion" name="online" width="136"/>
 			</name_list>
-			<button label="Inviter nouvelle personne..." name="member_invite" width="165"/>
-			<button label="Expulser du groupe" name="member_eject" />
+			<button label="Inviter un nouveau membre" name="member_invite" width="165"/>
+			<button label="Expulser un membre" name="member_eject"/>
 			<text name="help_text">
 				Vous pouvez ajouter ou supprimer les rôles assignés aux membres.
 Pour sélectionner plusieurs membres, cliquez sur leurs noms en maintenant la touche Ctrl enfoncée.
 			</text>
 		</panel>
-		<panel label="Rôles" name="roles_sub_tab" height="148">
-		<line_editor bottom="127" name="search_text" />
+		<panel height="148" label="Rôles" name="roles_sub_tab">
+			<line_editor bottom="127" name="search_text"/>
 			<button label="Rechercher" name="search_button" width="75"/>
-			<button label="Afficher tout" name="show_all_button" left_delta="80"/>
-			<scroll_list name="role_list" height="104" bottom_delta="-104">
-				<column label="Nom du rôle" name="name" />
-				<column label="Titre" name="title" />
-				<column label="Membres" name="members" />
+			<button label="Afficher tout" left_delta="80" name="show_all_button"/>
+			<scroll_list bottom_delta="-104" height="104" name="role_list">
+				<column label="Nom du rôle" name="name"/>
+				<column label="Titre" name="title"/>
+				<column label="Membres" name="members"/>
 			</scroll_list>
-			<button label="Créer un rôle..." name="role_create" />
-			<button label="Supprimer le rôle" name="role_delete" />
+			<button label="Créer un rôle..." name="role_create"/>
+			<button label="Supprimer le rôle" name="role_delete"/>
 			<text name="help_text">
-				Chaque rôle a un titre et une liste des pouvoirs assignés aux membres. Chaque membre peut avoir un ou plusieurs rôles. Un groupe peut avoir jusqu&apos;à 10 rôles, y compris les rôles Tous et Propriétaires.
+				Chaque rôle possède un titre et des pouvoirs. Un membre peut avoir plusieurs rôles mais il ne peut y avoir que 10 rôles dans un groupe, Visiteur et Propriétaire inclus.
 			</text>
 			<string name="cant_delete_role">
 				Les rôles Tous et Propriétaires sont spéciaux et ne peuvent pas être supprimés.
 			</string>
 		</panel>
-		<panel label="Pouvoirs" name="actions_sub_tab" height="148">
-			<line_editor bottom="127" name="search_text" />
+		<panel height="148" label="Pouvoirs" name="actions_sub_tab">
+			<line_editor bottom="127" name="search_text"/>
 			<button label="Rechercher" name="search_button" width="75"/>
-			<button label="Afficher tout" name="show_all_button" left_delta="80"/>
-			<scroll_list name="action_list"
-			     tool_tip="Sélectionnez un pouvoir pour en afficher les détails." height="118" bottom_delta="-120">
-				<column label="" name="icon" />
-				<column label="" name="action" />
+			<button label="Afficher tout" left_delta="80" name="show_all_button"/>
+			<scroll_list bottom_delta="-120" height="118" name="action_list" tool_tip="Sélectionnez un pouvoir pour en afficher les détails.">
+				<column label="" name="icon"/>
+				<column label="" name="action"/>
 			</scroll_list>
 			<text name="help_text">
-				Lorsqu&apos;un membre a des pouvoirs, il peut faire un certain nombre de choses dans le groupe. Il existe un grand nombre de pouvoirs.
+				Les pouvoirs déterminent les facultés de chaque membre dans le groupe.
 			</text>
 		</panel>
 	</tab_container>
@@ -105,13 +103,12 @@ Pour sélectionner plusieurs membres, cliquez sur leurs noms en maintenant la to
 			Pouvoirs attribués
 		</text>
 		<scroll_list name="member_assigned_roles">
-			<column label="" name="checkbox" />
-			<column label="" name="role" />
+			<column label="" name="checkbox"/>
+			<column label="" name="role"/>
 		</scroll_list>
-		<scroll_list name="member_allowed_actions"
-		     tool_tip="Pour avoir des détails sur chacun des pouvoirs attribués, allez à l&apos;onglet Pouvoirs.">
-			<column label="" name="icon" />
-			<column label="" name="action" />
+		<scroll_list name="member_allowed_actions" tool_tip="Pour avoir des détails sur chacun des pouvoirs attribués, allez à l&apos;onglet Pouvoirs.">
+			<column label="" name="icon"/>
+			<column label="" name="action"/>
 		</scroll_list>
 	</panel>
 	<panel name="roles_footer">
@@ -136,17 +133,14 @@ Pour sélectionner plusieurs membres, cliquez sur leurs noms en maintenant la to
 		<text name="static4">
 			Membres assignés
 		</text>
-		<text name="static5"
-		     tool_tip="Une liste des pouvoirs auquel le rôle sélectionné a accès.">
+		<text name="static5" tool_tip="Une liste des pouvoirs auquel le rôle sélectionné a accès.">
 			Pouvoirs attribués
 		</text>
-		<check_box label="Les membres sont &#10;visibles" name="role_visible_in_list"
-		     tool_tip="Définit si les membres de ce rôle sont visibles à partir de l&apos;onglet Général aux personnes en dehors du groupe." />
-		<scroll_list name="role_allowed_actions"
-		     tool_tip="Pour avoir des détails sur chacun des pouvoirs attribués, allez à l&apos;onglet Pouvoirs.">
-			<column label="" name="icon" />
-			<column label="" name="checkbox" />
-			<column label="" name="action" />
+		<check_box label="Membres visibles" name="role_visible_in_list" tool_tip="Définit si les membres de ce rôle sont visibles à partir de l&apos;onglet Général aux personnes en dehors du groupe."/>
+		<scroll_list name="role_allowed_actions" tool_tip="Pour avoir des détails sur chacun des pouvoirs attribués, allez à l&apos;onglet Pouvoirs.">
+			<column label="" name="icon"/>
+			<column label="" name="checkbox"/>
+			<column label="" name="action"/>
 		</scroll_list>
 	</panel>
 	<panel name="actions_footer">
@@ -154,13 +148,13 @@ Pour sélectionner plusieurs membres, cliquez sur leurs noms en maintenant la to
 			Description
 		</text>
 		<text_editor name="action_description">
-			Ce pouvoir permet d&apos; « expulser les membres de ce groupe ». Seul un propriétaire peut expulser un autre propriétaire.
+			Ce pouvoir permet d&apos;expulser des membres du groupe. Seul un propriétaire peut expulser un autre propriétaire.
 		</text_editor>
 		<text name="static2">
-			Rôles avec pouvoirs
+			Rôles avec ce pouvoir
 		</text>
 		<text name="static3">
-			Membres avec pouvoirs
+			Membres avec ce pouvoir
 		</text>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_groups.xml b/indra/newview/skins/default/xui/fr/panel_groups.xml
index dda643e0e8..c64ce9e3cc 100644
--- a/indra/newview/skins/default/xui/fr/panel_groups.xml
+++ b/indra/newview/skins/default/xui/fr/panel_groups.xml
@@ -1,18 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="groups">
-	<scroll_list bottom="50" name="group list" />
-	<text name="groupdesc" bottom="16" height="32" width="268">
-		Le groupe dans lequel vous êtes actif en ce moment
-est en gras.
+	<scroll_list bottom="50" name="group list"/>
+	<text bottom="16" height="32" name="groupdesc" width="268">
+		Le groupe actif est en gras.
 	</text>
-	<text name="groupcount" bottom="3" >
-		Vous appartenez à [COUNT] groupes (sur [MAX] maximum).
+	<text bottom="3" name="groupcount">
+		Vous appartenez à [COUNT] groupes ([MAX] max).
 	</text>
-	<button label="IM/Appel" name="IM"
-	     tool_tip="Ouvrir une session de messagerie instantanée" />
-	<button label="Infos" name="Info" />
-	<button label="Activer" name="Activate" />
-	<button label="Quitter" name="Leave" />
-	<button label="Créer..." name="Create" />
-	<button label="Rechercher..." name="Search..." />
+	<button label="IM/Appel" name="IM" tool_tip="Ouvrir une session de messagerie instantanée"/>
+	<button label="Infos" name="Info"/>
+	<button label="Activer" name="Activate"/>
+	<button label="Quitter" name="Leave"/>
+	<button label="Créer..." name="Create"/>
+	<button label="Rechercher..." name="Search..."/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_login.xml b/indra/newview/skins/default/xui/fr/panel_login.xml
index 3d2fa684f6..a61a0a773f 100644
--- a/indra/newview/skins/default/xui/fr/panel_login.xml
+++ b/indra/newview/skins/default/xui/fr/panel_login.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_login">
 	<string name="forgot_password_url">
 		http://secondlife.com/account/request.php
@@ -17,7 +17,7 @@
 	</text>
 	<combo_box name="start_location_combo">
 		<combo_item name="MyHome">
-			Mon domicile
+			Domicile
 		</combo_item>
 		<combo_item name="MyLastLocation">
 			Dernier emplacement
@@ -29,16 +29,14 @@
 			&lt;Nom de la région&gt;
 		</combo_item>
 	</combo_box>
-	<check_box label="Enregistrer le mot de passe" name="remember_check" />
+	<check_box label="Mémoriser" name="remember_check"/>
 	<text name="full_screen_text">
 		Le plein écran sera activé après identification.
 	</text>
-	<button label="Nouveau Compte..." label_selected="Nouveau Compte..."
-	     name="new_account_btn" />
-	<button label="Me connecter" label_selected="Me connecter" name="connect_btn" />
-	<button label="Préférences..." label_selected="Préférences..."
-	     name="preferences_btn" />
-	<button label="Quitter" label_selected="Quitter" name="quit_btn" />
+	<button label="Nouveau Compte..." label_selected="Nouveau Compte..." name="new_account_btn"/>
+	<button label="Me connecter" label_selected="Me connecter" name="connect_btn"/>
+	<button label="Préférences..." label_selected="Préférences..." name="preferences_btn"/>
+	<button label="Quitter" label_selected="Quitter" name="quit_btn"/>
 	<text name="version_text">
 		1.23.4 (5)
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
index de044f11bd..d89a47dba0 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -1,66 +1,59 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat écrit" name="chat">
-	<text type="string" length="1" name="text_box">
+	<text length="1" name="text_box" type="string">
 		Taille de la police 
 du chat :
 	</text>
 	<radio_group name="chat_font_size">
-		<radio_item type="string" length="1" name="radio">
+		<radio_item length="1" name="radio" type="string">
 			Petite
 		</radio_item>
-		<radio_item type="string" length="1" name="radio2">
+		<radio_item length="1" name="radio2" type="string">
 			Moyenne
 		</radio_item>
-		<radio_item type="string" length="1" name="radio3">
+		<radio_item length="1" name="radio3" type="string">
 			Grande
 		</radio_item>
 	</radio_group>
-	<text type="string" length="1" name="text_box2">
+	<text length="1" name="text_box2" type="string">
 		Couleur du chat :
 	</text>
-	<color_swatch label="Vous" name="user" />
-	<color_swatch label="Les autres" name="agent" width="60" />
-	<color_swatch label="IM" left_delta="64" name="im" />
-	<color_swatch label="Système" name="system" />
-	<color_swatch label="Erreurs" name="script_error" />
-	<color_swatch label="Objets" name="objects" />
-	<color_swatch label="Propriétaire" name="owner" width="60" />
-	<color_swatch label="Bulle" left_delta="64" name="background" />
-	<color_swatch label="URL" name="links" />
-	<text type="string" length="1" name="text_box3">
+	<color_swatch label="Vous" name="user"/>
+	<color_swatch label="Avatars" name="agent" width="60"/>
+	<color_swatch label="IM" left_delta="64" name="im"/>
+	<color_swatch label="Système" name="system"/>
+	<color_swatch label="Erreurs" name="script_error"/>
+	<color_swatch label="Objets" name="objects"/>
+	<color_swatch label="Propriétaire" name="owner" width="60"/>
+	<color_swatch label="Bulle" left_delta="64" name="background"/>
+	<color_swatch label="URL" name="links"/>
+	<text length="1" name="text_box3" type="string">
 		Console du chat :
 	</text>
-	<spinner label="Effacer le texte après" label_width="112" name="fade_chat_time"
-	     width="162" />
-	<text type="string" length="1" left="313" name="text_box4">
+	<spinner label="Effacer le texte après" label_width="112" name="fade_chat_time" width="162"/>
+	<text left="313" length="1" name="text_box4" type="string">
 		s
 	</text>
-	<spinner left="335" name="max_chat_count" />
-	<text type="string" length="1" left="397" name="text_box5" width="74">
-		(nb de lignes)
+	<spinner left="335" name="max_chat_count"/>
+	<text left="397" length="1" name="text_box5" type="string" width="74">
+		lignes
 	</text>
-	<slider label="Opacité" name="console_opacity" />
-	<text type="string" length="1" name="text_box6">
+	<slider label="Opacité" name="console_opacity"/>
+	<text length="1" name="text_box6" type="string">
 		Options du chat :
 	</text>
-	<check_box label="Utiliser la largeur du plein écran (redémarrage requis)"
-	     name="chat_full_width_check" />
-	<check_box label="Fermer le chat après avoir appuyé sur Entrée"
-	     name="close_chat_on_return_check" />
-	<check_box label="Faire bouger l&apos;avatar avec les touches de direction"
-	     name="arrow_keys_move_avatar_check" />
-	<check_box label="Afficher les marques temporelles dans le chat local"
-	     name="show_timestamps_check" />
-	<check_box label="Montrer lorsque vous écrivez pendant la discussion"
-	     name="play_typing_animation" />
-	<text type="string" length="1" name="text_box7">
+	<check_box label="Utiliser la largeur de l&apos;écran (redémarrage requis)" name="chat_full_width_check"/>
+	<check_box label="Fermer le chat après avoir appuyé sur Entrée" name="close_chat_on_return_check"/>
+	<check_box label="Faire bouger l&apos;avatar avec les touches de direction" name="arrow_keys_move_avatar_check"/>
+	<check_box label="Afficher les heures dans le chat" name="show_timestamps_check"/>
+	<check_box label="Jouer l&apos;animation clavier quand vous écrivez" name="play_typing_animation"/>
+	<text length="1" name="text_box7" type="string">
 		Bulles de chat  :
 	</text>
-	<check_box label="Afficher les bulles de chat" name="bubble_text_chat" />
-	<slider label="Opacité" name="bubble_chat_opacity" />
-	<text type="string" length="1" name="text_box8">
+	<check_box label="Afficher les bulles de chat" name="bubble_text_chat"/>
+	<slider label="Opacité" name="bubble_chat_opacity"/>
+	<text length="1" name="text_box8" type="string">
 		Erreurs de script :
 	</text>
-	<check_box label="Afficher les erreurs et avertissements comme chat ordinaire"
-	     name="script_errors_as_chat" />
+	<check_box label="Afficher les erreurs dans le chat" name="script_errors_as_chat"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
index 34d3bda81c..7c1986a21f 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Général" name="general_panel">
-	<combo_box name="location_combobox" width="166">
-		<combo_item name="MyHome">
-			Mon domicile
-		</combo_item>
-		<combo_item name="MyLastLocation">
-			Mon dernier emplacement
-		</combo_item>
-	</combo_box>
-	<check_box label="Afficher le lieu de départ sur l&apos;écran de connexion"
-	     name="show_location_checkbox" />
+	<radio_group name="default_start_location" width="166">
+		<radio_item name="MyHome" tool_tip="Par défaut, choisir mon domicile comme lieu de départ.">
+			Domicile
+		</radio_item>
+		<radio_item name="MyLastLocation" tool_tip="Par défaut, choisir mon dernier emplacement comme lieu de départ.">
+			Dernier emplacement
+		</radio_item>
+	</radio_group>
+	<check_box label="Afficher le lieu de départ sur l&apos;écran de connexion" name="show_location_checkbox"/>
 	<combo_box name="fade_out_combobox" width="166">
 		<combo_item name="Never">
 			Jamais
@@ -21,79 +20,56 @@
 			Toujours
 		</combo_item>
 	</combo_box>
-	<check_box label="Masquer mon nom sur mon écran" name="show_my_name_checkbox" />
+	<check_box label="Nom des avatars en petit" name="small_avatar_names_checkbox"/>
+	<check_box label="Masquer mon nom sur mon écran" name="show_my_name_checkbox"/>
 	<text name="group_titles_textbox">
 		Titres de groupe :
 	</text>
-	<check_box label="Masquer tous les titres de groupe"
-	     name="show_all_title_checkbox" />
-	<check_box label="Masquer mon titre de groupe" name="show_my_title_checkbox" />
-	<check_box label="Nom de l&apos;avatar en petit" name="small_avatar_names_checkbox" />
-	<check_box label="M&apos;avertir lorsque mes amis se connectent"
-	     name="friends_online_notify_checkbox" />
+	<check_box label="Masquer tous les titres de groupe" name="show_all_title_checkbox"/>
+	<check_box label="Masquer mon titre de groupe" name="show_my_title_checkbox"/>
+	<color_swatch label="" name="effect_color_swatch" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs"/>
 	<text name="UI Size:">
 		Taille de l&apos;interface :
 	</text>
-	<check_box label="Utiliser une échelle indépendante de la résolution"
-	     name="ui_auto_scale" />
-	<check_box label="Faire pivoter la mini-carte" name="rotate_mini_map_checkbox" />
-	<check_box label="M&apos;avertir lorsque je dépense ou reçois des dollars Linden ($L)"
-	     name="notify_money_change_checkbox" />
-	<check_box label="Détecter carte graphique au prochain démarrage"
-	     name="probe_hardware_checkbox"
-	     tool_tip="Second Life configure automatiquement certains réglages de la carte graphique d&apos;après votre configuration matérielle. Nous vous recommandons d&apos;effectuer la détection à chaque nouvelle installation de matériel." />
-	<check_box label="Utiliser le sélecteur de couleur par défaut"
-	     name="use_system_color_picker_checkbox"
-	     tool_tip="Utiliser le sélecteur de couleur par défaut au lieu de celui intégré à Second Life." />
-	<check_box label="Afficher la boîte de recherche en haut à droite de l&apos;écran"
-	     name="show_search_panel"
-	     tool_tip="Affiche la boîte de recherche incorporée." />
-	<text type="string" length="1" name="start_location_textbox">
+	<slider name="ui_scale_slider"/>
+	<check_box label="Utiliser une échelle indépendante de la résolution" name="ui_auto_scale"/>
+	<spinner label="Absent(e) après :" name="afk_timeout_spinner"/>
+	<check_box label="Pivoter la mini-carte" name="rotate_mini_map_checkbox"/>
+	<check_box label="M&apos;avertir lorsque je dépense ou reçois des L$" name="notify_money_change_checkbox"/>
+	<check_box label="Utiliser le sélecteur de couleur par défaut" name="use_system_color_picker_checkbox" tool_tip="Utiliser le sélecteur de couleur par défaut au lieu de celui intégré à Second Life."/>
+	<check_box label="Afficher la boîte de recherche en haut à droite de l&apos;écran" name="show_search_panel" tool_tip="Affiche la boîte de recherche incorporée."/>
+	<text length="1" name="start_location_textbox" type="string">
 		Lieu de départ :
 	</text>
-	<text type="string" length="1" name="show_names_textbox">
+	<text length="1" name="show_names_textbox" type="string">
 		Afficher les noms :
 	</text>
-	<text type="string" length="1" name="effects_color_textbox">
-		Couleur de mes effets :
+	<text bottom="-174" length="1" name="effects_color_textbox" type="string">
+		Couleur du faisceau &#10;de sélection :
 	</text>
-	<text type="string" length="1" name="seconds_textbox">
+	<text length="1" name="seconds_textbox" type="string">
 		secondes
 	</text>
-	<text type="string" length="1" name="crash_report_textbox">
+	<text length="1" name="crash_report_textbox" type="string">
 		Rapports de crash :
 	</text>
-	<text type="string" length="1" name="language_textbox">
+	<text length="1" name="language_textbox" type="string">
 		Langue :
 	</text>
-	<text type="string" length="1" left_delta="313" name="language_textbox2">
-		(nécessite un redémarrage)
+	<text left_delta="313" length="1" name="language_textbox2" type="string">
+		(redémarrage requis)
 	</text>
-	<radio_group name="fade_out_radio">
-		<radio_item type="string" length="1" name="Never">
-			Jamais
-		</radio_item>
-		<radio_item type="string" length="1" name="Temporarily">
-			Temporairement
-		</radio_item>
-		<radio_item type="string" length="1" name="Always">
-			Toujours
-		</radio_item>
-	</radio_group>
-	<color_swatch label="" name="effect_color_swatch"
-	     tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" />
-	<spinner label="Absent(e) après :" name="afk_timeout_spinner" />
-	<text name="region_name_prompt">
+	<string name="region_name_prompt">
 		&lt;Saisissez le nom de la région&gt;
-	</text>
+	</string>
 	<combo_box name="crash_behavior_combobox" width="166">
-		<combo_item type="string" length="1" name="Askbeforesending">
+		<combo_item length="1" name="Askbeforesending" type="string">
 			Demander avant d&apos;envoyer
 		</combo_item>
-		<combo_item type="string" length="1" name="Alwayssend">
+		<combo_item length="1" name="Alwayssend" type="string">
 			Toujours envoyer
 		</combo_item>
-		<combo_item type="string" length="1" name="Neversend">
+		<combo_item length="1" name="Neversend" type="string">
 			Ne jamais envoyer
 		</combo_item>
 	</combo_box>
@@ -101,31 +77,39 @@
 		<combo_item name="System Default Language">
 			Choix par défaut
 		</combo_item>
-		<combo_item type="string" length="1" name="English">
-			Anglais
+		<combo_item length="1" name="English" type="string">
+			English (Anglais)
+		</combo_item>
+		<combo_item length="1" name="Danish" type="string">
+			Dansk (Danois) - Bêta
 		</combo_item>
-		<combo_item type="string" length="1" name="Deutsch(German)">
+		<combo_item length="1" name="Deutsch(German)" type="string">
 			Deutsch (Allemand) - Bêta
 		</combo_item>
+		<combo_item name="Spanish">
+			Español (Espagnol) - Bêta
+		</combo_item>
 		<combo_item name="French">
 			Français - Bêta
 		</combo_item>
-		<combo_item type="string" length="1" name="(Japanese)">
-			日本語 (Japonais) - Bêta
+		<combo_item name="Hungarian">
+			Magyar (Hongrois) - Bêta
 		</combo_item>
-		<combo_item type="string" length="1" name="(Korean)">
-			한국어 (Coréen) - Bêta
-		</combo_item>
-		<combo_item type="string" length="1" name="Chinese">
-			汉语/漢語 (Chinois) - Bêta
+		<combo_item name="Polish">
+			Polski (Polonais) - Bêta
 		</combo_item>
 		<combo_item name="Portugese">
 			Portugués (Portugais) - Bêta
 		</combo_item>
-		<combo_item name="Spanish">
-			Español (Espagnol) - Bêta
+		<combo_item length="1" name="Chinese" type="string">
+			汉语/漢語 (Chinois) - Bêta
+		</combo_item>
+		<combo_item length="1" name="(Japanese)" type="string">
+			日本語 (Japonais) - Bêta
+		</combo_item>
+		<combo_item length="1" name="(Korean)" type="string">
+			한국어 (Coréen) - Bêta
 		</combo_item>
 	</combo_box>
-	<check_box label="Partager la langue avec les objets" name="language_is_public"
-	     tool_tip="Cette option permet de faire connaître aux objets du Monde votre langue favorite." />
+	<check_box label="Partager la langue avec les objets" name="language_is_public" tool_tip="Cette option permet de faire connaître aux objets du Monde votre langue favorite."/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
index bf2b336b92..0892db463e 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Graphiques" name="Display panel">
-	<button label="?" name="GraphicsPreferencesHelpButton" />
+	<button label="?" name="GraphicsPreferencesHelpButton"/>
 	<text_editor bottom="-56" height="40" left="25" name="FullScreenInfo" width="460">
-		Si cette option n&apos;est pas cochée, le visualisateur prend tout l&apos;écran lorsque vous êtes connecté(e).
+		Décochez cette option pour passer en mode plein écran.
 	</text_editor>
 	<text name="WindowSizeLabel">
 		Taille de la fenêtre :
@@ -31,42 +31,42 @@
 		Rapport hauteur/largeur :
 	</text>
 	<combo_box name="aspect_ratio" tool_tip="largeur/hauteur">
-		<combo_item type="string" length="1" name="4:3(StandardCRT)">
+		<combo_item length="1" name="4:3(StandardCRT)" type="string">
 			4:3 (Standard CRT)
 		</combo_item>
-		<combo_item type="string" length="1" name="5:4(1280x1024LCD)">
+		<combo_item length="1" name="5:4(1280x1024LCD)" type="string">
 			5:4 (1280 x 1024 LCD)
 		</combo_item>
 		<combo_item name="8:5(Widescreen)">
-			8 : 5 (écran large)
+			8:5 (écran large)
 		</combo_item>
-		<combo_item type="string" length="1" name="16:9(Widescreen)">
+		<combo_item length="1" name="16:9(Widescreen)" type="string">
 			16:9 (plein écran)
 		</combo_item>
 	</combo_box>
-	<text type="string" length="1" name="text">
+	<text length="1" name="text" type="string">
 		Résolution d&apos;affichage :
 	</text>
-	<text type="string" length="1" name="Fullscreen Aspect Ratio:">
+	<text length="1" name="Fullscreen Aspect Ratio:" type="string">
 		Format de plein écran :
 	</text>
-	<text type="string" length="1" name="(width / height)">
+	<text length="1" name="(width / height)" type="string">
 		(largeur / hauteur)
 	</text>
-	<text type="string" length="1" name="UI Size:">
+	<text length="1" name="UI Size:" type="string">
 		Taille de l&apos;IU :
 	</text>
-	<text type="string" length="1" name="(meters, lower is faster)">
+	<text length="1" name="(meters, lower is faster)" type="string">
 		(mètres, moins = plus rapide)
 	</text>
-	<text type="string" length="1" name="text2">
+	<text length="1" name="text2" type="string">
 		Options d&apos;affichage :
 	</text>
-	<check_box label="Lancer Second Life dans une fenêtre" name="windowed mode" />
-	<check_box label="Auto-détection du ratio" left="350" name="aspect_auto_detect" />
-	<check_box label="Utiliser échelle de résolution indépendante" name="ui_auto_scale" />
-	<check_box label="Montrer l&apos;avatar en mode Mouselook" name="avfp" />
-	<spinner label="Draw Distance :" name="draw_distance" />
+	<check_box label="Lancer Second Life en mode fenêtré" name="windowed mode"/>
+	<check_box label="Auto-détection du ratio" left="350" name="aspect_auto_detect"/>
+	<check_box label="Utiliser échelle de résolution indépendante" name="ui_auto_scale"/>
+	<check_box label="Montrer l&apos;avatar en vue subjective" name="avfp"/>
+	<spinner label="Distance d&apos;affichage :" name="draw_distance"/>
 	<text name="HigherText">
 		Qualité et
 	</text>
@@ -91,28 +91,27 @@
 	<text bottom="-86" left="325" name="HigherText2">
 		Plus élevée
 	</text>
-	<text name="QualityText2" visible="false" />
-	<check_box label="Personnaliser" left="395" name="CustomSettings" />
+	<text name="QualityText2" visible="false"/>
+	<check_box label="Personnaliser" left="395" name="CustomSettings"/>
 	<text name="ShadersText">
-		Shaders :
+		Effets :
 	</text>
-	<check_box label="Placage de relief et brillance" name="BumpShiny" />
-	<check_box label="Shaders de base" name="BasicShaders"
-	     tool_tip="Désactiver cette option peut empêcher certains drivers de cartes graphiques de planter." />
-	<check_box label="Shaders atmosphériques" name="WindLightUseAtmosShaders" />
-	<check_box label="Reflets de l&apos;eau" name="Reflections" />
+	<check_box label="Placage de relief et brillance" name="BumpShiny"/>
+	<check_box label="Effets de base" name="BasicShaders" tool_tip="Désactiver cette option peut empêcher certains drivers de cartes graphiques de planter."/>
+	<check_box label="Effets atmosphériques" name="WindLightUseAtmosShaders"/>
+	<check_box label="Reflets de l&apos;eau" name="Reflections"/>
 	<text name="ReflectionDetailText">
-		Détails des reflets :
+		Objets reflétés :
 	</text>
 	<radio_group name="ReflectionDetailRadio">
 		<radio_item name="0">
 			Terrain et Arbres
 		</radio_item>
 		<radio_item name="1">
-			Tous les objets statiques
+			Objets statiques
 		</radio_item>
 		<radio_item name="2">
-			Tous les objets et avatars
+			Objets et avatars
 		</radio_item>
 		<radio_item name="3">
 			Tout
@@ -121,27 +120,27 @@
 	<text name="AvatarRenderingText">
 		Rendu de l&apos;avatar :
 	</text>
-	<check_box label="Avatars éloignés en 2D" name="AvatarImpostors" />
-	<check_box label="Rendu matériel des skins" name="AvatarVertexProgram" />
-	<check_box label="Habit de l&apos;avatar" name="AvatarCloth" />
+	<check_box label="Avatars éloignés en 2D" name="AvatarImpostors"/>
+	<check_box label="Accélération du rendu" name="AvatarVertexProgram"/>
+	<check_box label="Mouvement des habits" name="AvatarCloth"/>
 	<text name="DrawDistanceMeterText1">
 		m
 	</text>
 	<text name="DrawDistanceMeterText2">
 		m
 	</text>
-	<slider label="Distance d&apos;affichage :" name="DrawDistance" />
-	<slider label="Nombre de particules max. :" label_width="143" name="MaxParticleCount" />
-	<slider label="Qualité post-traitement :" name="RenderPostProcess" />
+	<slider label="Limite d&apos;affichage :" name="DrawDistance"/>
+	<slider label="Nombre de particules max. :" label_width="143" name="MaxParticleCount"/>
+	<slider label="Qualité post-traitement :" name="RenderPostProcess"/>
 	<text name="MeshDetailText">
-		Détails du maillage :
-	</text>
-	<slider label="  Objets :" name="ObjectMeshDetail" />
-	<slider label="  Flexiprims :" name="FlexibleMeshDetail" />
-	<slider label="  Arbres :" name="TreeMeshDetail" />
-	<slider label="  Avatars :" name="AvatarMeshDetail" />
-	<slider label="  Terrain :" name="TerrainMeshDetail" />
-	<slider label="  Ciel :" name="SkyMeshDetail" />
+		Détails des rendus :
+	</text>
+	<slider label="  Objets :" name="ObjectMeshDetail"/>
+	<slider label="  Flexiprims :" name="FlexibleMeshDetail"/>
+	<slider label="  Arbres :" name="TreeMeshDetail"/>
+	<slider label="  Avatars :" name="AvatarMeshDetail"/>
+	<slider label="  Relief :" name="TerrainMeshDetail"/>
+	<slider label="  Ciel :" name="SkyMeshDetail"/>
 	<text name="PostProcessText">
 		Faible
 	</text>
@@ -164,7 +163,7 @@
 		Faible
 	</text>
 	<text name="LightingDetailText">
-		Détails de la lumière :
+		Sources lumineuses :
 	</text>
 	<radio_group name="LightingDetailRadio">
 		<radio_item name="SunMoon">
@@ -175,7 +174,7 @@
 		</radio_item>
 	</radio_group>
 	<text left="380" name="TerrainDetailText">
-		Détails du terrain :
+		Rendu du terrain :
 	</text>
 	<radio_group name="TerrainDetailRadio">
 		<radio_item name="0">
@@ -185,9 +184,8 @@
 			Élevé
 		</radio_item>
 	</radio_group>
-	<button label="Paramètres recommandés" name="Defaults" />
-	<button label="Configuration du matériel" label_selected="Configuration du matériel"
-	     name="GraphicsHardwareButton" />
+	<button label="Paramètres recommandés" name="Defaults"/>
+	<button label="Configuration du matériel" label_selected="Configuration du matériel" name="GraphicsHardwareButton"/>
 	<text name="resolution_format">
 		[RES_X] x [RES_Y]
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
index ff258d482a..37a129811e 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Règlement" name="Covenant">
-	<text name="covenant_help_text">
-		Les changements apportés au règlement apparaîtront sur toutes les parcelles du domaine.
+	<text name="covenant_help_text" bottom="-25">
+		Les changements apportés au règlement apparaîtront sur toutes les
+parcelles du domaine.
 	</text>
-	<text name="region_name_lbl">
+	<text name="region_name_lbl" bottom_delta="-31">
 		Région :
 	</text>
 	<text name="region_name_text">
 		(inconnue)
 	</text>
-	<text name="estate_name_lbl">
+	<text name="estate_name_lbl" bottom_delta="-19">
 		Domaine :
 	</text>
 	<text name="estate_name_text">
@@ -20,7 +21,7 @@
 	</text>
 	<button label="?" name="covenant_help" />
 	<button label="Redéfinir" name="reset_covenant" />
-	<text name="estate_owner_lbl">
+	<text name="estate_owner_lbl" bottom_delta="-19">
 		Propriétaire :
 	</text>
 	<text name="estate_owner_text">
@@ -33,7 +34,7 @@
 		Le terrain acheté dans cette région peut être fusionné/divisé ou pas.
 	</text>
 	<text_editor name="covenant_editor">
-		Chargement en cours...
+		Chargement...
 	</text_editor>
 	<text name="can_resell">
 		Le terrain acheté dans cette région peut être revendu.
diff --git a/indra/newview/skins/default/xui/fr/panel_region_debug.xml b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
index d001191e9e..07a4d5d012 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Débugger" name="Debug">
 	<text name="region_text_lbl">
 		Région :
@@ -6,46 +6,35 @@
 	<text name="region_text">
 		(inconnue)
 	</text>
-	<check_box label="Désactiver les scripts" name="disable_scripts_check"
-	     tool_tip="Désactiver tous les scripts dans cette région" />
-	<button label="?" name="disable_scripts_help" />
-	<check_box label="Désactiver les collisions" name="disable_collisions_check"
-	     tool_tip="Désactiver les collisions entre non-avatars dans cette région" />
-	<button label="?" name="disable_collisions_help" />
-	<check_box label="Désactiver les propriétés physiques" name="disable_physics_check"
-	     tool_tip="Désactiver toutes les propriétés physiques dans cette région" />
-	<button label="?" name="disable_physics_help" />
-	<button label="Appliquer" name="apply_btn" />
+	<check_box label="Désactiver les scripts" name="disable_scripts_check" tool_tip="Désactiver tous les scripts dans cette région"/>
+	<button label="?" name="disable_scripts_help"/>
+	<check_box label="Désactiver les collisions" name="disable_collisions_check" tool_tip="Désactiver les collisions entre non-avatars dans cette région"/>
+	<button label="?" name="disable_collisions_help"/>
+	<check_box label="Désactiver les propriétés &#10;physiques" name="disable_physics_check" tool_tip="Désactiver toutes les propriétés physiques dans cette région"/>
+	<button label="?" name="disable_physics_help"/>
+	<button label="Appliquer" name="apply_btn" bottom_delta="-38"/>
+	<text name="objret_text_lbl" bottom_delta="-42">
+		Renvoi de l&apos;objet
+	</text>
+	<text name="resident_text_lbl">
+		Résident :
+	</text>
 	<line_editor name="target_avatar_name">
 		(aucun)
 	</line_editor>
-	<button label="Choisir..." name="choose_avatar_btn" />
-	<button
-	     label="Renvoyer les objets scriptés de l&apos;avatar vers une propriété tierce"
-	     name="return_scripted_other_land_btn" />
-	<button label="Renvoyer TOUS les objets scriptés de l&apos;avatar"
-	     name="return_scripted_all_btn" />
-	<check_box label="Ne renvoyer que les objets avec des scripts" name="return_scripts"
-	     tool_tip="Ne renvoyer que les objets avec des scripts." />
-	<check_box
-	     label="Ne renvoyer que les objets sur le terrain de quelqu&apos;un d&apos;autre"
-	     name="return_other_land"
-	     tool_tip="Ne renvoyer que les objets se trouvant sur le terrain de quelqu&apos;un d&apos;autre" />
-	<check_box label="Renvoyer les objets dans toutes les régions de ce domaine"
-	     name="return_estate_wide"
-	     tool_tip="Renvoyer les objets dans toutes les régions qui constituent ce domaine" />
-	<button label="Renvoyer" name="return_btn" />
-	<button label="Afficher les objets souvent responsables de collision..."
-	     name="top_colliders_btn"
-	     tool_tip="Liste des objets avec le plus de collisions potentielles" />
-	<button label="?" name="top_colliders_help" />
-	<button label="Afficher les objets exécutant le plus de scripts..."
-	     name="top_scripts_btn"
-	     tool_tip="Liste des objets qui passent le plus de temps à exécuter des scripts" />
-	<button label="?" name="top_scripts_help" />
-	<button label="Redémarrer la région" name="restart_btn"
-	     tool_tip="Redémarrer la région au bout de 2 minutes" />
-	<button label="?" name="restart_help" />
-	<button label="Retarder le redémarrage" name="cancel_restart_btn"
-	     tool_tip="Retarder le redémarrage de la région d&apos;une heure" />
+	<button label="Choisir..." name="choose_avatar_btn"/>
+	<text name="options_text_lbl">
+		Options :
+	</text>
+	<check_box label="Ne renvoyer que les objets avec des scripts" name="return_scripts" tool_tip="Ne renvoyer que les objets avec des scripts."/>
+	<check_box label="Ne renvoyer que les objets sur le terrain de quelqu&apos;un d&apos;autre" name="return_other_land" tool_tip="Ne renvoyer que les objets se trouvant sur le terrain de quelqu&apos;un d&apos;autre"/>
+	<check_box label="Renvoyer les objets dans toutes les régions de ce domaine" name="return_estate_wide" tool_tip="Renvoyer les objets dans toutes les régions qui constituent ce domaine"/>
+	<button label="Renvoyer" name="return_btn"/>
+	<button label="Afficher les objets souvent responsables de collision..." name="top_colliders_btn" tool_tip="Liste des objets avec le plus de collisions potentielles" width="320"/>
+	<button label="?" name="top_colliders_help" left="337"/>
+	<button label="Afficher les objets exécutant le plus de scripts..." name="top_scripts_btn" tool_tip="Liste des objets qui passent le plus de temps à exécuter des scripts" width="320"/>
+	<button label="?" name="top_scripts_help" left="337"/>
+	<button label="Redémarrer la région" name="restart_btn" tool_tip="Redémarrer la région au bout de 2 minutes" width="160"/>
+	<button label="?" name="restart_help" left="177" />
+	<button label="Retarder le redémarrage" name="cancel_restart_btn" tool_tip="Retarder le redémarrage de la région d&apos;une heure" width="160"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
index f4585a8237..475339dd92 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Domaine" name="Estate">
-	<text name="estate_help_text">
-		Les changements apportés aux paramètres de cet onglet auront des répercussions sur toutes les régions du domaine.
+	<text name="estate_help_text" bottom="-34">
+		Les changements apportés aux paramètres
+de cet onglet auront des répercussions sur
+toutes les régions du domaine.
 	</text>
-	<text name="estate_text">
+	<text name="estate_text" bottom_delta="-34">
 		Domaine :
 	</text>
 	<text name="estate_name">
@@ -16,63 +18,61 @@
 		(inconnu)
 	</text>
 	<text name="Only Allow">
-		Limiter l&apos;accès aux résidents :
+		Limiter l&apos;accès aux résidents qui :
 	</text>
-	<check_box label="Qui ont enregistré leurs infos de paiement" name="limit_payment"
-	     tool_tip="Interdire les résidents non identifés." />
-	<check_box label="Adultes dont l&apos;âge a été vérifié" name="limit_age_verified"
-	     tool_tip="Interdire les résidents dont l&apos;âge n&apos;a pas été vérifié. Pour plus d&apos;infos, consultez la page support.secondlife.com." />
-	<check_box label="Autoriser les chats vocaux" name="voice_chat_check" />
-	<button label="?" name="voice_chat_help" />
+	<check_box label="Ont enregistré leurs infos de paiement" name="limit_payment" tool_tip="Bannir les résidents non identifés."/>
+	<check_box label="Ont fait vérifier leur âge" name="limit_age_verified" tool_tip="Bannir les résidents dont l&apos;âge n&apos;a pas été vérifié. Pour plus d&apos;infos, consultez la page support.secondlife.com."/>
+	<check_box label="Autoriser les chats vocaux" name="voice_chat_check"/>
+	<button label="?" name="voice_chat_help"/>
 	<text name="abuse_email_text">
 		E-mail où signaler l&apos;infraction :
 	</text>
 	<string name="email_unsupported">
 		Non pris en charge
 	</string>
-	<button label="?" name="abuse_email_address_help" />
+	<button label="?" name="abuse_email_address_help"/>
 	<text name="estate_manager_label">
 		Gérants du domaine :
 	</text>
-	<button label="?" name="estate_manager_help" />
-	<button label="Ajouter..." name="add_estate_manager_btn" />
-	<button label="Supprimer..." name="remove_estate_manager_btn" />
-	<check_box label="Utiliser le temps universel" name="use_global_time_check" />
-	<button label="?" name="use_global_time_help" />
-	<check_box label="Soleil fixe" name="fixed_sun_check" />
-	<button label="?" name="fixed_sun_help" />
-	<slider label="Phase" name="sun_hour_slider" />
-	<check_box label="Autoriser l&apos;accès public" name="externally_visible_check" />
-	<button label="?" name="externally_visible_help" />
-	<check_box label="Vue sur le continent" name="mainland_visible_check" />
-	<button label="?" name="mainland_visible_help" />
-	<check_box label="Autoriser la téléportation directe" name="allow_direct_teleport" />
-	<button label="?" name="allow_direct_teleport_help" />
+	<button label="?" name="estate_manager_help"/>
+	<button label="Ajouter..." name="add_estate_manager_btn"/>
+	<button label="Supprimer..." name="remove_estate_manager_btn"/>
+	<check_box label="Utiliser le temps universel" name="use_global_time_check"/>
+	<button label="?" name="use_global_time_help"/>
+	<check_box label="Soleil fixe" name="fixed_sun_check"/>
+	<button label="?" name="fixed_sun_help"/>
+	<slider label="Phase" name="sun_hour_slider"/>
+	<check_box label="Autoriser l&apos;accès public" name="externally_visible_check"/>
+	<button label="?" name="externally_visible_help"/>
+	<check_box label="Vue sur le continent" name="mainland_visible_check"/>
+	<button label="?" name="mainland_visible_help"/>
+	<check_box label="Autoriser la téléportation directe" name="allow_direct_teleport"/>
+	<button label="?" name="allow_direct_teleport_help"/>
 	<text name="region_text_lbl">
 		Refuser l&apos;accès selon les infos de paiement :
 	</text>
-	<check_box label="Refuser sans infos de paiement enregistrées" name="deny_anonymous" />
-	<check_box label="Refuser avec infos de paiement enregistrées" name="deny_identified" />
-	<check_box label="Refuser avec infos de paiement utilisées" name="deny_transacted" />
-	<button label="Appliquer" name="apply_btn" />
+	<check_box label="Refuser sans infos de paiement enregistrées" name="deny_anonymous"/>
+	<check_box label="Refuser avec infos de paiement enregistrées" name="deny_identified"/>
+	<check_box label="Refuser avec infos de paiement utilisées" name="deny_transacted"/>
+	<button label="Appliquer" name="apply_btn"/>
 	<text name="allow_resident_label">
 		Résidents autorisés :
 	</text>
-	<button label="?" name="allow_resident_help" />
-	<button label="Ajouter..." name="add_allowed_avatar_btn" />
-	<button label="Supprimer..." name="remove_allowed_avatar_btn" />
+	<button label="?" name="allow_resident_help"/>
+	<button label="Ajouter..." name="add_allowed_avatar_btn"/>
+	<button label="Supprimer..." name="remove_allowed_avatar_btn"/>
 	<text name="allow_group_label">
 		Groupes autorisés :
 	</text>
-	<button label="?" name="allow_group_help" />
-	<button label="Ajouter..." name="add_allowed_group_btn" />
-	<button label="Supprimer..." name="remove_allowed_group_btn" />
+	<button label="?" name="allow_group_help"/>
+	<button label="Ajouter..." name="add_allowed_group_btn"/>
+	<button label="Supprimer..." name="remove_allowed_group_btn"/>
 	<text name="ban_resident_label">
-		Résidents interdits :
+		Résidents bannis :
 	</text>
-	<button label="?" name="ban_resident_help" />
-	<button label="Ajouter..." name="add_banned_avatar_btn" />
-	<button label="Supprimer..." name="remove_banned_avatar_btn" />
-	<button label="Envoyer un message au domaine..." name="message_estate_btn" />
-	<button label="Expulser le résident du domaine..." name="kick_user_from_estate_btn" />
+	<button label="?" name="ban_resident_help"/>
+	<button label="Ajouter..." name="add_banned_avatar_btn"/>
+	<button label="Supprimer..." name="remove_banned_avatar_btn"/>
+	<button label="Envoyer un message au domaine..." name="message_estate_btn"/>
+	<button label="Éjecter le résident du domaine..." name="kick_user_from_estate_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_general.xml b/indra/newview/skins/default/xui/fr/panel_region_general.xml
index 95cd0c20f3..0ac07f7b68 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_general.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Région" name="General">
 	<text name="region_text_lbl">
 		Région :
@@ -12,42 +12,39 @@
 	<text name="version_channel_text">
 		(inconnu)
 	</text>
-	<check_box label="Bloquer le terraformage" name="block_terraform_check" />
-	<button label="?" name="terraform_help" />
-	<check_box label="Interdire le vol" name="block_fly_check" />
-	<button label="?" name="fly_help" />
-	<check_box label="Autoriser les dégâts" name="allow_damage_check" />
-	<button label="?" name="damage_help" />
-	<check_box label="Interdire les bousculades" name="restrict_pushobject" />
-	<button label="?" name="restrict_pushobject_help" />
-	<check_box label="Autoriser la revente de terrain" name="allow_land_resell_check" />
-	<button label="?" name="land_resell_help" />
-	<check_box label="Autoriser la fusion/division de terrain"
-	     name="allow_parcel_changes_check" />
-	<button label="?" name="parcel_changes_help" />
-	<check_box label="Ne pas afficher le terrain dans la recherche"
-	     name="block_parcel_search_check"
-	     tool_tip="Afficher cette région et ses parcelles dans les résultats de recherche" />
-	<button label="?" name="parcel_search_help" />
-	<spinner label="Nombre limite d&apos;avatars" name="agent_limit_spin" />
-	<button label="?" name="agent_limit_help" />
-	<spinner label="Bonus objet" name="object_bonus_spin" />
-	<button label="?" name="object_bonus_help" />
+	<check_box label="Bloquer le terraformage" name="block_terraform_check"/>
+	<button label="?" name="terraform_help"/>
+	<check_box label="Interdire le vol" name="block_fly_check"/>
+	<button label="?" name="fly_help"/>
+	<check_box label="Autoriser les dégâts" name="allow_damage_check"/>
+	<button label="?" name="damage_help"/>
+	<check_box label="Interdire les bousculades" name="restrict_pushobject"/>
+	<button label="?" name="restrict_pushobject_help"/>
+	<check_box label="Autoriser la revente" name="allow_land_resell_check"/>
+	<button label="?" name="land_resell_help"/>
+	<check_box label="Autoriser la fusion/division" name="allow_parcel_changes_check"/>
+	<button label="?" name="parcel_changes_help"/>
+	<check_box label="Ne pas afficher dans la recherche" name="block_parcel_search_check" tool_tip="Afficher cette région et ses parcelles dans les résultats de recherche"/>
+	<button label="?" name="parcel_search_help"/>
+	<spinner label="Nombre limite d&apos;avatars" name="agent_limit_spin" label_width="127" width="190"/>
+	<button label="?" name="agent_limit_help"/>
+	<spinner label="Bonus objet" name="object_bonus_spin" label_width="127" width="190"/>
+	<button label="?" name="object_bonus_help"/>
 	<text label="Maturité" name="access_text">
 		Maturité :
 	</text>
 	<combo_box label="Adulte" name="access_combo">
 		<combo_item name="PG">
-			Accompagnement parental
+			Tout public
 		</combo_item>
 		<combo_item name="Mature">
 			Adulte
 		</combo_item>
 	</combo_box>
-	<button label="?" name="access_help" />
-	<button label="Appliquer" name="apply_btn" />
-	<button label="Téléporter un résident chez lui..." name="kick_btn" />
-	<button label="Téléporter tous les résidents chez eux..." name="kick_all_btn" />
-	<button label="Envoyer un message à la région..." name="im_btn" />
-	<button label="Gérer le Téléhub..." name="manage_telehub_btn" />
+	<button label="?" name="access_help"/>
+	<button label="Appliquer" name="apply_btn"/>
+	<button label="Téléporter un résident chez lui..." name="kick_btn"/>
+	<button label="Téléporter tous les résidents chez eux..." name="kick_all_btn"/>
+	<button label="Envoyer un message à la région..." name="im_btn"/>
+	<button label="Gérer le Téléhub..." name="manage_telehub_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
index d176f07c61..96c1530e64 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Terrain" name="Terrain">
 	<text name="region_text_lbl">
 		Région :
@@ -6,25 +6,22 @@
 	<text name="region_text">
 		(inconnue)
 	</text>
-	<spinner label="Niveau de l&apos;eau" name="water_height_spin" />
-	<button label="?" name="water_height_help" />
-	<spinner label="Limite de surélévation du terrain" name="terrain_raise_spin" />
-	<button label="?" name="terrain_raise_help" />
-	<spinner label="Limite d&apos;abaissement du terrain" name="terrain_lower_spin" />
-	<button label="?" name="terrain_lower_help" />
-	<check_box label="Utiliser le soleil du domaine" name="use_estate_sun_check" />
-	<button label="?" name="use_estate_sun_help" />
-	<check_box label="Soleil fixe" name="fixed_sun_check" />
-	<button label="?" name="fixed_sun_help" />
-	<slider label="Phase" name="sun_hour_slider" />
-	<button label="Appliquer" name="apply_btn" />
-	<button label="Télécharger le terrain au format RAW..." name="download_raw_btn"
-	     tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" />
-	<button label="?" name="download_raw_help" />
-	<button label="Charger le terrain au format RAW..." name="upload_raw_btn"
-	     tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" />
-	<button label="?" name="upload_raw_help" />
-	<button label="Figer le terrain" name="bake_terrain_btn"
-	     tool_tip="Définir le terrain actuel comme point central pour les limites de surélévation/abaissement" />
-	<button label="?" name="bake_terrain_help" />
+	<spinner label="Niveau de l&apos;eau" name="water_height_spin"/>
+	<button label="?" name="water_height_help"/>
+	<spinner label="Limite d&apos;élévation du &#10;terrain" name="terrain_raise_spin"/>
+	<button label="?" name="terrain_raise_help"/>
+	<spinner label="Limite d&apos;abaissement &#10;du terrain" name="terrain_lower_spin" bottom_delta="-34"/>
+	<button label="?" name="terrain_lower_help"/>
+	<check_box label="Utiliser le soleil du domaine" name="use_estate_sun_check"/>
+	<button label="?" name="use_estate_sun_help"/>
+	<check_box label="Soleil fixe" name="fixed_sun_check"/>
+	<button label="?" name="fixed_sun_help"/>
+	<slider label="Phase" name="sun_hour_slider"/>
+	<button label="Appliquer" name="apply_btn"/>
+	<button label="Télécharger le terrain au format RAW..." name="download_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" width="230"/>
+	<button label="?" name="download_raw_help" left="246" />
+	<button label="Charger le terrain au format RAW..." name="upload_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" width="230"/>
+	<button label="?" name="upload_raw_help" left="246" />
+	<button label="Figer le terrain" name="bake_terrain_btn" tool_tip="Définir le terrain actuel comme point central pour les limites d&apos;élévation/abaissement"/>
+	<button label="?" name="bake_terrain_help"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml b/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
index 19a1a4bd78..722295f6c3 100644
--- a/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="LLScrollingPanelParam">
 	<text type="string" length="1" name="Loading...">
-		Chargement en cours...
+		Chargement...
 	</text>
 	<text type="string" length="1" name="Loading...2">
-		Chargement en cours...
+		Chargement...
 	</text>
 	<button label="" label_selected="" name="less" />
 	<button label="" label_selected="" name="more" />
diff --git a/indra/newview/skins/default/xui/fr/panel_status_bar.xml b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
index fc949232b6..3ddfe31cac 100644
--- a/indra/newview/skins/default/xui/fr/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="status">
-	<text type="string" length="1" name="ParcelNameText"
-	     tool_tip="Nom de la parcelle de terrain sur laquelle vous vous trouvez. Cliquez pour ouvrir À propos du terrain.">
+	<text length="1" name="ParcelNameText" tool_tip="Nom de la parcelle de terrain sur laquelle vous vous trouvez. Cliquez pour ouvrir la section À propos du terrain." type="string">
 		Saisissez le nom de la parcelle ici
 	</text>
-	<text type="string" length="1" name="BalanceText" tool_tip="Solde du compte">
-		Chargement en cours...
+	<text length="1" name="BalanceText" tool_tip="Solde du compte" type="string">
+		Chargement...
 	</text>
-	<button label="" label_selected="" name="buycurrency" tool_tip="Acheter des devises" />
-	<text type="string" length="12" name="TimeText" tool_tip="Heure actuelle (Californie)">
+	<button label="" label_selected="" name="buycurrency" tool_tip="Acheter des devises"/>
+	<text length="12" name="TimeText" tool_tip="Heure actuelle (Californie)" type="string">
 		midi
 	</text>
 	<string name="StatBarDaysOfWeek">
@@ -17,23 +16,22 @@
 	<string name="StatBarMonthsOfYear">
 		January:February:March:April:May:June:July:August:September:October:November:December
 	</string>
-	<button label="" label_selected="" name="scriptout"
-	     tool_tip="Alertes et erreurs de scripts" />
-	<button label="" label_selected="" name="health" tool_tip="Santé" />
-	<text type="string" length="1" name="HealthText" tool_tip="Santé">
-		100%
+	<button label="" label_selected="" name="scriptout" tool_tip="Alertes et erreurs de scripts"/>
+	<button label="" label_selected="" name="health" tool_tip="Santé"/>
+	<text length="1" name="HealthText" tool_tip="Santé" type="string">
+		100 %
 	</text>
-	<button label="" label_selected="" name="fly" tool_tip="Vol interdit" />
-	<button label="" label_selected="" name="build" tool_tip="Construction interdite" />
-	<button label="" label_selected="" name="scripts" tool_tip="Scripts interdits" />
-	<button name="no_fly" tool_tip="Interdiction de voler" />
-	<button name="no_build" tool_tip="Interdiction de construire/rezzer" />
-	<button name="no_scripts" tool_tip="Interdiction d&apos;utiliser des scripts" />
-	<button label="" label_selected="" name="restrictpush" tool_tip="llPushObject interdit" />
-	<button name="status_no_voice" tool_tip="Voix non disponible ici" />
-	<button label="" label_selected="" name="buyland" tool_tip="Acheter cette parcelle" />
-	<line_editor label="Rechercher" name="search_editor" tool_tip="Rechercher dans Second Life" />
-	<button name="search_btn" tool_tip="Rechercher dans Second Life" />
+	<button label="" label_selected="" name="fly" tool_tip="Vol interdit"/>
+	<button label="" label_selected="" name="build" tool_tip="Construction interdite"/>
+	<button label="" label_selected="" name="scripts" tool_tip="Scripts interdits"/>
+	<button name="no_fly" tool_tip="Interdiction de voler"/>
+	<button name="no_build" tool_tip="Interdiction de construire/rezzer"/>
+	<button name="no_scripts" tool_tip="Interdiction d&apos;utiliser des scripts"/>
+	<button label="" label_selected="" name="restrictpush" tool_tip="Pas de bousculades"/>
+	<button name="status_no_voice" tool_tip="Voix non disponible ici"/>
+	<button label="" label_selected="" name="buyland" tool_tip="Acheter cette parcelle"/>
+	<line_editor label="Rechercher" name="search_editor" tool_tip="Rechercher dans Second Life"/>
+	<button name="search_btn" tool_tip="Rechercher dans Second Life"/>
 	<text name="packet_loss_tooltip">
 		Perte de paquets
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/role_actions.xml b/indra/newview/skins/default/xui/fr/role_actions.xml
index 6b814ebbf4..5ba025f351 100644
--- a/indra/newview/skins/default/xui/fr/role_actions.xml
+++ b/indra/newview/skins/default/xui/fr/role_actions.xml
@@ -4,198 +4,198 @@
 	     description="Ces pouvoirs permettent d&apos;ajouter et de supprimer des membres du groupe et permettent aux nouveaux membres de rejoindre le groupe sans recevoir d&apos;invitation."
 	     name="Membership">
 		<action description="Inviter des membres dans ce groupe"
-		     longdescription="Invitez des membres à rejoindre ce goupe en utilisant le bouton Inviter nouvelle personne à partir de l&apos;onglet Membres et rôles &gt; Membres."
+		     longdescription="Invitez des membres à rejoindre ce groupe en utilisant le bouton Inviter un nouveau membre à partir de l&apos;onglet Membres et rôles &gt; Membres."
 		     name="member invite" value="1" />
-		<action description="Expulser des membres de ce groupe"
-		     longdescription="Expulsez des membres de ce goupe en utilisant le bouton Expulser du groupe à partir de l&apos;onglet Membres et rôles &gt; Membres. Un propriétaire peur expulser n&apos;importe qui sauf un autre propriétaire. Si vous n&apos;êtes pas propriétaire, notez qu&apos;un membre peut être expulsé d&apos;un groupe uniquement s&apos;il se trouve dans le rôle Tous et dans aucun autre rôle. Pour supprimer des rôles, vous devez avoir le pouvoir de retirer des rôles aux membres."
+		<action description="Expulser des membres du groupe"
+		     longdescription="Expulsez des membres de ce groupe en utilisant le bouton Expulser un membre à partir de l&apos;onglet Membres et rôles &gt; Membres. Un propriétaire ne peut pas être expulsé. Un membre peut être expulsé d&apos;un groupe uniquement s&apos;il a le rôle Tous (Everyone). Si vous n&apos;êtes pas propriétaire, vous devez d&apos;abord retirer les rôles d&apos;un membre avant de pouvoir l&apos;expulser."
 		     name="member eject" value="2" />
 		<action
-		     description="Mettre l&apos;inscription libre en mode bascule et changer les frais d&apos;inscription."
-		     longdescription="Mettez Inscription libre en mode bascule pour permettre aux nouveaux membres de rejoindre le groupe sans invitation et modifiez Frais d&apos;inscription dans les Préférences du groupe, sous l&apos;onglet Général."
+		     description="Gérer l&apos;inscription et les frais d&apos;inscription"
+		     longdescription="Choisissez l&apos;inscription libre pour permettre aux nouveaux membres de rejoindre le groupe sans invitation et modifiez les frais d&apos;inscription à l&apos;onglet Général."
 		     name="member options" value="3" />
 	</action_set>
 	<action_set
-	     description="Ces pouvoirs permettent d&apos;ajouter, supprimer et modifier les rôles dans le groupe, d&apos;ajouter et de supprimer des membres affectés à ces rôles et d&apos;assigner des pouvoirs aux rôles."
+	     description="Ces pouvoirs permettent d&apos;ajouter, de supprimer et de modifier les rôles dans le groupe et d&apos;y assigner des membres et des pouvoirs."
 	     name="Roles">
 		<action description="Créer des rôles"
-		     longdescription="Créez de nouveaux rôles à l&apos;onglet Membres et rôles, sous-onglet Rôles."
+		     longdescription="Créez de nouveaux rôles à l&apos;onglet Membres et rôles &gt; Rôles."
 		     name="role create" value="4" />
 		<action description="Supprimer des rôles"
-		     longdescription="Supprimez des rôles à l&apos;onglet Membres et rôles, sous-onglet Rôles."
+		     longdescription="Supprimez des rôles à l&apos;onglet Membres et rôles &gt; Rôles."
 		     name="role delete" value="5" />
-		<action description="Modifier les noms, titres et descriptions des rôles"
-		     longdescription="Modifiez les noms, titres et descriptions des rôles à l&apos;onglet Membres et rôles, sous-onglet Rôles, après avoir sélectionné un rôle."
+		<action description="Modifier les noms, les titres et les descriptions des rôles"
+		     longdescription="Modifiez les noms, titres et descriptions des rôles à l&apos;onglet Membres et rôles &gt; Rôles."
 		     name="role properties" value="6" />
-		<action description="Affecter des membres à des rôles d&apos;attribution"
-		     longdescription="Affectez des membres à des rôles dans la section Rôles attribués à l&apos;onglet Membres et rôles, sous-onglet Membres. Un membre disposant de ce pouvoir ne peut affecter de nouveaux membres qu&apos;à un rôle auquel il est lui même affecté."
+		<action description="Attribuer des rôles limités"
+		     longdescription="Affectez des membres à certains rôles à l&apos;onglet Membres et rôles &gt; Membres. Un membre ne peut attribuer que des rôles auxquels il est lui-même affecté."
 		     name="role assign member limited" value="7" />
-		<action description="Affecter des membres à tous types de rôles"
-		     longdescription="Affectez des membres à tous types de rôles dans la section Rôles attribués à l&apos;onglet Membres et rôles, sous-onglet Membres. Avertissement : tout membre disposant de ce pouvoir peut s&apos;affecter lui-même, ainsi que tout autre membre non-propriétaire du groupe, à des rôles disposant de facultés plus importantes, et accéder potentiellement à des pouvoirs proches de ceux d&apos;un propriétaire. Assurez-vous de bien comprendre ce que vous faites avant d&apos;attribuer ce pouvoir."
+		<action description="Attribuer tous les rôles"
+		     longdescription="Affectez des membres à tous types de rôles à l&apos;onglet Membres et rôles &gt; Membres &gt; Rôles assignés. Attention : ce pouvoir peut conférer des rôles très importants, proches de ceux d&apos;un propriétaire. Assurez-vous de bien comprendre ce pouvoir avant de l&apos;attribuer."
 		     name="role assign member" value="8" />
 		<action description="Destituer des membres de leurs rôles"
-		     longdescription="Destituez des membres de leurs rôles dans la section Rôles attribués à l&apos;onglet Membres et rôles, sous-onglet Membres. Les propriétaires ne peuvent pas être destitués."
+		     longdescription="Destituez des membres de leurs rôles à partir du menu Rôles attribués à l&apos;onglet Membres et rôles &gt; Membres. Les propriétaires ne peuvent pas être destitués."
 		     name="role remove member" value="9" />
-		<action description="Attribuer et retirer les pouvoirs d&apos;un rôle"
-		     longdescription="Attribuez et retirez les pouvoirs d&apos;un rôle à partir de la section Pouvoirs attribués à l&apos;onglet Membres et rôles, sous-onglet Rôles. Avertissement : tout membre dans un rôle avec ce pouvoir peut s&apos;attribuer à lui-même, ainsi qu&apos;à tout autre membre non-propriétaire du groupe, Tous les pouvoirs, et accéder potentiellement à des pouvoirs proches de ceux d&apos;un propriétaire. Assurez-vous de bien comprendre ce que vous faites avant d&apos;attribuer ce pouvoir."
+		<action description="Modifier les pouvoirs d&apos;un rôle"
+		     longdescription="Attribuez et retirez les pouvoirs d&apos;un rôle à partir du menu Pouvoirs attribués à l&apos;onglet Membres et rôles &gt; Rôles &gt; Pouvoirs attribués. Attention : ce pouvoir peut donner des rôles très importants, proches de ceux d&apos;un propriétaire. Assurez-vous de bien comprendre ce pouvoir avant de l&apos;attribuer."
 		     name="role change actions" value="10" />
 	</action_set>
 	<action_set
-	     description="Ces pouvoirs permettent de modifier l&apos;identité du groupe, et donc sa visibilité publique, sa charte et son emblème."
+	     description="Ces pouvoirs permettent de modifier le profil public du groupe, sa charte et son logo."
 	     name="Group Identity">
 		<action
-		     description="Modifier la charte, l&apos;emblème, les résultats dans la recherche, et quels membres apparaissent dans les Informations du groupe."
-		     longdescription="Modifier la charte, l&apos;emblème, les résultats dans la recherche, et quels membres apparaissent dans les Informations du groupe. Ces opérations s&apos;effectuent à l&apos;onglet Général."
+		     description="Modifier le profil public du groupe"
+		     longdescription="Modifiez la charte, le logo, l&apos;affichage dans la recherche et la liste des membres visibles à l&apos;onglet Général."
 		     name="group change identity" value="11" />
 	</action_set>
 	<action_set
-	     description="Ces pouvoirs permettent de transférer, modifier et vendre du terrain appartenant au patrimoine du groupe. Pour accéder au menu du terrain, cliquez à droite sur le sol et sélectionnez À propos du terrain, ou bien cliquez sur les infos de la parcelle dans la barre de menus."
+	     description="Ces pouvoirs permettent de transférer, modifier et vendre du terrain appartenant au groupe. Pour accéder au menu À propos du terrain, cliquez sur le nom de la parcelle en haut de l&apos;écran ou cliquez à droite sur le sol."
 	     name="Parcel Management">
-		<action description="Transférer du terrain et acheter du terrain pour le groupe"
-		     longdescription="Transférez du terrain et achetez du terrain pour le groupe Ces opérations s&apos;effectuent à partir de À propos du terrain &gt; Général."
+		<action description="Transférer et acheter des parcelles pour le groupe"
+		     longdescription="Transférez et achetez des parcelles pour le groupe à partir du menu À propos du terrain &gt; Général."
 		     name="land deed" value="12" />
-		<action description="Céder le terrain au Governor Linden"
-		     longdescription="Cédez le terrain au Governor Linden. Avertissement : seul un membre dont le rôle lui confère ce pouvoir peut céder son terrain à la section À propos du terrain, onglet Général, le rendant ainsi au patrimoine des Linden sans le vendre ! Assurez-vous de bien comprendre ce que vous faites avant d&apos;attribuer ce pouvoir."
+		<action description="Abandonner le terrain"
+		     longdescription="Abandonnez des parcelles du groupe à Linden Lab. Attention : ce pouvoir autorise l&apos;abandon d&apos;un terrain appartenant au groupe. Ce terrain sera alors définitivement perdu. Assurez-vous de bien comprendre ce pouvoir avant de l&apos;attribuer."
 		     name="land release" value="13" />
-		<action description="Infos sur la mise en vente du terrain"
-		     longdescription="Infos sur la mise en vente du terrain. Avertissement : seul un membre dans un rôle avec ce pouvoir peut vendre un terrain possédé par le groupe à la section À propos du terrain &gt; Général. Assurez-vous de bien comprendre ce que vous faites avant d&apos;attribuer ce pouvoir."
+		<action description="Vendre du terrain"
+		     longdescription="Vendez des parcelles du groupe. Attention : ce pouvoir autorise la vente d&apos;un terrain appartenant au groupe. Ce terrain sera alors définitivement perdu. Assurez-vous de bien comprendre ce pouvoir avant de l&apos;attribuer."
 		     name="land set sale info" value="14" />
 		<action description="Diviser et fusionner des parcelles"
-		     longdescription="Divisez et fusionnez des parcelles Pour cela, cliquez à droite sur le sol, sélectionnez Modifier le terrain, et faites glisser votre souris sur l&apos;endroit du terrain que vous souhaitez modifier.  Pour sous-diviser le terrain, sélectionnez un endroit puis cliquez sur Diviser... Pour fusionner des parcelles, sélectionnez au moins deux parcelles adjacentes et cliquez sur Fusionner. "
+		     longdescription="Divisez et fusionnez des parcelles. Pour cela, cliquez à droite sur le sol, sélectionnez Modifier le terrain, et faites glisser votre souris sur l&apos;endroit que vous souhaitez modifier. Pour diviser le terrain, sélectionnez un endroit puis cliquez sur Diviser... Pour fusionner des parcelles, sélectionnez au moins deux parcelles adjacentes et cliquez sur Fusionner."
 		     name="land divide join" value="15" />
 	</action_set>
 	<action_set
-	     description="Ces pouvoirs permettent de modifier le nom de la parcelle, la visibilité dans l&apos;annuaire et les options de routage et de téléportation."
+	     description="Ces pouvoirs permettent de modifier le nom de la parcelle, son référencement dans la recherche et le lieu de téléportation."
 	     name="Parcel Identity">
 		<action
-		     description="Mettre Afficher dans la recherche d&apos;endroits en mode bascule et définir une catégorie."
-		     longdescription="Mettez Afficher dans la recherche d&apos;endroits en mode bascule et définissez une catégorie pour la parcelle dans À propos du terrain &gt; Options."
+		     description="Afficher dans la recherche et définir une catégorie"
+		     longdescription="Choisissez de faire apparaître la parcelle dans la recherche et définissez sa catégorie à partir du menu À propos du terrain &gt; Options."
 		     name="land find places" value="17" />
 		<action
-		     description="Modifier le nom de la parcelle, la description et les paramètres d&apos;affichage dans la recherche"
-		     longdescription="Modifiez le nom de la parcelle, la description et les paramètres d&apos;affichage dans les résultats de recherche. Ces opérations s&apos;effectuent à partir de À propos du terrain &gt;  Options."
+		     description="Modifier le nom, la description et le référencement du terrain dans la recherche"
+		     longdescription="Modifiez le nom, la description de la parcelle et son référencement dans la recherche à partir du menu À propos du terrain &gt; Options."
 		     name="land change identity" value="18" />
 		<action
-		     description="Définir le lieu d&apos;arrivée et le routage de téléportation "
-		     longdescription="Sur une parcelle appartenant au groupe, les membres ayant un rôle avec ce pouvoir peuvent définir le lieu d&apos;arrivée des téléportations et définir le routage des téléportations pour plus de contrôle. Ces opérations s&apos;effectuent à partir de À propos du terrain, onglet Options."
+		     description="Définir le lieu d&apos;arrivée et le routage des téléportations"
+		     longdescription="Définissez le lieu d&apos;arrivée des téléportations et le routage à partir du menu À propos du terrain &gt; Options."
 		     name="land set landing point" value="19" />
 	</action_set>
 	<action_set
-	     description="Ces pouvoirs permettent de contrôler les options de la parcelle, telles que l&apos;option Créer des objets ou Modifier le terrain, ainsi que les paramètres de musique et de médias."
+	     description="Ces pouvoirs permettent de définir les options de la parcelle concernant la musique, les médias, la création d&apos;objets et le relief."
 	     name="Parcel Settings">
-		<action description="Modifier les paramètres de musique et médias"
-		     longdescription="Modifiez les paramètres de flux musicaux et vidéos à partir de la section À propos du terrain, onglet Média."
+		<action description="Modifier la musique et les médias"
+		     longdescription="Changez la musique et les médias à partir du menu À propos du terrain &gt; Médias."
 		     name="land change media" value="20" />
-		<action description="Mettre la section Modifier le terrain en mode bascule"
-		     longdescription="Mettez la section Modifier le terrain en mode bascule. Avertissement : la section À propos du terrain &gt; Options &gt; Modifier le terrain permet à tout le monde de terraformer votre terrain, disposer des plantes Linden et les déplacer. Assurez-vous de bien comprendre ce que vous faites avant d&apos;attribuer ce pouvoir. Ces opérations s&apos;effectuent à partir de À propos du terrain &gt; Options."
+		<action description="Changer l&apos;option Modifier le terrain"
+		     longdescription="Changez l&apos;option Modifier le terrain à partir du menu À propos du terrain &gt; Options. Attention : ce pouvoir permet de terraformer votre terrain et de placer ou déplacer des plantes Linden. Assurez-vous de bien comprendre ce pouvoir avant de l&apos;attribuer. "
 		     name="land edit" value="21" />
 		<action
-		     description="Mettre en bascule divers paramètres À propos du terrain &gt; Options"
-		     longdescription="Mettre en bascule Sécurisé (pas de dégâts) et Voler, et permettre aux autres résidents de : Créer des objets, Modifier le terrain, Créer des repères et Lancer des scripts sur des terrains appartenant au groupe, à partir de la section À propos du terrain &gt; Options."
+		     description="Changer diverses options du terrain"
+		     longdescription="Changez diverses options de la parcelle à partir du menu À propos du terrain &gt; Options. Vous pouvez permettre aux autres résidents de voler, créer des objets, modifier le terrain, lancer des scripts, créer des repères etc."
 		     name="land options" value="22" />
 	</action_set>
 	<action_set
-	     description="Ces pouvoirs permettent aux membres d&apos;outrepasser les restrictions sur les parcelles appartenant à un groupe."
+	     description="Ces pouvoirs permettent aux membres d&apos;outrepasser les restrictions sur les parcelles du groupe."
 	     name="Parcel Powers">
 		<action description="Toujours autoriser Modifier le terrain"
-		     longdescription="Les membres dans un rôle leur conférant ce pouvoir peuvent modifier le terrain d&apos;une parcelle appartenant au groupe, même si l&apos;option est désactivée dans la section À propos du terrain &gt; Options."
+		     longdescription="Vous pouvez modifier le relief d&apos;une parcelle du groupe, même si l&apos;option est désactivée à partir du menu À propos du terrain &gt; Options."
 		     name="land allow edit land" value="23" />
 		<action description="Toujours autoriser à voler"
-		     longdescription="Les membres dans un rôle leur conférant ce pouvoir peuvent voler sur une parcelle appartenant au groupe, même si l&apos;option est désactivée dans la section À propos du terrain &gt; Options."
+		     longdescription="Vous pouvez voler sur une parcelle du groupe, même si l&apos;option est désactivée à partir du menu À propos du terrain &gt; Options."
 		     name="land allow fly" value="24" />
 		<action description="Toujours autoriser à créer des objets"
-		     longdescription="Les membres dans un rôle leur conférant ce pouvoir peuvent créer des objets sur une parcelle appartenant au groupe, même si l&apos;option est désactivée dans la section À propos du terrain &gt; Options."
+		     longdescription="Vous pouvez créer des objets sur une parcelle du groupe, même si l&apos;option est désactivée à partir du menu À propos du terrain &gt; Options."
 		     name="land allow create" value="25" />
 		<action description="Toujours autoriser à créer des repères"
-		     longdescription="Les membres dans un rôle leur conférant ce pouvoir peuvent créer un repère sur une parcelle appartenant au groupe, même si l&apos;option est désactivée dans la section À propos du terrain &gt; Options."
+		     longdescription="Vous pouvez créer un repère sur une parcelle du groupe, même si l&apos;option est désactivée à partir du menu À propos du terrain &gt; Options."
 		     name="land allow landmark" value="26" />
-		<action description="Autoriser à définir un domicile ici sur le terrain du groupe"
-		     longdescription="Les membres dans un rôle leur conférant ce pouvoir peuvent utiliser le menu Monde &gt; Définir comme domicile sur une parcelle transférée à ce groupe."
+		<action description="Autoriser à définir un domicile sur le terrain du groupe"
+		     longdescription="Vous pouvez définir votre domicile sur une parcelle du groupe à partir du menu Monde &gt; Définir comme domicile."
 		     name="land allow set home" value="28" />
 	</action_set>
 	<action_set
-	     description="Ces pouvoirs permettent d&apos;autoriser ou d&apos;interdire l&apos;accès à des parcelles appartenant au groupe, y compris de geler ou d&apos;expulser des résidents."
+	     description="Ces pouvoirs permettent d&apos;autoriser ou d&apos;interdire l&apos;accès à des parcelles du groupe et de geler ou d&apos;expulser des résidents."
 	     name="Parcel Access">
-		<action description="Gérer les listes d&apos;accès à cette parcelle"
-		     longdescription="Gérez les listes d&apos;accès à la parcelle à partir de la section À propos du terrain &gt; Accès."
+		<action description="Gérer la liste d&apos;accès à la parcelle"
+		     longdescription="Gérez la liste des résidents autorisés sur la parcelle à partir du menu À propos du terrain &gt; Accès."
 		     name="land manage allowed" value="29" />
-		<action description="Gérer les listes noires de cette parcelle"
-		     longdescription="Gérez les listes de membres interdits sur la parcelle à partir de la section À propos du terrain &gt; Interdire."
+		<action description="Gérer la liste noire de cette parcelle"
+		     longdescription="Gérez la liste des résidents interdits sur la parcelle à partir du menu À propos du terrain &gt; Interdire."
 		     name="land manage banned" value="30" />
-		<action description="Modifier les paramètres Vendre des passes sur cette parcelle"
-		     longdescription="Modifiez les paramètres Vendre des passes à la section À propos du terrain &gt; Accès."
+		<action description="Vendre des pass"
+		     longdescription="Choisissez le prix et la durée des pass pour accéder à la parcelle à partir du menu À propos du terrain &gt; Accès."
 		     name="land manage passes" value="31" />
-		<action description="Expulser et geler des résidents sur les parcelles"
-		     longdescription="Les membres dans un rôle leur conférant ce pouvoir peuvent intervenir auprès d&apos;un résident indésirable en cliquant-droit sur lui &gt; Plus et en choisissant de les expulser ou de les geler."
+		<action description="Expulser et geler des résidents"
+		     longdescription="Vous pouvez expulser ou geler un résident indésirable en cliquant-droit sur lui, menu radial &gt; Plus."
 		     name="land admin" value="32" />
 	</action_set>
 	<action_set
-	     description="Ces pouvoirs permettent d&apos;autoriser des membres à renvoyer des objets et de placer ou déplacer des plantes Linden. Ceci permet aux membres de jeter les déchets et d&apos;aménager le paysage. A utiliser avec précaution car les objets rendus le sont définitivement."
+	     description="Ces pouvoirs permettent de renvoyer des objets du groupe et de placer ou déplacer des plantes Linden pour aménager le paysage. Utilisez ce pouvoir avec précaution car les objets renvoyés le sont définitivement."
 	     name="Parcel Content">
-		<action description="Renvoyer les objets appartenant au groupe"
-		     longdescription="Renvoyez les objets sur des parcelles appartenant au groupe à la section À propos du terrain &gt; Objets."
+		<action description="Renvoyer les objets transférés au groupe"
+		     longdescription="Vous pouvez renvoyer des objets appartenant au groupe à partir du menu À propos du terrain &gt; Objets."
 		     name="land return group owned" value="48" />
 		<action description="Renvoyer les objets attribués au groupe"
-		     longdescription="Renvoyez les objets attribués au groupe et sur des parcelles appartenant au groupe à la section À propos du terrain &gt; Objets."
+		     longdescription="Renvoyez les objets attribués au groupe et sur des parcelles du groupe à partir du menu À propos du terrain &gt; Objets."
 		     name="land return group set" value="33" />
 		<action description="Renvoyer des objets n&apos;appartenant pas au groupe"
-		     longdescription="Renvoyez les objets non attribués au groupe et sur des parcelles appartenant au groupe à la section À propos du terrain &gt; Objets."
+		     longdescription="Renvoyez les objets n&apos;appartenant pas au groupe et sur des parcelles du groupe à partir du menu À propos du terrain &gt; Objets."
 		     name="land return non group" value="34" />
 		<action description="Aménager le paysage avec des plantes Linden"
-		     longdescription="Le pouvoir de placer et de déplacer des arbres, plantes et pelouses Linden. Ces éléments sont disponibles dans le dossier Objets de la  bibiliothèque de votre inventaire ou peuvent être créés à l&apos;aide du bouton Construire."
+		     longdescription="Placez et déplacez des arbres, plantes et herbes Linden. Vous les trouverez dans le dossier Objets de la  bibliothèque de votre inventaire mais aussi à partir du menu Construire."
 		     name="land gardening" value="35" />
 	</action_set>
 	<action_set
-	     description="Ces pouvoirs permettent de transférer, modifier et vendre des objets appartenant au groupe. Ces changements se font à partir de la section Construire &gt; Modifier &gt; Général. Cliquez-droite sur un objet pour le modifier et afficher ses paramètres. "
+	     description="Ces pouvoirs permettent de transférer, modifier et vendre des objets du groupe. Ces changements se font à partir du menu Construire &gt; Modifier &gt; Général."
 	     name="Object Management">
 		<action description="Transférer des objets au groupe"
-		     longdescription="Transférez des objets à un groupe à la section Construire &gt; Modifier &gt; Général."
+		     longdescription="Transférez des objets au groupe à partir du menu Construire &gt; Modifier &gt; Général."
 		     name="object deed" value="36" />
 		<action
-		     description="Manipuler (déplacer, copier, modifier) des objets appartenant au groupe"
-		     longdescription="Manipulez (déplacez, copiez, modifiez) des objets appartenant au groupe à la section Construire &gt; Modifier &gt; Général."
+		     description="Manipuler les objets du groupe"
+		     longdescription="Déplacez, copiez et modifiez les objets du groupe à partir du menu Construire &gt; Modifier &gt; Général."
 		     name="object manipulate" value="38" />
-		<action description="Mettre en vente des objets appartenant au groupe"
-		     longdescription="Définissez les objets du groupe à vendre à la section Construire &gt; Modifier &gt; Général."
+		<action description="Vendre des objets du groupe"
+		     longdescription="Mettez en vente des objets du groupe à partir du menu Construire &gt; Modifier &gt; Général."
 		     name="object set sale" value="39" />
 	</action_set>
 	<action_set
-	     description="Les membres avec ces pouvoirs contribuent aux frais du groupe, reçoivent des dividendes et ont accès à l&apos;historique du compte du groupe."
+	     description="Ce pouvoir définit les contributions aux frais du groupe, la réception des dividendes et l&apos;accès aux finances du groupe."
 	     name="Accounting">
 		<action description="Contribuer aux frais du groupe et recevoir des dividendes"
-		     longdescription="Les membres ayant ce pouvoir contribueront automatiquement aux frais du groupe et recevront aussi des dividendes. Cela signifie qu&apos;ils recevront une portion des ventes de terrains appartenant au groupe (distribuée quotidiennement) et contribueront aux frais divers, tels que les frais de mise en vente des terrains. "
+		     longdescription="Contribuez aux frais du groupe et recevez des dividendes en cas de bénéfices. Vous recevrez une partie des ventes de terrains et objets appartenant au groupe et contribuerez aux frais divers (mise en vente des terrains etc.)"
 		     name="accounting accountable" value="40" />
 	</action_set>
 	<action_set
-	     description="Ces pouvoirs permettent d&apos;envoyer, recevoir et consulter les notes du groupe."
+	     description="Envoyez, recevez et consultez les notices du groupe."
 	     name="Notices">
-		<action description="Envoyer des notes"
-		     longdescription="Ces pouvoirs permettent d&apos;envoyer des notes à la section Infos du groupe &gt; Notes."
+		<action description="Envoyer des notices"
+		     longdescription="Envoyez des notices à l&apos;onglet Notices."
 		     name="notices send" value="42" />
-		<action description="Recevoir des notes et consulter les anciennes notes"
-		     longdescription="Ces pouvoirs permettent de recevoir des notes et de consulter d&apos;anciennes notes à la section Infos du groupe &gt; Notes."
+		<action description="Recevoir et consulter les notices"
+		     longdescription="Recevez des notices et consulter d&apos;anciennes notices à l&apos;onglet Notices."
 		     name="notices receive" value="43" />
 	</action_set>
 	<action_set
 	     description="Ces pouvoirs permettent de créer de nouvelles propositions, de voter et de consulter l&apos;historique des votes."
 	     name="Proposals">
 		<action description="Créer des propositions"
-		     longdescription="Ces pouvoirs permettent de créer des propositions et de les soumettre au vote, à partir de la section Infos du groupe &gt; Propositions."
+		     longdescription="Ces pouvoirs permettent de créer des propositions et de les soumettre au vote, à partir du menu Profil du groupe &gt; Propositions."
 		     name="proposal start" value="44" />
 		<action description="Voter les propositions"
-		     longdescription="Ces pouvoirs permettent de voter des propositions à la section Infos du groupe &gt; Propositions."
+		     longdescription="Votez les propositions à partir du menu Profil du groupe &gt; Propositions."
 		     name="proposal vote" value="45" />
 	</action_set>
 	<action_set
-	     description="Ces pouvoirs vous permettent d&apos;autoriser ou dinterdire l&apos;accès aux sessions de chat de groupe et au chat de groupe vocal."
+	     description="Ces pouvoirs vous permettent de gérer l&apos;accès aux sessions de chat écrit ou vocal du groupe."
 	     name="Chat">
-		<action description="Participer au chat de groupe"
-		     longdescription="Les membres qui ont ce pouvoir peuvent participer aux chats de groupe, texte ou vocal."
+		<action description="Participer aux chats"
+		     longdescription="Participez aux chats du groupe."
 		     name="join group chat" />
-		<action description="Participer au chat de groupe vocal"
-		     longdescription="Les membres qui ont ce pouvoir peuvent participer aux chats de groupe vocaux. Remarque : pour accéder à une session de chat vocal, vous devez avoir le droit de participer à un chat de groupe."
+		<action description="Participer au chat vocal"
+		     longdescription="Participez au chat vocal du groupe. Remarque : vous devez au préalable avoir le pouvoir de participer aux chats."
 		     name="join voice chat" />
-		<action description="Modérer un chat de groupe"
-		     longdescription="Les membres dont le rôle leur confèrent ce pouvoir contrôlent l&apos;accès et la participation aux chats de groupe écrits et vocaux.le"
+		<action description="Modérer les chats"
+		     longdescription="Contrôlez l&apos;accès et la participation aux chats de groupe écrits et vocaux."
 		     name="moderate group chat" />
 	</action_set>
 </role_actions>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 0c4b625cbf..d6387b1315 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <strings>
 	<string name="LoginInProgress">
 		La connexion à [APP_NAME] apparaît peut-être comme étant gelée. Veuillez patienter.
@@ -82,7 +82,7 @@
 		Toucher
 	</string>
 	<string name="TooltipFlagL$">
-		$L
+		L$
 	</string>
 	<string name="TooltipFlagDropInventory">
 		Laisser tomber l&apos;inventaire
@@ -100,7 +100,7 @@
 		Copie autorisée
 	</string>
 	<string name="TooltipForSaleL$">
-		À vendre : [AMOUNT] $L
+		À vendre : [AMOUNT] L$
 	</string>
 	<string name="TooltipForSaleMsg">
 		À vendre : [MESSAGE]
@@ -139,7 +139,7 @@
 		Notes de version
 	</string>
 	<string name="LoadingData">
-		Chargement en cours...
+		Chargement..
 	</string>
 	<string name="AvatarNameNobody">
 		(personne)
@@ -301,7 +301,7 @@
 		Non
 	</string>
 	<string name="anim_nyanya">
-		Na na na nère
+		Na na na na nère
 	</string>
 	<string name="anim_punch_onetwo">
 		Gauche-droite
@@ -403,15 +403,15 @@
 		Oui
 	</string>
 	<string name="texture_loading">
-		Chargement en cours...
+		Chargement...
 	</string>
 	<string name="worldmap_offline">
 		Hors ligne
 	</string>
 	<string name="whisper">
-		chuchotages :
+		chuchote :
 	</string>
 	<string name="shout">
-		cris :
+		crie :
 	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index f28119338d..9027f84e91 100644
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -29,6 +29,6 @@
   道のりは短いが、すべきことは山のようにある –アラン・チューニング
 	</text_editor>
 	<text name="you_are_at">
-		[POSITION]中
+		[POSITION]
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index adc85df627..c6f6e125bf 100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -1,288 +1,260 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floaterland" title="土地情報">
 	<tab_container name="landtab">
 		<panel label="一般" name="land_general_panel">
-			<text type="string" length="1" name="Name:">
+			<text length="1" name="Name:" type="string">
 				名前：
 			</text>
-			<text type="string" length="1" name="Description:">
+			<line_editor name="Name"/>
+			<text length="1" name="Description:" type="string">
 				説明：
 			</text>
-			<text type="string" length="1" name="Owner:">
+			<text length="1" name="Owner:" type="string">
 				オーナー：
 			</text>
-			<text type="string" length="1" name="OwnerText">
+			<text length="1" name="OwnerText" type="string">
 				Leyla Linden
 			</text>
-			<button label="プロフィール..." label_selected="プロフィール..."
-			     name="Profile..." />
-			<text type="string" length="1" name="Group:">
+			<button label="プロフィール..." label_selected="プロフィール..." name="Profile..."/>
+			<text length="1" name="Group:" type="string">
 				グループ：
 			</text>
-			<button label="設定..." label_selected="設定..." name="Set..." />
-			<check_box label="グループへの譲渡を許可" name="check deed"
-			     tool_tip="グループ・オフィサーは、この土地をグループに譲渡し、グループの土地配分に委ねることができます。" />
-			<button label="譲渡..." label_selected="譲渡..." name="Deed..."
-			     tool_tip="選択されたグループのオフィサーであるときのみ、土地を譲渡できます。" />
-			<check_box label="オーナーが譲渡と共に寄付" name="check contrib"
-			     tool_tip="土地がグループに譲渡されるとき、前の所有者は譲渡が成立するよう、十分な土地を寄付します。" />
-			<text type="string" length="1" name="For Sale:">
+			<button label="設定..." label_selected="設定..." name="Set..."/>
+			<check_box label="グループへの譲渡を許可" name="check deed" tool_tip="グループ・オフィサーは、この土地をグループに譲渡し、グループの土地配分に委ねることができます。"/>
+			<button label="譲渡..." label_selected="譲渡..." name="Deed..." tool_tip="選択されたグループのオフィサーであるときのみ、土地を譲渡できます。"/>
+			<check_box label="オーナーが譲渡と共に寄付" name="check contrib" tool_tip="土地がグループに譲渡されるとき、前の所有者は譲渡が成立するよう、十分な土地を寄付します。"/>
+			<text length="1" name="For Sale:" type="string">
 				売り出し中：
 			</text>
-			<text type="string" length="1" name="Not for sale.">
+			<text length="1" name="Not for sale." type="string">
 				販売対象外。
 			</text>
-			<text type="string" length="1" name="For Sale: Price L$[PRICE].">
+			<text length="1" name="For Sale: Price L$[PRICE]." type="string">
 				料金：L$[PRICE]
 			</text>
-			<button label="土地を販売..." label_selected="土地を販売..."
-			     name="Sell Land..." />
-			<text type="string" length="1" name="For sale to">
+			<button label="土地を販売..." label_selected="土地を販売..." name="Sell Land..."/>
+			<text length="1" name="For sale to" type="string">
 				販売先：[BUYER]
 			</text>
-			<text type="string" length="1" name="Sell with landowners objects in parcel.">
+			<text length="1" name="Sell with landowners objects in parcel." type="string">
 				販売に含めるオブジェクト。
 			</text>
-			<text type="string" length="1" name="Selling with no objects in parcel.">
+			<text length="1" name="Selling with no objects in parcel." type="string">
 				販売に含めないオブジェクト。
 			</text>
-			<button label="土地販売の取り消し"
-			     label_selected="土地販売の取り消し" name="Cancel Land Sale" />
-			<text type="string" length="1" name="Claimed:">
+			<button label="土地販売の取り消し" label_selected="土地販売の取り消し" name="Cancel Land Sale"/>
+			<text length="1" name="Claimed:" type="string">
 				要求：
 			</text>
-			<text type="string" length="1" name="DateClaimText">
+			<text length="1" name="DateClaimText" type="string">
 				2006年8月15日火曜日13:47:25
 			</text>
-			<text type="string" length="1" name="PriceLabel">
+			<text length="1" name="PriceLabel" type="string">
 				面積：
 			</text>
-			<text type="string" length="1" name="PriceText">
+			<text length="1" name="PriceText" type="string">
 				4048平方メートル
 			</text>
-			<text type="string" length="1" name="Traffic:">
+			<text length="1" name="Traffic:" type="string">
 				交通量:
 			</text>
-			<text type="string" length="1" name="DwellText">
+			<text length="1" name="DwellText" type="string">
 				誤
 			</text>
-			<button label="土地を購入..." label_selected="土地を購入..."
-			     name="Buy Land..." />
-			<button label="グループ用に購入..."
-			     label_selected="グループ用に購入..." name="Buy For Group..." />
-			<button label="パスを購入..." label_selected="パスを購入..."
-			     name="Buy Pass..."
-			     tool_tip="パスはこの土地への一時的なアクセスを許可します。" />
-			<button label="土地を放棄..." label_selected="土地を放棄..."
-			     name="Abandon Land..." />
-			<button label="土地開拓..." label_selected="土地開拓..." name="Reclaim Land..." />
-			<button label="Lindenセール..." label_selected="Lindenセール..."
-			     name="Linden Sale..."
-			     tool_tip="土地が所有されており、コンテンツが設定されている必要があります。オークションの対象になっていないことも必要条件です。" />
-			<text name="new users only">
+			<button label="土地を購入..." label_selected="土地を購入..." name="Buy Land..."/>
+			<button label="グループ用に購入..." label_selected="グループ用に購入..." name="Buy For Group..."/>
+			<button label="パスを購入..." label_selected="パスを購入..." name="Buy Pass..." tool_tip="パスはこの土地への一時的なアクセスを許可します。"/>
+			<button label="土地を放棄..." label_selected="土地を放棄..." name="Abandon Land..."/>
+			<button label="土地開拓..." label_selected="土地開拓..." name="Reclaim Land..."/>
+			<button label="Lindenセール..." label_selected="Lindenセール..." name="Linden Sale..." tool_tip="土地が所有されており、コンテンツが設定されている必要があります。オークションの対象になっていないことも必要条件です。"/>
+			<string name="new users only">
 				新規ユーザーのみ
-			</text>
-			<text name="anyone">
+			</string>
+			<string name="anyone">
 				誰でも
-			</text>
-			<text name="area_text">
+			</string>
+			<string name="area_text">
 				エリア
-			</text>
-			<text name="area_size_text">
+			</string>
+			<string name="area_size_text">
 				[AREA]平方メートル
-			</text>
-			<text name="auction_id_text">
+			</string>
+			<string name="auction_id_text">
 				オークションID： [ID]
-			</text>
-			<text name="need_tier_to_modify">
+			</string>
+			<string name="need_tier_to_modify">
 				この土地を修正変更するには、購入を承認する必要があります。
-			</text>
-			<text name="group_owned_text">
+			</string>
+			<string name="group_owned_text">
 				(グループ所有)
-			</text>
-			<text name="profile_text">
+			</string>
+			<string name="profile_text">
 				プロフィール...
-			</text>
-			<text name="info_text">
+			</string>
+			<string name="info_text">
 				インフォ...
-			</text>
-			<text name="public_text">
+			</string>
+			<string name="public_text">
 				(公共)
-			</text>
-			<text name="none_text">
+			</string>
+			<string name="none_text">
 				（なし）
-			</text>
-			<text name="sale_pending_text">
+			</string>
+			<string name="sale_pending_text">
 				(購入審査中)
-			</text>
+			</string>
 			<string name="no_selection_text">
 				区画が選定されていません。
 [世界]メニュー&gt;[土地情報]に進むか、別の区画を選択して、詳細を表示します。
 			</string>
 		</panel>
 		<panel label="約款" name="land_covenant_panel">
-			<text type="string" length="1" name="covenant_timestamp_text">
+			<text length="1" name="covenant_timestamp_text" type="string">
 				最後の更新1969年12月31日水曜日16：00：00
 			</text>
-			<text type="string" length="1" name="region_name_lbl">
+			<text length="1" name="region_name_lbl" type="string">
 				地域：
 			</text>
-			<text type="string" length="1" name="region_name_text">
+			<text length="1" name="region_name_text" type="string">
 				Leyla
 			</text>
-			<text type="string" length="1" name="estate_name_lbl">
+			<text length="1" name="estate_name_lbl" type="string">
 				不動産：
 			</text>
-			<text type="string" length="1" name="estate_name_text">
+			<text length="1" name="estate_name_text" type="string">
 				メインランド
 			</text>
-			<text type="string" length="1" name="estate_owner_lbl">
+			<text length="1" name="estate_owner_lbl" type="string">
 				不動産オーナー：
 			</text>
-			<text type="string" length="1" name="estate_owner_text">
+			<text length="1" name="estate_owner_text" type="string">
 				（なし）
 			</text>
-			<text type="string" length="1" name="resellable_clause">
+			<text length="1" name="resellable_clause" type="string">
 				この地域で購入した土地は、再販できないことがあります。
 			</text>
-			<text type="string" length="1" name="changeable_clause">
+			<text length="1" name="changeable_clause" type="string">
 				この地域で購入した土地は、統合／再分割できないことがあります。
 			</text>
-			<text_editor type="string" length="1" name="covenant_editor">
+			<text_editor length="1" name="covenant_editor" type="string">
 				この不動産には約款がありません。
 			</text_editor>
-			<text name="can_resell">
+			<string name="can_resell">
 				この地域で購入した土地は、再販できます。
-			</text>
-			<text name="can_not_resell">
+			</string>
+			<string name="can_not_resell">
 				この地域で購入した土地は、再販できないことがあります。
-			</text>
-			<text name="can_change">
+			</string>
+			<string name="can_change">
 				この地域で購入した土地は、統合または再分割できます。
-			</text>
-			<text name="can_not_change">
+			</string>
+			<string name="can_not_change">
 				この地域で購入した土地は、統合／再分割できないことがあります。
-			</text>
+			</string>
 		</panel>
 		<panel label="オブジェクト" name="land_objects_panel">
 			<text name="parcel_object_bonus">
 				地域オブジェクトボーナス要因: [BONUS]
 			</text>
-			<text type="string" length="1" name="Simulator primitive usage:" width="500">
-				シミュレータの基本要素使用状況：
-			</text>
-			<text type="string" length="1" left="200" name="0 out of 0 available">
-				14055のうち0（14055利用可能）
+			<text length="1" name="Simulator primitive usage:" type="string" width="500">
+				地域全体のプリム使用状況：
 			</text>
 			<text left="200" name="objects_available">
 				[MAX]の内[COUNT]（[AVAILABLE]利用可能）
 			</text>
-			<text left="200" name="objects_available_text">
+			<string left="200" name="objects_available_text">
 				[MAX]の内[COUNT]（[AVAILABLE]利用可能）
-			</text>
-			<text left="200" name="objects_deleted_text">
+			</string>
+			<string left="200" name="objects_deleted_text">
 				[MAX]の内[COUNT]（[DELETED]を削除）
+			</string>
+			<text length="1" name="Primitives parcel supports:" type="string" width="200">
+				区画でサポートされるプリム数：
 			</text>
-			<text type="string" length="1" name="Primitives parcel supports:" width="200">
-				区画でサポートされる基本要素数：
-			</text>
-			<text type="string" length="1" left="200" name="object_contrib_text">
+			<text left="200" length="1" name="object_contrib_text" type="string">
 				[COUNT]
 			</text>
-			<text type="string" length="1" name="Primitives on parcel:">
-				区画上の基本要素数：
+			<text length="1" name="Primitives on parcel:" type="string">
+				区画上のプリム数：
 			</text>
-			<text type="string" length="1" left="200" name="total_objects_text">
+			<text left="200" length="1" name="total_objects_text" type="string">
 				[COUNT]
 			</text>
-			<text type="string" length="1" name="Owned by parcel owner:" width="300">
+			<text length="1" name="Owned by parcel owner:" type="string" width="300">
 				区画オーナーによる所有：
 			</text>
-			<text type="string" length="1" left="200" name="owner_objects_text">
+			<text left="200" length="1" name="owner_objects_text" type="string">
 				[COUNT]
 			</text>
-			<button label="表示" label_selected="表示" name="ShowOwner" right="-145" />
-			<button label="返却..." label_selected="返却..." name="ReturnOwner..." right="-15"
-			     tool_tip="オブジェクトをオーナーに返却します" />
-			<text type="string" length="1" name="Set to group:">
+			<button label="表示" label_selected="表示" name="ShowOwner" right="-145"/>
+			<button label="返却..." label_selected="返却..." name="ReturnOwner..." right="-15" tool_tip="オブジェクトをオーナーに返却します"/>
+			<text length="1" name="Set to group:" type="string">
 				グループに設定：
 			</text>
-			<text type="string" length="1" left="200" name="group_objects_text">
+			<text left="200" length="1" name="group_objects_text" type="string">
 				[COUNT]
 			</text>
-			<button label="表示" label_selected="表示" name="ShowGroup" right="-145" />
-			<button label="返却..." label_selected="返却..." name="ReturnGroup..." right="-15"
-			     tool_tip="オブジェクトをオーナーに返却します" />
-			<text type="string" length="1" name="Owned by others:">
+			<button label="表示" label_selected="表示" name="ShowGroup" right="-145"/>
+			<button label="返却..." label_selected="返却..." name="ReturnGroup..." right="-15" tool_tip="オブジェクトをオーナーに返却します"/>
+			<text length="1" name="Owned by others:" type="string">
 				他人による所有：
 			</text>
-			<text type="string" length="1" left="200" name="other_objects_text">
+			<text left="200" length="1" name="other_objects_text" type="string">
 				[COUNT]
 			</text>
-			<button label="表示" label_selected="表示" name="ShowOther" right="-145" />
-			<button label="返却..." label_selected="返却..." name="ReturnOther..." right="-15"
-			     tool_tip="オブジェクトをオーナーに返却します" />
-			<text type="string" length="1" name="Selected / sat upon:">
+			<button label="表示" label_selected="表示" name="ShowOther" right="-145"/>
+			<button label="返却..." label_selected="返却..." name="ReturnOther..." right="-15" tool_tip="オブジェクトをオーナーに返却します"/>
+			<text length="1" name="Selected / sat upon:" type="string">
 				選択済み／決定済み：
 			</text>
-			<text type="string" length="1" left="200" name="selected_objects_text">
+			<text left="200" length="1" name="selected_objects_text" type="string">
 				[COUNT]
 			</text>
-			<text type="string" length="1" name="Autoreturn" width="500">
+			<text length="1" name="Autoreturn" type="string" width="500">
 				他の住人のオブジェクトの自動返却（分、オフの設定は0）
 			</text>
-			<line_editor left_delta="5" name="clean other time" right="-80" />
-			<text type="string" length="1" name="Object Owners:" width="150">
+			<line_editor left_delta="5" name="clean other time" right="-80"/>
+			<text length="1" name="Object Owners:" type="string" width="150">
 				オブジェクトのオーナー：
 			</text>
-			<button label="リスト更新" label_selected="リスト更新" left="146"
-			     name="Refresh List" />
-			<button label="オブジェクトの返却..."
-			     label_selected="オブジェクトの返却..." left="256"
-			     name="Return objects..." />
-			<button label="" label_selected="" name="Type" tool_tip="種類で振り分け" />
-			<button label="名前" label_selected="名前" name="Name"
-			     tool_tip="名前で振り分け" />
-			<button label="カウント" label_selected="カウント" name="Count"
-			     tool_tip="カウントで振り分け" />
+			<button label="リスト更新" label_selected="リスト更新" left="146" name="Refresh List"/>
+			<button label="オブジェクトの返却..." label_selected="オブジェクトの返却..." left="256" name="Return objects..."/>
 			<name_list label="カウント" name="owner list">
-				<column label="タイプ" name="type" />
-				<column label="名前" name="name" />
-				<column label="カウント" name="count" />
+				<column label="タイプ" name="type"/>
+				<column name="online_status"/>
+				<column label="名前" name="name"/>
+				<column label="カウント" name="count"/>
+				<column label="最新" name="mostrecent"/>
 			</name_list>
-			/&gt;
 		</panel>
 		<panel label="オプション" name="land_options_panel">
-			<text type="string" length="1" name="allow_label">
+			<text length="1" name="allow_label" type="string">
 				他の住人に以下を許可：
 			</text>
-			<check_box label="地形を編集" name="edit land check" />
-			<check_box label="ランドマーク作成" name="check landmark" />
-			<check_box label="飛行" name="check fly" />
-			<text type="string" length="1" left="138" name="allow_label2" width="144">
+			<check_box label="地形を編集" name="edit land check" tool_tip="チェックを入れると、他人があなたの土地の地形編集を行うことが可能となります。このオプションのチェックを外しておくことをおすすめします。外した状態であなたの土地の地形編集が可能です。"/>
+			<check_box label="ランドマーク作成" name="check landmark"/>
+			<check_box label="飛行" name="check fly" tool_tip="チェックを入れるとこの土地での飛行が可能となります。チェックを外すと土地に入る際と通り過ぎるときのみ飛行可能となります。"/>
+			<text left="138" length="1" name="allow_label2" type="string" width="144">
 				オブジェクトの作成：
 			</text>
-			<check_box label="すべての住人" left="280" name="edit objects check" />
-			<check_box label="グループ" left="380" name="edit group objects check" />
-			<text type="string" length="1" left="138" name="allow_label3" width="144">
-				オブジェクト・エントリ：
+			<check_box label="すべての住人" left="280" name="edit objects check"/>
+			<check_box label="グループ" left="380" name="edit group objects check"/>
+			<text left="138" length="1" name="allow_label3" type="string" width="144">
+				オブジェクトの進入：
 			</text>
-			<check_box label="すべての住人" left="280" name="all object entry check" />
-			<check_box label="グループ" left="380" name="group object entry check" />
-			<text type="string" length="1" left="138" name="allow_label4" width="144">
-				スクリプト実行：
+			<check_box label="すべての住人" left="280" name="all object entry check"/>
+			<check_box label="グループ" left="380" name="group object entry check"/>
+			<text left="138" length="1" name="allow_label4" type="string" width="144">
+				スクリプトの実行：
 			</text>
-			<check_box label="すべての住人" left="280" name="check other scripts" />
-			<check_box label="グループ" left="380" name="check group scripts" />
-			<text type="string" length="1" name="land_options_label">
+			<check_box label="すべての住人" left="280" name="check other scripts"/>
+			<check_box label="グループ" left="380" name="check group scripts"/>
+			<text length="1" name="land_options_label" type="string">
 				土地オプション：
 			</text>
-			<check_box label="安全（ダメージなし）" name="check safe" />
-			<check_box label="プッシュを制限" name="PushRestrictCheck"
-			     tool_tip="llPushObjectが機能するのは、区画オーナーのスクリプトを通じて使用された場合か、またはプッシュ元がオーナーになっているスクリプトを通じて使用された場合だけです。" />
-			<check_box label="検索に表示＞（週L$30）以下の場所"
-			     name="ShowDirectoryCheck"
-			     tool_tip="検索結果で、この区画を人に見せる" />
+			<check_box label="安全（ダメージなし）" name="check safe" tool_tip="チェックを入れるとこの土地でのダメージコンバットが無効になり、「安全」に設定されます。 チェックを外すとダメージコンバットが有効になります。"/>
+			<check_box label="プッシングを制限" name="PushRestrictCheck" tool_tip="スクリプトによるプッシングを制限します。 このオプションを選択することにより、あなたの土地での破壊的行動を妨げることができます。"/>
+			<check_box label="検索に表示＞（週L$30）以下の場所" name="ShowDirectoryCheck" tool_tip="検索結果で、この区画を人に見せる"/>
 			<combo_box name="land category">
 				<combo_item name="AnyCategory">
 					全カテゴリー
@@ -324,66 +296,59 @@
 					その他
 				</combo_item>
 			</combo_box>
-			<check_box label="成人向けコンテンツ" name="MatureCheck"
-			     tool_tip="あなたの区画情報またはコンテンツが成人向けと見なされています。" />
-			<check_box label="リストをウェブ上で公開" name="PublishCheck"
-			     tool_tip="自分の区画情報をウェブ上で公開します。" />
-			<button label="?" label_selected="?" name="?" />
-			<text type="string" length="1" name="Snapshot:">
+			<button label="?" label_selected="?" name="?"/>
+			<check_box label="成人向けコンテンツ" name="MatureCheck" tool_tip="あなたの区画情報またはコンテンツが成人向けと見なされています。"/>
+			<text length="1" name="Snapshot:" type="string">
 				スナップショット：
 			</text>
-			<texture_picker label="" left="116" name="snapshot_ctrl"
-			     tool_tip="写真をクリックして選択" />
-			<text type="string" length="1" name="Landing Point: (none)">
-				着地点：（なし）
-			</text>
+			<texture_picker label="" left="116" name="snapshot_ctrl" tool_tip="写真をクリックして選択"/>
 			<text name="landing_point">
 				着陸地点: [LANDING]
 			</text>
-			<text name="landing_point_none">
+			<string name="landing_point_none">
 				（なし）
-			</text>
-			<button label="設定" label_selected="設定" name="Set"
-			     tool_tip="あなたのアバターのロケーションに着地点を設定してください。 この土地区画の中でなければなりません。" />
-			<button label="クリア" label_selected="クリア" name="Clear"
-			     tool_tip="着地点をクリアしてください。" />
-			<text type="string" length="1" name="Teleport Routing: ">
+			</string>
+			<button label="設定" label_selected="設定" name="Set" tool_tip="訪問者の着地地点の設定を行います。この区画内に立って行ってください。"/>
+			<button label="クリア" label_selected="クリア" name="Clear" tool_tip="着地点をクリアしてください。"/>
+			<text length="1" name="Teleport Routing: " type="string">
 				テレポート・ルート:
 			</text>
-			<combo_box name="landing type"
-			     tool_tip="Teleport Routing -- select how to handle teleports onto your land.">
-				<combo_item type="string" length="1" name="Blocked">
+			<combo_box name="landing type" tool_tip="Teleport Routing -- select how to handle teleports onto your land.">
+				<combo_item length="1" name="Blocked" type="string">
 					ブロック済み
 				</combo_item>
-				<combo_item type="string" length="1" name="LandingPoint">
+				<combo_item length="1" name="LandingPoint" type="string">
 					着地点
 				</combo_item>
-				<combo_item type="string" length="1" name="Anywhere">
+				<combo_item length="1" name="Anywhere" type="string">
 					どこでも
 				</combo_item>
 			</combo_box>
-			<text name="push_restrict_text">
+			<string name="push_restrict_text">
 				プッシングを制限
-			</text>
-			<text name="push_restrict_region_text">
-				プッシングを制限 (地域無効)
-			</text>
+			</string>
+			<string name="push_restrict_region_text">
+				プッシングを制限 (地域優先)
+			</string>
 		</panel>
 		<panel label="メディア" name="land_media_panel">
-			<text name="at URL:">
-				URL：
-			</text>
-			<button label="設定..." label_selected="設定..." name="set_media_url" />
 			<text name="with media:">
 				タイプ：
 			</text>
-			<combo_box name="media type"
-			     tool_tip="URL が動画、ウェブ・ページ、その他のメディアの場合に指定します" />
+			<combo_box name="media type" tool_tip="URL が動画、ウェブ・ページ、その他のメディアの場合に指定します"/>
+			<text name="at URL:">
+				URL：
+			</text>
+			<button label="設定..." label_selected="設定..." name="set_media_url"/>
 			<text name="Description:">
 				説明：
 			</text>
-			<line_editor name="url_description"
-			     tool_tip="［再生］/［ロード］ボタンの隣に表示されるテキスト" />
+			<line_editor name="url_description" tool_tip="［再生］/［ロード］ボタンの隣に表示されるテキスト"/>
+			<text length="1" name="Media texture:" type="string">
+				テクスチ
+ャ取替：
+			</text>
+			<texture_picker label="" name="media texture" tool_tip="写真をクリックして選択"/>
 			<text name="replace_texture_help">
 				［再生］矢印をクリックすると、このテクスチャーを使用するオブジェクトに
 動画またはウェブ・ページが表示されます。
@@ -392,20 +357,15 @@
 				メディア
 オプション：
 			</text>
-			<check_box label="メディアのループ" name="media_loop"
-			     tool_tip="メディアをループ再生します。  メディアの再生が終わったら、最初から再生し直します。" />
-			<check_box label="メディア URL を隠す" name="hide_media_url"
-			     tool_tip="このオプションをオンにすると、許可なしでこの区画情報にアクセスしているユーザーにはメディア URL が表示されません。 これは HTML タイプには使用できませんのでご注意ください。" />
-			<check_box label="音楽のURLを隠す" name="hide_music_url"
-			     tool_tip="このオプションをオンにすると、許可なしでこの区画情報にアクセスしているユーザーには音楽の URL が表示されません。" />
-			<text name="media_size"
-			     tool_tip="レンダリングするウェブ・メディアのサイズ。デフォルトの 0 のままにします。">
+			<check_box label="スケールを自動設定" name="media_auto_scale" tool_tip="このオプションをチェックすると、この区画のコンテンツのスケールが自動的に設定されます。 動作速度と画質が少し低下することがありますが、他のテクスチャーのスケーリングや整列が必要になることはありません。"/>
+			<check_box label="メディアのループ" name="media_loop" tool_tip="メディアをループ再生します。  メディアの再生が終わったら、最初から再生し直します。"/>
+			<check_box label="メディア URL を隠す" name="hide_media_url" tool_tip="このオプションをオンにすると、許可なしでこの区画情報にアクセスしているユーザーにはメディア URL が表示されません。 これは HTML タイプには使用できませんのでご注意ください。"/>
+			<check_box label="音楽のURLを隠す" name="hide_music_url" tool_tip="このオプションをオンにすると、許可なしでこの区画情報にアクセスしているユーザーには音楽の URL が表示されません。"/>
+			<text name="media_size" tool_tip="レンダリングするウェブ・メディアのサイズ。デフォルトの 0 のままにします。">
 				サイズ：
 			</text>
-			<spinner name="media_size_width"
-			     tool_tip="レンダリングするウェブ・メディアのサイズ。デフォルトの 0 のままにします。" />
-			<spinner name="media_size_height"
-			     tool_tip="レンダリングするウェブ・メディアのサイズ。デフォルトの 0 のままにします。" />
+			<spinner name="media_size_width" tool_tip="レンダリングするウェブ・メディアのサイズ。デフォルトの 0 のままにします。"/>
+			<spinner name="media_size_height" tool_tip="レンダリングするウェブ・メディアのサイズ。デフォルトの 0 のままにします。"/>
 			<text name="pixels">
 				ピクセル
 			</text>
@@ -415,27 +375,11 @@
 			<text name="Sound:">
 				サウンド：
 			</text>
-			<check_box label="空間音響をこの区画だけに限定" name="check sound local" />
-			<text type="string" length="1" name="Music URL:">
-				ミュージックURL：
-			</text>
-			<text type="string" length="1" name="Media texture:">
-				テクスチ
-ャ取替：
-			</text>
-			<text type="string" length="1" name="Replace this texture:">
-				このテクスチャーを置換：
-			</text>
-			<texture_picker label="" name="media texture" tool_tip="写真をクリックして選択" />
-			<text type="string" length="1" name="with content from this URL:">
-				この URLからのコンテンツ：
-			</text>
-			<check_box label="スケールを自動設定" name="media_auto_scale"
-			     tool_tip="このオプションをチェックすると、この区画のコンテンツのスケールが自動的に設定されます。 動作速度と画質が少し低下することがありますが、他のテクスチャーのスケーリングや整列が必要になることはありません。" />
+			<check_box label="空間音響をこの区画だけに限定" name="check sound local"/>
 			<text name="Voice settings:">
 				ボイス：
 			</text>
-			<radio_group name="parcel_voice_channel">
+			<radio_group name="parcel_voice_channel" width="310">
 				<radio_item name="Estate">
 					不動産空間チャンネルを使用
 				</radio_item>
@@ -448,23 +392,20 @@
 			</radio_group>
 		</panel>
 		<panel label="アクセス" name="land_access_panel">
-			<text type="string" length="1" name="Limit access to this parcel to:">
+			<text length="1" name="Limit access to this parcel to:" type="string">
 				この区画にアクセス
 			</text>
-			<check_box label="パブリック・アクセスを許可" name="public_access" />
+			<check_box label="パブリック・アクセスを許可" name="public_access"/>
 			<text name="Only Allow">
 				次の住人のアクセスをブロック：
 			</text>
-			<check_box label="Linden Labに支払い情報を登録していない住人"
-			     name="limit_payment" tool_tip="年齢未確認の住人を排除する" />
-			<check_box label="年齢確認を済ませていない成人の住人"
-			     name="limit_age_verified"
-			     tool_tip="年齢確認を済ませていない住人を排除する詳細については、support.secondlife.comを参照してください。" />
+			<check_box label="Linden Labに支払い情報を登録していない住人" name="limit_payment" tool_tip="年齢未確認の住人を排除する"/>
+			<check_box label="年齢確認を済ませていない成人の住人" name="limit_age_verified" tool_tip="年齢確認を済ませていない住人を排除する詳細については、support.secondlife.comを参照してください。"/>
 			<string name="estate_override">
 				1つ以上のオプションが、不動産レベルで設定されています。
 			</string>
-			<check_box label="グループ・アクセスを許可：[GROUP]" name="GroupCheck"
-			     tool_tip="[一般]タブで、グループを選択してください。" />
+			<check_box label="グループ・アクセスを許可：[GROUP]" name="GroupCheck" tool_tip="[一般]タブで、グループを選択してください。"/>
+			<check_box label="パスを販売：" name="PassCheck" tool_tip="この区画への一時的なアクセスを許可"/>
 			<combo_box name="pass_combo">
 				<combo_item name="Anyone">
 					誰でも
@@ -473,45 +414,20 @@
 					グループ
 				</combo_item>
 			</combo_box>
+			<spinner label="L$建て価格：" name="PriceSpin"/>
+			<spinner label="アクセス時間：" name="HoursSpin"/>
 			<text label="常に許可" name="AllowedText">
 				許可された住人
 			</text>
-			<button label="追加..." label_selected="追加..." name="add_allowed" />
-			<button label="削除" label_selected="削除" name="remove_allowed" />
-			<check_box label="禁止" name="BanCheck">
+			<name_list name="AccessList" tool_tip="([LISTED]リスト入り、[MAX]最大)"/>
+			<button label="追加..." label_selected="追加..." name="add_allowed"/>
+			<button label="削除" label_selected="削除" name="remove_allowed"/>
+			<text label="禁止" name="BanCheck">
 				禁止された住人
-			</check_box>
-			<name_list name="AccessList" tool_tip="([LISTED]リスト入り、[MAX]最大)">
-				<column label="許可された住人" name="name" />
-			</name_list>
-			<button label="追加..." label_selected="追加..." name="Add..." />
-			<button label="削除" label_selected="削除" name="Remove" />
-			<check_box label="パスを販売：" name="PassCheck"
-			     tool_tip="この区画への一時的なアクセスを許可" />
-			<spinner label="L$建て価格：" name="PriceSpin" />
-			<spinner label="アクセス時間：" name="HoursSpin" />
-			<name_list name="BannedList" tool_tip="([LISTED]リスト入り、[MAX]最大)" />
-			<button label="追加..." label_selected="追加..." name="add_banned" />
-			<button label="削除" label_selected="削除" name="remove_banned" />
-		</panel>
-		<panel label="禁止" name="land_ban_panel">
-			<check_box
-			     label="これらのアバターを禁止する:([LISTED]リスト済み、[MAX]最大)"
-			     name="LandBanCheck" />
-			<name_list name="LandBanList">
-				<column label="禁止された住人" name="name" />
-			</name_list>
-			<button label="追加..." label_selected="追加..." name="Add..." />
-			<button label="削除" label_selected="削除" name="Remove" />
-			<text type="string" length="1" name="Deny by Payment Status:">
-				支払い状況により拒否：
-			</text>
-			<check_box label="支払い情報の登録がないものを拒否"
-			     name="DenyAnonymousCheck" />
-			<check_box label="支払い情報の登録があるものを拒否"
-			     name="DenyIdentifiedCheck" />
-			<check_box label="支払い情報が使用されているものを拒否"
-			     name="DenyTransactedCheck" />
+			</text>
+			<name_list name="BannedList" tool_tip="([LISTED]リスト入り、[MAX]最大)"/>
+			<button label="追加..." label_selected="追加..." name="add_banned"/>
+			<button label="削除" label_selected="削除" name="remove_banned"/>
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
index ee7e4dff94..fb0659f694 100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="avatar_texture_debug" title="アバター・テクスチャー">
-	<text name="">
-		構築されたテクスチャー
+	<text name="baked_label" width="128">
+		構築されたﾃｸｽﾁｬｰ
 	</text>
-	<text name="">
-		合成テクスチャー
-	</text>
-	<text name="baked_label">
-		構築されたテクスチャー
-	</text>
-	<text name="composite_label">
+	<text name="composite_label" width="128">
 		合成テクスチャー
 	</text>
 	<texture_picker label="頭" name="baked_head" />
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
index ca8f44d7a1..3079d45e73 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
@@ -35,19 +35,19 @@
 		データを取得しています...
 	</text>
 	<text name="balance_label">
-		現在所有しているのは
+		現在所有している額
 	</text>
 	<text name="balance_amount">
 		L$ [AMT]
 	</text>
 	<text name="buying_label">
-		あなたは購しようとしています
+		購入する額
 	</text>
 	<text name="buying_amount">
 		L$ [AMT]
 	</text>
 	<text name="total_label">
-		あなたの残高は
+		合計残高
 	</text>
 	<text name="total_amount">
 		L$ [AMT]
diff --git a/indra/newview/skins/default/xui/ja/floater_customize.xml b/indra/newview/skins/default/xui/ja/floater_customize.xml
index 7b4fdbcf6e..3b99bc9f47 100644
--- a/indra/newview/skins/default/xui/ja/floater_customize.xml
+++ b/indra/newview/skins/default/xui/ja/floater_customize.xml
@@ -53,7 +53,7 @@
 		<panel label="スキン" name="Skin">
 			<button label="スキンの色" label_selected="スキンの色" name="Skin Color" />
 			<button label="顔の細部" label_selected="顔の細部" name="Face Detail" />
-			<button label="メイクアップ" label_selected="メイクアップ" name="Makeup" />
+			<button label="ﾒｲｸｱｯﾌﾟ" label_selected="ﾒｲｸｱｯﾌﾟ" name="Makeup" />
 			<button label="身体細部" label_selected="身体細部" name="Body Detail" />
 			<text type="string" length="1" name="title">
 				[DESC]
diff --git a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
index 9da09ffaef..7413141e56 100644
--- a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
@@ -33,9 +33,9 @@
 	<text name="Enable VBO:">
 		VBO を有効化：
 	</text>
-	<check_box label="OpenGL Vertex Buffer オブジェクトを有効化" name="vbo"
+	<check_box label="OpenGL Vertex Buffer Objectsを有効化" name="vbo"
 	     tool_tip="最新のハードウェアでこの設定を有効にすると、パフォーマンスが向上します。  しかし、旧型のハードウェアでは VBO の実装が貧弱な場合が多く、この設定を有効にすることでクラッシュにつながるおそれがあります。" />
-	<slider label="テクスチャ記憶(MB)：" name="GrapicsCardTextureMemory"
+	<slider label="テクスチャﾒﾓﾘ(MB)：" name="GrapicsCardTextureMemory"
 	     tool_tip="テクスチャーに割り当てるメモリの合計。 ビデオ・カード・メモリをデフォルトにします。 この数値を減らすと、パフォーマンスが改善されますが、テクスチャーがぼやけた感じになる場合があります。" />
 	<spinner label="フォグの距離比率：" name="fog" />
 	<button label="OK" label_selected="OK" name="OK" />
diff --git a/indra/newview/skins/default/xui/ja/floater_im.xml b/indra/newview/skins/default/xui/ja/floater_im.xml
index 30dae0a76d..eec644715d 100644
--- a/indra/newview/skins/default/xui/ja/floater_im.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im.xml
@@ -10,7 +10,7 @@
 		このボイスチャットに応答/接続する場合は、[BUTTON NAME]をクリックしてください。
 	</string>
 	<string name="muted_message">
-		あなたはこの住人をミュートしています。 メッセージを送信すると、ミュートは自動的に解除されます。
+		あなたはこの住人を無視しています。 メッセージを送信すると、無視設定は自動的に解除されます。
 	</string>
 	<string name="generic_request_error">
 		要求中にエラーが発生しました。後でもう一度試してください。
diff --git a/indra/newview/skins/default/xui/ja/floater_inspect.xml b/indra/newview/skins/default/xui/ja/floater_inspect.xml
index 81484f4ef3..fe2f0753e4 100644
--- a/indra/newview/skins/default/xui/ja/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inspect.xml
@@ -2,7 +2,7 @@
 <floater name="inspect" title="オブジェクト検査">
 	<scroll_list name="object_list"
 	     tool_tip="このリストからオブジェクトを選択し、この世界で強調表示します。">
-		<column label="オブジェクト名" name="object_name" />
+		<column label="ｵﾌﾞｼﾞｪｸﾄ名" name="object_name" />
 		<column label="所有者名" name="owner_name" />
 		<column label="制作者名" name="creator_name" />
 		<column label="作成日" name="creation_date" />
diff --git a/indra/newview/skins/default/xui/ja/floater_media_browser.xml b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
index 55707b9c95..a0029912f5 100644
--- a/indra/newview/skins/default/xui/ja/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
@@ -3,7 +3,7 @@
 	<layout_stack name="stack1">
 		<layout_panel name="nav_controls">
 			<button label="戻る" name="back" />
-			<button label="転送" name="forward" />
+			<button label="進む" name="forward" />
 			<button label="再ロード" name="reload" />
 			<button label="行く" name="go" />
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_mute_object.xml b/indra/newview/skins/default/xui/ja/floater_mute_object.xml
index abb738adad..c32d68405c 100644
--- a/indra/newview/skins/default/xui/ja/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_mute_object.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute by name" title="オブジェクト名でミュート(消声)する">
+<floater name="mute by name" title="オブジェクト名で無視する">
 	<text name="message">
-		名前によるミュート(消声)は、オブジェクト・チャット、およびＩＭのみに影響し、サウンド(環境音など)には影響しません。
-正確なオブジェクト名をタイプする必要があります。
+		ﾃｷｽﾄのみに影響し、ｻｳﾝﾄﾞ(環境音など)には影響しません。
+正確なオブジェクト名を入力してください。
 	</text>
 	<line_editor name="object_name">
 		オブジェクト名
 	</line_editor>
 	<button label="OK" name="OK" />
-	<button label="キャンセル" name="Cancel" />
+	<button label="ｷｬﾝｾﾙ" name="Cancel" />
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_postcard.xml b/indra/newview/skins/default/xui/ja/floater_postcard.xml
index 1689ec74f4..65c4f65185 100644
--- a/indra/newview/skins/default/xui/ja/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/ja/floater_postcard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Postcard" title="スナップショットを電子メールで送信">
+<floater name="Postcard" title="スナップショットをEメールで送信">
 	<text name="to_label">
-		住人の電子メール：
+		住人のEメール：
 	</text>
 	<line_editor left="145" name="to_form" width="125" />
 	<text name="from_label">
@@ -15,13 +15,13 @@
 	<text name="subject_label">
 		件名：
 	</text>
-	<line_editor label="件名をここにタイプ。" left="145" name="subject_form"
+	<line_editor label="件名をここに入力" left="145" name="subject_form"
 	     width="125" />
 	<text name="msg_label">
 		メッセージ：
 	</text>
 	<text_editor bottom_delta="-120" height="110" name="msg_form">
-		メッセージをここにタイプ。
+		メッセージをここに入力してください。
 	</text_editor>
 	<check_box label="ウェブ上で公開" name="allow_publish_check"
 	     tool_tip="このポストカードをウェブ上で公開します。" />
@@ -29,12 +29,12 @@
 	     tool_tip="このポストカードには成人向け内容が含まれます。" />
 	<button label="?" left="300" name="publish_help_btn" />
 	<text name="fine_print">
-		あなたの受信者がSLに参加すると、あなたは紹介ボーナスを受け取れます
+		この受信者がSLに参加すると、あなたに紹介ボーナスが入ります
 	</text>
 	<button bottom_delta="-52" label="取り消し" name="cancel_btn" />
 	<button label="送信" name="send_btn" />
 	<text name="default_subject">
-		Second Life からのポストカード。
+		Second Life からのポストカード
 	</text>
 	<text name="default_message">
 		これは絶対チェック！
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
index bc5675c432..61665a124a 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
@@ -22,7 +22,7 @@
 	<text name="key_label">
 		ショートカット・キー：
 	</text>
-	<combo_box label="なし" name="modifier_combo"/>
+	<combo_box label="なし" name="modifier_combo" left="160"/>
 	<combo_box label="なし" name="key_combo"/>
 	<text name="library_label">
 		ライブラリ：
@@ -30,12 +30,14 @@
 	<text name="steps_label">
 		手順：
 	</text>
+	<!-- Revert translations as interim fix to VWR-9985 while the code is not properly internationalized
 	<scroll_list name="library_list">
 		アニメーション
 サウンド
 チャット
 待機
 	</scroll_list>
+	-->
 	<button label="追加＞＞" name="add_btn"/>
 	<button label="上に移動" name="up_btn"/>
 	<button label="下に移動" name="down_btn"/>
@@ -55,7 +57,7 @@
 	</radio_group>
 	<check_box label="アニメーションが完了するまで" name="wait_anim_check"/>
 	<check_box label="秒表示の時間" name="wait_time_check"/>
-	<check_box label="アクティブ" name="active_check" tool_tip="アクティブ・ジェスチャーは、トリガー・フレーズを使うか、またはホット・キーを押すことによってトリガーできます。  1つのショートカット・キーに2つ以上のジェスチャーが割り当てられた場合、そのジェスチャーは両方ともアクティブではなくなります。"/>
+	<check_box label="アクティブ" left="120" name="active_check" tool_tip="アクティブ・ジェスチャーは、トリガー・フレーズを使うか、またはホット・キーを押すことによってトリガーできます。  1つのショートカット・キーに2つ以上のジェスチャーが割り当てられた場合、そのジェスチャーは両方ともアクティブではなくなります。"/>
 	<button label="プレビュー" name="preview_btn"/>
 	<button label="保存" name="save_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
index 29dfb2ad09..eddccdf5dc 100644
--- a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_report_abuse" title="嫌がらせの報告">
+	<texture_picker label="" name="screenshot"/>
+	<check_box label="ｽｸﾘｰﾝｼｮｯﾄを含める" name="screen_check"/>
 	<text name="reporter_title">
 		報告者：
 	</text>
@@ -15,16 +17,13 @@
 	<text name="pos_title">
 		位置：
 	</text>
-	<texture_picker name="screenshot" />
-	<check_box label="ｽｸﾘｰﾝｼｮｯﾄを含める" name="screen_check" />
 	<text name="pos_field">
 		{128.1, 128.1, 15.4}
 	</text>
-	<button label="" label_selected="" name="pick_btn"
-	     tool_tip="オブジェクト・ピッカー - この報告の主題となるオブジェクトを特定" />
 	<text name="select_object_label">
 		ボタンを使ってオブジェクトを選択：
 	</text>
+	<button label="" label_selected="" name="pick_btn" tool_tip="オブジェクト・ピッカー - この報告の主題となるオブジェクトを特定"/>
 	<text name="object_name_label">
 		名前：
 	</text>
@@ -37,11 +36,7 @@
 	<text name="owner_name">
 		Hendrerit Vulputate
 	</text>
-	<combo_box name="category_combo"
-	     tool_tip="Category -- select the category that best describes this report">
-		<combo_item name="Selectcategory">
-			カテゴリーを選択
-		</combo_item>
+	<combo_box name="category_combo" tool_tip="カテゴリー -- この報告に最も適したカテゴリーを選択してください">
 		<combo_item name="Select_category">
 			カテゴリーを選択
 		</combo_item>
@@ -63,14 +58,11 @@
 		<combo_item name="Assault__Weapons_testing_sandbox">
 			攻撃&gt;武器テスト用サンドボックス
 		</combo_item>
-		<combo_item name="Copyright_or_intellectual_property_violation">
-			著作権または知的所有権に関する違反
-		</combo_item>
 		<combo_item name="Commerce__Failure_to_deliver_product_or_service">
 			商取引&gt;製品またはサービスの提供が行われない
 		</combo_item>
-		<combo_item name="Disclosure__First_Life_information">
-			開示&gt;1st Lifeの情報
+		<combo_item name="Disclosure__Real_world_information">
+			開示 &gt; リアルワールドの情報
 		</combo_item>
 		<combo_item name="Disclosure__Remotely_monitoring chat">
 			開示&gt;離れたところからチャットをモニターしている
@@ -135,26 +127,14 @@
 		<combo_item name="Indecency__Mature_content_in_PG_region">
 			わいせつ&gt;PG地域で成人向けと見なされるコンテンツ
 		</combo_item>
-		<combo_item name="Intolerance">
-			不寛容
-		</combo_item>
-		<combo_item name="Harassment">
-			嫌がらせ
+		<combo_item name="Intellectual_property_infringement_Content_Removal">
+			知的財産の侵害 &gt; コンテンツの撤去
 		</combo_item>
-		<combo_item name="Assault">
-			攻撃
+		<combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
+			知的財産の侵害 &gt; コピーBot及び権限の悪用
 		</combo_item>
-		<combo_item name="Disclosure">
-			開示
-		</combo_item>
-		<combo_item name="Indecency">
-			わいせつ
-		</combo_item>
-		<combo_item name="Age">
-			年齢
-		</combo_item>
-		<combo_item name="Parcel">
-			区画
+		<combo_item name="Intolerance">
+			不寛容
 		</combo_item>
 		<combo_item name="Land__Abuse_of_sandbox_resources">
 			土地&gt;サンドボックス・リソースの乱用
@@ -168,9 +148,6 @@
 		<combo_item name="Land__Encroachment__Trees_plants">
 			土地&gt;不法侵入&gt;樹木/植物
 		</combo_item>
-		<combo_item name="Trademark_violation">
-			商標権の侵害
-		</combo_item>
 		<combo_item name="Wagering_gambling">
 			賭け/ギャンブル
 		</combo_item>
@@ -181,10 +158,8 @@
 	<text name="abuser_name_title">
 		迷惑ユーザーの名前：
 	</text>
-	<button label="住人を選択" label_selected="" name="select_abuser"
-	     tool_tip="嫌がらせをした人の名前をリストから選択してください。" />
-	<check_box label="嫌がらせをした人の名前が不明" name="omit_abuser_name"
-	     tool_tip="嫌がらせをした人の名前を提供できないかについて、これを確認" />
+	<button label="住人を選択" label_selected="" name="select_abuser" tool_tip="嫌がらせをした人の名前をリストから選択してください。"/>
+	<check_box label="嫌がらせをした人の名前が不明" name="omit_abuser_name" tool_tip="嫌がらせをした人の名前を提供できないかについて、これを確認"/>
 	<text name="abuser_name_title2">
 		嫌がらせの起きた場所：
 	</text>
@@ -202,7 +177,6 @@
 	<text name="incomplete_title">
 		注意：不完全なレポートは調査されません。
 	</text>
-	<button label="嫌がらせの報告" label_selected="嫌がらせの報告"
-	     name="send_btn" />
-	<button label="取り消し" label_selected="取り消し" name="cancel_btn" />
+	<button label="取り消し" label_selected="取り消し" name="cancel_btn"/>
+	<button label="嫌がらせの報告" label_selected="嫌がらせの報告" name="send_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
index 1a59057d0c..defd5b0b77 100644
--- a/indra/newview/skins/default/xui/ja/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
@@ -5,7 +5,7 @@
 	</text>
 	<radio_group label="スナップショット・タイプ" name="snapshot_type_radio">
 		<radio_item name="postcard">
-			電子メールで送信
+			Eメールで送信
 		</radio_item>
 		<radio_item name="texture">
 			持ち物に保存(L$10)
@@ -34,12 +34,12 @@
 	<text name="type_label2">
 		サイズ
 	</text>
-	<text name="format_label">
-		フォーマット
+	<text name="format_label" width="75">
+		形式
 	</text>
 	<combo_box label="解像度" name="postcard_size_combo">
 		<combo_item name="CurrentWindow">
-			現在のウィンドウ
+			現在のｳｨﾝﾄﾞｳ
 		</combo_item>
 		<combo_item name="640x480">
 			640x480
@@ -56,7 +56,7 @@
 	</combo_box>
 	<combo_box label="解像度" name="texture_size_combo">
 		<combo_item name="CurrentWindow">
-			現在のウィンドウ
+			現在のｳｨﾝﾄﾞｳ
 		</combo_item>
 		<combo_item name="Small(128x128)">
 			小（128x128）
@@ -73,7 +73,7 @@
 	</combo_box>
 	<combo_box label="解像度" name="local_size_combo">
 		<combo_item name="CurrentWindow">
-			現在のウィンドウ
+			現在のｳｨﾝﾄﾞｳ
 		</combo_item>
 		<combo_item name="320x240">
 			320x240
@@ -97,7 +97,7 @@
 			カスタム
 		</combo_item>
 	</combo_box>
-	<combo_box label="フォーマット" name="local_format_combo">
+	<combo_box label="形式" name="local_format_combo">
 		<combo_item name="PNG">
 			PNG
 		</combo_item>
@@ -108,9 +108,9 @@
 			BMP
 		</combo_item>
 	</combo_box>
-	<spinner label="幅" name="snapshot_width"/>
-	<spinner label="高さ" name="snapshot_height"/>
-	<check_box label="比率の制限" name="keep_aspect_check"/>
+	<spinner label="幅" name="snapshot_width" label_width="25" width="90"/>
+	<spinner label="高さ" name="snapshot_height" label_width="30" left="115" width="90"/>
+	<check_box label="縦横比の固定" name="keep_aspect_check"/>
 	<slider label="画質" name="image_quality_slider"/>
 	<text name="layer_type_label">
 		ｷｬﾌﾟﾁｬ：
@@ -129,7 +129,7 @@
 	<check_box label="インタフェースを表示" name="ui_check"/>
 	<check_box label="HUD オブジェクトを表示" name="hud_check"/>
 	<check_box label="保存後も開いた状態を保持" name="keep_open_check"/>
-	<check_box label="フレームをフリーズ（全画面）" name="freeze_frame_check"/>
+	<check_box label="画面全体を静止させる" name="freeze_frame_check"/>
 	<check_box label="自動更新" name="auto_snapshot_check"/>
 	<string name="unknown">
 		未知
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index b8e6c3e2d9..0842e81f1b 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -4,7 +4,7 @@
 	<text name="tool label">
 		フォーカス
 	</text>
-	<button label="" label_selected="" name="button move" tool_tip="動く" />
+	<button label="" label_selected="" name="button move" tool_tip="動かす" />
 	<text name="tool label2">
 		移動
 	</text>
@@ -137,7 +137,7 @@
 			<text name="perm_modify">
 				このオブジェクトは修正できます。
 			</text>
-			<check_box label="グループ分担" name="checkbox share with group"
+			<check_box label="グループで共同管理" name="checkbox share with group"
 			     tool_tip="グループ・メンバーに対して移動、修正、コピー、削除を許可" />
 			<text name="text deed continued">
 				譲渡...
@@ -253,7 +253,7 @@
 		</panel>
 		<panel label="オブジェクト" name="Object">
 			<text name="select_single">
-				パラメーターを編集するには、基本要素を1つだけ選択してください。
+				プリムを1つだけ選択して編集してください
 			</text>
 			<text name="edit_object">
 				オブジェクトのパラメーターを編集：
@@ -289,19 +289,19 @@
 			</text>
 			<combo_box name="material">
 				<combo_item name="Stone">
-					石
+					石材
 				</combo_item>
 				<combo_item name="Metal">
 					金属
 				</combo_item>
 				<combo_item name="Glass">
-					グラス
+					ガラス
 				</combo_item>
 				<combo_item name="Wood">
-					木
+					木材
 				</combo_item>
 				<combo_item name="Flesh">
-					肉体
+					肌
 				</combo_item>
 				<combo_item name="Plastic">
 					プラスチック
@@ -336,7 +336,7 @@
 					リング
 				</combo_item>
 				<combo_item name="Sculpted">
-					変形済み
+					スカルプト
 				</combo_item>
 			</combo_box>
 			<text name="text cut">
@@ -345,13 +345,13 @@
 			<spinner label="B" name="cut begin" />
 			<spinner label="E" name="cut end" />
 			<text name="text hollow">
-				中空
+				中空(空洞)
 			</text>
 			<text name="text skew">
 				傾斜
 			</text>
 			<text name="Hollow Shape">
-				中空の形
+				中空（空洞）の形
 			</text>
 			<combo_box name="hole">
 				<combo_item name="Default">
@@ -386,10 +386,10 @@
 			<spinner label="X" name="Shear X" />
 			<spinner label="Y" name="Shear Y" />
 			<text name="advanced_cut">
-				プロフィール・カットの始点と終点
+				ﾌﾟﾛﾌｨｰﾙ･ｶｯﾄの始点と終点
 			</text>
 			<text name="advanced_dimple">
-				さざなみの始点と終点
+				くぼみの始点と終点
 			</text>
 			<spinner label="B" name="Path Limit Begin" />
 			<spinner label="E" name="Path Limit End" />
@@ -402,9 +402,9 @@
 				半径
 			</text>
 			<text name="text revolutions">
-				レボリューション
+				回転体
 			</text>
-			<texture_picker label="変形テクスチャー" name="sculpt texture control"
+			<texture_picker label="スカルプトテクスチャー" name="sculpt texture control"
 			     tool_tip="クリックして写真を選択してください。" />
 			<check_box label="ミラー" name="sculpt mirror control"
 			     tool_tip="スカルプトされたプリムをX軸上で反転" />
@@ -433,7 +433,7 @@
 		</panel>
 		<panel label="特徴" name="Features">
 			<text name="select_single">
-				特徴を編集するには、基本要素を1つだけ選択してください。
+				プリムを1つだけ選択して編集してください
 			</text>
 			<text name="edit_object">
 				オブジェクトの特徴を編集：
@@ -605,7 +605,7 @@
 		<button label="土地を放棄..." label_selected="土地を放棄..."
 		     name="button abandon land" />
 		<button label="再分割..." label_selected="再分割..." name="button subdivide land" />
-		<button label="参加する..." label_selected="参加する..."
+		<button label="統合する..." label_selected="統合する..."
 		     name="button join land" />
 		<button label="土地情報..." label_selected="土地情報..."
 		     name="button about land" />
@@ -623,7 +623,7 @@
 		土地をクリックし、ボタンを押したまま入力して修正変更
 	</text>
 	<text name="status_camera">
-		ビューをクリックし、ドラッグして変更
+		クリックしドラッグして視界を調整
 	</text>
 	<text name="status_grab">
 		ﾄﾞﾗｯｸﾞし移動､Ctrlで持上げ､Ctrl+Shiftでｽﾋﾟﾝ
diff --git a/indra/newview/skins/default/xui/ja/floater_url_entry.xml b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
index af038eab84..9b0f2dbf11 100644
--- a/indra/newview/skins/default/xui/ja/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
@@ -3,9 +3,9 @@
 	<text name="media_label">
 		メディア URL：
 	</text>
-	<button label="OK" name="ok_btn" />
-	<button label="キャンセル" name="cancel_btn" />
-	<button label="キャンセル" name="cancel_btn2" />
+	<combo_box left="100" name="media_entry" width="360" />
+	<button label="OK" name="ok_btn" width="78"/>
+	<button label="キャンセル" name="cancel_btn" width="80"/>
 	<button label="クリア" name="clear_btn" />
 	<text name="loading_label">
 		ロード中．．．
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index ef68d38717..b8880517f0 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -1,265 +1,207 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Main Menu">
 	<menu label="ファイル" name="File">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-		<menu_item_call label="画像をアップロード（L$[COST]）..." name="Upload Image" />
-		<menu_item_call label="サウンドをアップロード（L$[COST]）..." name="Upload Sound" />
-		<menu_item_call label="アニメーションをアップロード（L$[COST]）..."
-		     name="Upload Animation" />
-		<menu_item_call label="大量アップロード（L＄[COST]／ファイル）…"
-		     name="Bulk Upload" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="ウィンドウを閉じる" name="Close Window" />
-		<menu_item_call label="全てのウィンドウを閉じる" name="Close All Windows" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="テクスチャーを別名で保存..." name="Save Texture As..." />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="スナップショットを撮る" name="Take Snapshot" />
-		<menu_item_call label="スナップショットをディスクに保存"
-		     name="Snapshot to Disk" />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu label="ウィンドウ・サイズを設定" name="Set Window Size">
-			<menu_item_call label="320x240" name="320x240" />
-			<menu_item_call label="640x480" name="640x480" />
-			<menu_item_call label="800x600" name="800x600" />
-			<menu_item_separator label="-----------" name="separator" />
-			<menu_item_call label="720 x 480（NTSC）" name="720x480 (NTSC)" />
-			<menu_item_call label="768 x 576（PAL）" name="768x576 (PAL)" />
-		</menu>
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="終了" name="Quit" />
+		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+		<menu_item_call label="画像をアップロード（L$[COST]）..." name="Upload Image"/>
+		<menu_item_call label="サウンドをアップロード（L$[COST]）..." name="Upload Sound"/>
+		<menu_item_call label="アニメーションをアップロード（L$[COST]）..." name="Upload Animation"/>
+		<menu_item_call label="一括アップロード（L＄[COST]／ファイル）…" name="Bulk Upload"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="ウィンドウを閉じる" name="Close Window"/>
+		<menu_item_call label="全てのウィンドウを閉じる" name="Close All Windows"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="テクスチャーを別名で保存..." name="Save Texture As..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="スナップショットを撮る" name="Take Snapshot"/>
+		<menu_item_call label="スナップショットをディスクに保存" name="Snapshot to Disk"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="終了" name="Quit"/>
 	</menu>
 	<menu label="編集" name="Edit">
-		<menu_item_call label="元に戻す" name="Undo" />
-		<menu_item_call label="やり直し" name="Redo" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="カット" name="Cut" />
-		<menu_item_call label="コピー" name="Copy" />
-		<menu_item_call label="貼り付け" name="Paste" />
-		<menu_item_call label="削除" name="Delete" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="検索..." name="Search..." />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="すべてを選択" name="Select All" />
-		<menu_item_call label="選択解除" name="Deselect" />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu_item_call label="複製" name="Duplicate" />
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu label="オブジェクトを装着" name="Attach Object" />
-		<menu label="オブジェクトを取り外す" name="Detach Object" />
+		<menu_item_call label="元に戻す" name="Undo"/>
+		<menu_item_call label="やり直し" name="Redo"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="カット" name="Cut"/>
+		<menu_item_call label="コピー" name="Copy"/>
+		<menu_item_call label="貼り付け" name="Paste"/>
+		<menu_item_call label="削除" name="Delete"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="検索..." name="Search..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="すべてを選択" name="Select All"/>
+		<menu_item_call label="選択解除" name="Deselect"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="複製" name="Duplicate"/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu label="オブジェクトを装着" name="Attach Object"/>
+		<menu label="オブジェクトを取り外す" name="Detach Object"/>
 		<menu label="服を脱ぐ" name="Take Off Clothing">
-			<menu_item_call label="シャツ" name="Shirt" />
-			<menu_item_call label="ズボン" name="Pants" />
-			<menu_item_call label="靴" name="Shoes" />
-			<menu_item_call label="靴下" name="Socks" />
-			<menu_item_call label="ジャケット" name="Jacket" />
-			<menu_item_call label="手袋" name="Gloves" />
-			<menu_item_call label="（下着の）シャツ" name="Menu Undershirt" />
-			<menu_item_call label="（下着の）パンツ" name="Menu Underpants" />
-			<menu_item_call label="スカート" name="Skirt" />
-			<menu_item_call label="すべての服" name="All Clothes" />
+			<menu_item_call label="シャツ" name="Shirt"/>
+			<menu_item_call label="ズボン" name="Pants"/>
+			<menu_item_call label="靴" name="Shoes"/>
+			<menu_item_call label="靴下" name="Socks"/>
+			<menu_item_call label="ジャケット" name="Jacket"/>
+			<menu_item_call label="手袋" name="Gloves"/>
+			<menu_item_call label="（下着の）シャツ" name="Menu Undershirt"/>
+			<menu_item_call label="（下着の）パンツ" name="Menu Underpants"/>
+			<menu_item_call label="スカート" name="Skirt"/>
+			<menu_item_call label="すべての服" name="All Clothes"/>
 		</menu>
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu_item_call label="ジェスチャー…" name="Gestures..." />
-		<menu_item_call label="プロフィール..." name="Profile..." />
-		<menu_item_call label="容姿..." name="Appearance..." />
-		<menu_item_separator label="-----------" name="separator7" />
-		<menu_item_check label="フレンド..." name="Friends..." />
-		<menu_item_call label="グループ..." name="Groups..." />
-		<menu_item_separator label="-----------" name="separator8" />
-		<menu_item_call label="環境設定..." name="Preferences..." />
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call label="ジェスチャー…" name="Gestures..."/>
+		<menu_item_call label="プロフィール..." name="Profile..."/>
+		<menu_item_call label="容姿..." name="Appearance..."/>
+		<menu_item_separator label="-----------" name="separator7"/>
+		<menu_item_check label="フレンド..." name="Friends..."/>
+		<menu_item_call label="グループ..." name="Groups..."/>
+		<menu_item_separator label="-----------" name="separator8"/>
+		<menu_item_call label="環境設定..." name="Preferences..."/>
 	</menu>
-	<menu label="ビュー" name="View">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-		<menu_item_call label="マウスルック" name="Mouselook" />
-		<menu_item_check label="建造" name="Build" />
-		<menu_item_check label="ジョイスティック・フライカム" name="Joystick Flycam" />
-		<menu_item_call label="表示をリセット" name="Reset View" />
-		<menu_item_call label="最後のチャットを閲覧" name="Look at Last Chatter" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_check label="ツールバー" name="Toolbar" />
-		<menu_item_check label="ローカル・チャット" name="Chat History" />
-		<menu_item_check label="コミュニケーション" name="Instant Message" />
-		<menu_item_call label="持ち物" name="Inventory" />
-		<menu_item_check label="アクティブ・スピーカー" name="Active Speakers" />
-		<menu_item_check label="ミュートリスト" name="Mute List" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_check label="カメラ・コントロール" name="Camera Controls" />
-		<menu_item_check label="移動コントロール" name="Movement Controls" />
-		<menu_item_check label="世界地図" name="World Map" />
-		<menu_item_check label="ミニマップ" name="Mini-Map" />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_check label="統計バー" name="Statistics Bar" />
-		<menu_item_check label="土地境界線" name="Property Lines" />
-		<menu_item_check label="土地オーナー" name="Land Owners" />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu label="ホバリング・ヒント" name="Hover Tips">
-			<menu_item_check label="ヒントを表示" name="Show Tips" />
-			<menu_item_separator label="-----------" name="separator" />
-			<menu_item_check label="土地のヒント" name="Land Tips" />
-			<menu_item_check label="すべてのオブジェクトに関するヒント"
-			     name="Tips On All Objects" />
-		</menu>
-		<menu_item_check label="Alt キー：オブジェクト表示" name="Alt Shows Physical" />
-		<menu_item_check label="標識を常にオン" name="Beacons Always On" />
-		<menu_item_check label="透明オブジェクトを強調表示" name="Highlight Transparent" />
-		<menu label="ビーコン" name="Beacons">
-			<menu_item_check label="タッチオンリーのスクリプトを含むオブジェクト"
-			     name="Scripted Objects With Touch Only" />
-			<menu_item_check label="スクリプト・オブジェクト" name="Scripted Objects" />
-			<menu_item_check label="物理的オブジェクト" name="Physical Objects" />
-			<menu_item_check label="音源" name="Sound Sources" />
-			<menu_item_check label="パーティクル源" name="Particle Sources" />
-			<menu_item_check label="ハイライトのレンダリング" name="Render Highlights" />
-			<menu_item_check label="標識のレンダリング" name="Render Beacons" />
-			<menu_item_separator label="-----------" name="separator" />
-			<menu_item_separator label="-----------" name="separator2" />
-			<menu_item_check label="パーティクルを隠す" name="Hide Particles" />
-			<menu_item_separator label="-----------" name="separator3" />
-			<menu label="標識の幅" name="Beacon Width">
-				<menu_item_call label="1" name="Beacon Width 1" />
-				<menu_item_call label="4" name="Beacon Width 4" />
-				<menu_item_call label="16" name="Beacon Width 16" />
-				<menu_item_call label="32" name="Beacon Width 32" />
-			</menu>
+	<menu label="表示" name="View">
+		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+		<menu_item_call label="一人称視点（マウスルック）" name="Mouselook"/>
+		<menu_item_check label="制作ツール" name="Build"/>
+		<menu_item_check label="ジョイスティック操作" name="Joystick Flycam"/>
+		<menu_item_call label="表示をリセット" name="Reset View"/>
+		<menu_item_call label="最後のチャットを閲覧" name="Look at Last Chatter"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_check label="ツールバー" name="Toolbar"/>
+		<menu_item_check label="ローカル・チャット" name="Chat History"/>
+		<menu_item_check label="コミュニケーション" name="Instant Message"/>
+		<menu_item_call label="持ち物" name="Inventory"/>
+		<menu_item_check label="ボイスチャット・ユーザー一覧" name="Active Speakers"/>
+		<menu_item_check label="無視リスト" name="Mute List"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_check label="カメラ・コントロール" name="Camera Controls"/>
+		<menu_item_check label="移動コントロール" name="Movement Controls"/>
+		<menu_item_check label="世界地図" name="World Map"/>
+		<menu_item_check label="ミニマップ" name="Mini-Map"/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_check label="地域の統計情報" name="Statistics Bar"/>
+		<menu_item_check label="土地の境界線" name="Property Lines"/>
+		<menu_item_check label="土地オーナー" name="Land Owners"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu label="ヒントのポップアップ" name="Hover Tips">
+			<menu_item_check label="ヒントを表示" name="Show Tips"/>
+			<menu_item_separator label="-----------" name="separator"/>
+			<menu_item_check label="土地のヒント" name="Land Tips"/>
+			<menu_item_check label="すべてのオブジェクトに関するヒント" name="Tips On All Objects"/>
 		</menu>
-		<menu_item_check label="HUD添付物を表示" name="Show HUD Attachments" />
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="拡大" name="Zoom In" />
-		<menu_item_call label="デフォルトを拡大" name="Zoom Default" />
-		<menu_item_call label="縮小" name="Zoom Out" />
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu_item_call label="[全画面表示]" name="Toggle Fullscreen" />
-		<menu_item_call label="UIサイズをデフォルトに設定" name="Set UI Size to Default" />
+		<menu_item_check label="透明オブジェクトを強調表示" name="Highlight Transparent"/>
+		<menu_item_check label="ビーコン(標識)" name="beacons"/>
+		<menu_item_check label="パーティクルを隠す" name="Hide Particles"/>
+		<menu_item_check label="HUD装着物を表示" name="Show HUD Attachments"/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu_item_call label="カメラ・ズームイン" name="Zoom In"/>
+		<menu_item_call label="カメラ・デフォルト" name="Zoom Default"/>
+		<menu_item_call label="カメラ・ズームアウト" name="Zoom Out"/>
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call label="[全画面表示]" name="Toggle Fullscreen"/>
+		<menu_item_call label="UIサイズをデフォルトに設定" name="Set UI Size to Default"/>
 	</menu>
 	<menu label="世界" name="World">
-		<menu_item_call label="チャット" name="Chat" />
-		<menu_item_call label="ジェスチャーの開始" name="Start Gesture" />
-		<menu_item_check label="常に走る" name="Always Run" />
-		<menu_item_check label="飛行" name="Fly" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="ここにランドマークを作成" name="Create Landmark Here" />
-		<menu_item_call label="ホームをここに設定" name="Set Home to Here" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="ホームにテレポート" name="Teleport Home" />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="退席中に設定" name="Set Away" />
-		<menu_item_call label="ビジーに設定" name="Set Busy" />
-		<menu_item_call label="アニメーションをすべて停止" name="Stop All Animations" />
-		<menu_item_call label="キーを解除" name="Release Keys" />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu_item_call label="口座履歴..." name="Account History..." />
-		<menu_item_call label="自分の口座の管理..." name="Manage My Account..." />
-		<menu_item_call label="L$（リンデン・ドル）を購入" name="Buy and Sell L$..." />
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="自分の土地..." name="My Land..." />
-		<menu_item_call label="土地情報..." name="About Land..." />
-		<menu_item_call label="土地を購入..." name="Buy Land..." />
-		<menu_item_call label="地域／不動産..." name="Region/Estate..." />
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu label="太陽を調整する" name="Force Sun">
-			<menu_item_call label="日の出" name="Sunrise" />
-			<menu_item_call label="正午" name="Noon" />
-			<menu_item_call label="日没" name="Sunset" />
-			<menu_item_call label="深夜" name="Midnight" />
-			<menu_item_separator label="-----------" name="separator" />
-			<menu_item_call label="地域デフォルトに戻す" name="Revert to Region Default" />
-		</menu>
-		<menu label="環境設定" name="Environment Settings">
-			<menu_item_call label="日の出" name="Sunrise" />
-			<menu_item_call label="正午" name="Noon" />
-			<menu_item_call label="日没" name="Sunset" />
-			<menu_item_call label="深夜" name="Midnight" />
-			<menu_item_call label="地域デフォルトに戻す" name="Revert to Region Default" />
-			<menu_item_separator label="-----------" name="separator" />
-			<menu_item_call label="環境編集" name="Environment Editor" />
+		<menu_item_call label="チャット" name="Chat"/>
+		<menu_item_check label="常に走る" name="Always Run"/>
+		<menu_item_check label="飛行" name="Fly"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="この場所のランドマークを作成" name="Create Landmark Here"/>
+		<menu_item_call label="ホームをここに設定" name="Set Home to Here"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="ホームにテレポート" name="Teleport Home"/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="離席中に設定" name="Set Away"/>
+		<menu_item_call label="取り込み中に設定" name="Set Busy"/>
+		<menu_item_call label="アニメーションをすべて停止" name="Stop All Animations"/>
+		<menu_item_call label="キー制御を解除" name="Release Keys"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="口座履歴..." name="Account History...">
+			<on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=ja" />
+		</menu_item_call>
+		<menu_item_call label="自分の口座の管理..." name="Manage My Account...">
+			<on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=ja" />
+		</menu_item_call>
+		<menu_item_call label="L$（リンデン・ドル）を購入" name="Buy and Sell L$..."/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu_item_call label="自分の土地..." name="My Land..."/>
+		<menu_item_call label="土地情報..." name="About Land..."/>
+		<menu_item_call label="土地を購入..." name="Buy Land..."/>
+		<menu_item_call label="地域／不動産..." name="Region/Estate..."/>
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu label="環境の設定" name="Environment Settings">
+			<menu_item_call label="日の出" name="Sunrise"/>
+			<menu_item_call label="正午" name="Noon"/>
+			<menu_item_call label="日没" name="Sunset"/>
+			<menu_item_call label="深夜" name="Midnight"/>
+			<menu_item_call label="地域デフォルトに戻す" name="Revert to Region Default"/>
+			<menu_item_separator label="-----------" name="separator"/>
+			<menu_item_call label="環境編集" name="Environment Editor"/>
 		</menu>
 	</menu>
 	<menu label="ツール" name="Tools">
-		<menu_item_check label="リンクされたパートを編集" name="Edit Linked Parts" />
-		<menu_item_separator label="-----------" name="separator7" />
 		<menu label="ツールを選ぶ" name="Select Tool">
-			<menu_item_call label="フォーカス" name="Focus" />
-			<menu_item_call label="移動" name="Move" />
-			<menu_item_call label="編集" name="Edit" />
-			<menu_item_call label="作成" name="Create" />
-			<menu_item_call label="土地" name="Land" />
+			<menu_item_call label="フォーカス" name="Focus"/>
+			<menu_item_call label="移動" name="Move"/>
+			<menu_item_call label="編集" name="Edit"/>
+			<menu_item_call label="作成" name="Create"/>
+			<menu_item_call label="土地" name="Land"/>
 		</menu>
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_check label="自分のオブジェクトのみ選択" name="Select Only My Objects" />
-		<menu_item_check label="移動可能なオブジェクトのみ選択"
-		     name="Select Only Movable Objects" />
-		<menu_item_check label="環境で選択" name="Select By Surrounding" />
-		<menu_item_check label="非表示の選択を表示" name="Show Hidden Selection" />
-		<menu_item_check label="ライト半径一覧を表示" name="Show Light Radius for Selection" />
-		<menu_item_check label="選択ビームを表示" name="Show Selection Beam" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_check label="グリッドにスナップ" name="Snap to Grid" />
-		<menu_item_call label="オブジェクトXYをグリッドにスナップ"
-		     name="Snap Object XY to Grid" />
-		<menu_item_call label="グリッド用に[選択]を使用" name="Use Selection for Grid" />
-		<menu_item_call label="グリッドのオプション..." name="Grid Options..." />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="リンク" name="Link" />
-		<menu_item_call label="リンクしない" name="Unlink" />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="選択をフォーカス" name="Focus on Selection" />
-		<menu_item_call label="選択範囲にズームイン" name="Zoom to Selection" />
-		<menu_item_call label="オブジェクトを購入" name="Menu Object Take" />
-		<menu_item_call label="コピーを取る" name="Take Copy" />
-		<menu_item_call label="オブジェクトを持ち物に戻して保存"
-		     name="Save Object Back to My Inventory" />
-		<menu_item_call
-		     label="オブジェクトをオブジェクト・コンテンツに戻して保存"
-		     name="Save Object Back to Object Contents" />
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu_item_call label="スクリプト警告／エラー・ウィンドウを表示"
-		     name="Show Script Warning/Error Window" />
-		<menu_item_call label="選択したスクリプトを再コンパイル"
-		     name="Recompile Scripts in Selection">
-			<menu_item_call label="モノ" name="Mono" />
-			<menu_item_call label="LSL" name="LSL" />
-		</menu_item_call>
-		<menu_item_call label="選択したスクリプトをリセット"
-		     name="Reset Scripts in Selection" />
-		<menu_item_call label="選択したスクリプトを起動する"
-		     name="Set Scripts to Running in Selection" />
-		<menu_item_call label="選択したスクリプトを起動しない"
-		     name="Set Scripts to Not Running in Selection" />
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_check label="自分のオブジェクトのみ選択" name="Select Only My Objects"/>
+		<menu_item_check label="移動可能なオブジェクトのみ選択" name="Select Only Movable Objects"/>
+		<menu_item_check label="環境で選択" name="Select By Surrounding"/>
+		<menu_item_check label="非表示の選択を表示" name="Show Hidden Selection"/>
+		<menu_item_check label="ライト半径一覧を表示" name="Show Light Radius for Selection"/>
+		<menu_item_check label="選択ビームを表示" name="Show Selection Beam"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_check label="グリッドにスナップ" name="Snap to Grid"/>
+		<menu_item_call label="オブジェクトXYをグリッドにスナップ" name="Snap Object XY to Grid"/>
+		<menu_item_call label="グリッド用に[選択]を使用" name="Use Selection for Grid"/>
+		<menu_item_call label="グリッドのオプション..." name="Grid Options..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_check label="リンクされたパートを編集" name="Edit Linked Parts"/>
+		<menu_item_call label="リンク" name="Link"/>
+		<menu_item_call label="リンクしない" name="Unlink"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="選択をフォーカス" name="Focus on Selection"/>
+		<menu_item_call label="選択範囲にズームイン" name="Zoom to Selection"/>
+		<menu_item_call label="オブジェクトを購入" name="Menu Object Take"/>
+		<menu_item_call label="コピーを取る" name="Take Copy"/>
+		<menu_item_call label="オブジェクトを持ち物に戻して保存" name="Save Object Back to My Inventory"/>
+		<menu_item_call label="オブジェクトをオブジェクト・コンテンツに戻して保存" name="Save Object Back to Object Contents"/>
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call label="スクリプト警告／エラー・ウィンドウを表示" name="Show Script Warning/Error Window"/>
+		<menu label="選択したスクリプトを再コンパイル" name="Recompile Scripts in Selection">
+			<menu_item_call label="モノ" name="Mono"/>
+			<menu_item_call label="LSL" name="LSL"/>
+		</menu>
+		<menu_item_call label="選択したスクリプトをリセット" name="Reset Scripts in Selection"/>
+		<menu_item_call label="選択したスクリプトを起動する" name="Set Scripts to Running in Selection"/>
+		<menu_item_call label="選択したスクリプトを起動しない" name="Set Scripts to Not Running in Selection"/>
 	</menu>
 	<menu label="ヘルプ" name="Help">
-		<menu_item_call label="Second Life ヘルプ" name="Second Life Help" />
-		<menu_item_call label="インワールド・ヘルプ：" name="In-World Help" />
-		<menu_item_call label="追加ヘルプ" name="Additional Help" />
-		<menu_item_call label="チュートリアル" name="Tutorial" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="オフィシャルLindenブログ..." name="Official Linden Blog..." />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="スクリプト・ガイド..." name="Scripting Guide..." />
-		<menu_item_call label="スクリプト・ポータル..." name="Scripting Portal..." />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="本日のメッセージ..." name="Message of the Day..." />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu_item_call label="嫌がらせの報告..." name="Report Abuse..." />
-		<menu_item_call label="ぶつかる、押す、および当たる..."
-		     name="Bumps, Pushes &amp;amp; Hits..." />
-		<menu_item_call label="ラグ メーター" name="Lag Meter" />
-		<menu_item_separator label="-----------" name="separator7" />
+		<menu_item_call label="Second Life ヘルプ" name="Second Life Help"/>
+		<menu_item_call label="チュートリアル" name="Tutorial"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Linden公式ブログ..." name="Official Linden Blog..."/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="スクリプト・ポータル..." name="Scripting Portal..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="嫌がらせの報告..." name="Report Abuse..."/>
+		<menu_item_call label="ぶつかる、押す、および当たる..." name="Bumps, Pushes &amp;amp; Hits..."/>
+		<menu_item_call label="ラグ メーター" name="Lag Meter"/>
+		<menu_item_separator label="-----------" name="separator7"/>
 		<menu label="バグの報告" name="Bug Reporting">
-			<menu_item_call label="パブリック問題トラッカー..." name="Public Issue Tracker..." />
-			<menu_item_call label="パブリック問題トラッカー ヘルプ..."
-			     name="Publc Issue Tracker Help..." />
-			<menu_item_call label="バグの報告 101..." name="Bug Reporing 101..." />
-			<menu_item_call label="セキュリティ問題..." name="Security Issues..." />
-			<menu_item_call label="QA Wiki..." name="QA Wiki..." />
-			<menu_item_separator label="-----------" name="separator7" />
-			<menu_item_separator label="-----------" name="separator9" />
-			<menu_item_call label="バグの報告..." name="Report Bug..." />
+			<menu_item_call label="パブリック問題トラッカー..." name="Public Issue Tracker..."/>
+			<menu_item_call label="パブリック問題トラッカー ヘルプ..." name="Publc Issue Tracker Help..."/>
+			<menu_item_separator label="-----------" name="separator7"/>
+			<menu_item_call label="バグの報告 101..." name="Bug Reporing 101..."/>
+			<menu_item_call label="セキュリティ問題..." name="Security Issues...">
+				<on_click name="SecurityIssues_url" userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues/ja" />
+			</menu_item_call>
+			<menu_item_call label="QA Wiki..." name="QA Wiki..."/>
+			<menu_item_separator label="-----------" name="separator9"/>
+			<menu_item_call label="バグの報告..." name="Report Bug..."/>
 		</menu>
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="リリースノート..." name="Release Notes..." />
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu_item_call label="Second Lifeについて" name="About Second Life..." />
+		<menu_item_call label="Second Lifeについて" name="About Second Life..."/>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/ja/panel_groups.xml b/indra/newview/skins/default/xui/ja/panel_groups.xml
index 2256593ec2..ca334b461b 100644
--- a/indra/newview/skins/default/xui/ja/panel_groups.xml
+++ b/indra/newview/skins/default/xui/ja/panel_groups.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="groups">
 	<text name="groupdesc">
-		現在アクティブなグループ名は太字で表示されています。
+		ｱｸﾃｨﾌﾞなｸﾞﾙｰﾌﾟ名は太字で表示されています
 	</text>
 	<text name="groupcount">
-		あなたは[COUNT]グループに所属しています (最大[MAX])。
+		あなたは[COUNT] ｸﾞﾙｰﾌﾟに所属しています (最大[MAX])
 	</text>
 	<button label="IM/コール" name="IM"
 	     tool_tip="インスタントメッセージ・セッションを開く" />
-	<button label="インフォ" name="Info" />
+	<button label="情報" name="Info" />
 	<button label="アクティブ" name="Activate" />
-	<button label="立ち去る" name="Leave" />
+	<button label="抜ける" name="Leave" />
 	<button label="作成..." name="Create" />
 	<button label="検索..." name="Search..." />
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
index fd97d5de41..f90b012644 100644
--- a/indra/newview/skins/default/xui/ja/panel_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login.xml
@@ -1,29 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login">
-	<text name="first_name_text">
+	<text name="first_name_text" left="20">
 		ファーストネーム：
 	</text>
-	<text name="last_name_text">
+	<line_editor left="20" name="first_name_edit" width="126" />
+	<text name="last_name_text" left="158">
 		ラストネーム：
 	</text>
+	<line_editor left="158" name="last_name_edit" width="126" />
 	<text name="password_text">
 		パスワード：
 	</text>
-	<text name="start_location_text">
+	<text name="start_location_text" left="20" >
 		ログイン位置：
 	</text>
-	<combo_box name="start_location_combo">
+	<combo_box name="start_location_combo" left_delta="92" width="172">
 		<combo_item name="MyHome">
 			自宅（ホーム）
 		</combo_item>
 		<combo_item name="MyLastLocation">
-			最後のロケーション
+			最後にログアウトした場所
 		</combo_item>
 		<combo_item name="Typeregionname">
-			&lt;地域の名前入力&gt;
+			&lt; 地域の名前入力 &gt;
 		</combo_item>
 	</combo_box>
-	<check_box label="パスワードを記憶" name="remember_check"/>
+	<check_box label="パスワードを記憶" name="remember_check" left_delta="180"/>
 	<text name="full_screen_text">
 		ログイン時にはフルスクリーン表示になります
 	</text>
@@ -40,7 +42,7 @@
 	<text name="channel_text">
 		[CHANNEL] [VERSION]
 	</text>
-	<text name="forgot_password_text">
+	<text name="forgot_password_text" left="-230" width="220">
 		名前またはパスワードをお忘れですか?
 	</text>
 	<text name="forgot_password_url">
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index 96a4bc3d99..e22aca4a12 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -17,13 +17,13 @@
 	<text length="1" name="text_box2" type="string">
 		チャット・カラー：
 	</text>
-	<color_swatch label="貴方" name="user"/>
-	<color_swatch label="その他" name="agent"/>
+	<color_swatch label="貴方" name="user" width="56"/>
+	<color_swatch label="その他" name="agent" left_delta="60"/>
 	<color_swatch label="IM" name="im"/>
 	<color_swatch label="ｼｽﾃﾑ" name="system"/>
 	<color_swatch label="チャット" name="users"/>
-	<color_swatch label="所有者" name="objects"/>
-	<color_swatch label="所有者" name="owner"/>
+	<color_swatch label="ｵﾌﾞｼﾞｪｸﾄ" name="objects" width="56"/>
+	<color_swatch label="所有者" name="owner" left_delta="60"/>
 	<color_swatch label="吹出し" name="background"/>
 	<color_swatch label="URL" name="links"/>
 	<text length="1" name="text_box3" type="string">
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index dabf9e8cd7..b6211db7d0 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -1,26 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="一般" name="general_panel">
-	<combo_box name="location_combobox">
-		<combo_item name="MyHome">
-			自宅（ホーム）
-		</combo_item>
-		<combo_item name="MyLastLocation">
-			最後のロケーション
-		</combo_item>
-	</combo_box>
-	<check_box label="ログイン画面に開始ロケーションを表示"
-	     name="show_location_checkbox" />
-	<radio_group name="fade_out_radio">
-		<radio_item type="string" length="1" name="Never">
-			なし
+	<radio_group name="default_start_location">
+		<radio_item name="MyHome" tool_tip="常に自宅（ホーム）にログイン">
+			自宅(ホーム)
 		</radio_item>
-		<radio_item type="string" length="1" name="Temporarily">
-			一時的に表示
-		</radio_item>
-		<radio_item type="string" length="1" name="Always">
-			いつも
+		<radio_item name="MyLastLocation" tool_tip="常に最後にいた場所にログイン">
+			最後にログアウトした場所
 		</radio_item>
 	</radio_group>
+	<check_box label="ログイン画面にログイン位置を表示" name="show_location_checkbox"/>
 	<combo_box name="fade_out_combobox">
 		<combo_item name="Never">
 			なし
@@ -32,100 +20,89 @@
 			いつも
 		</combo_item>
 	</combo_box>
-	<check_box label="画面上で自分の名前を隠す" name="show_my_name_checkbox" />
+	<check_box label="小さなアバター名" name="small_avatar_names_checkbox"/>
+	<check_box label="画面上で自分の名前を隠す" name="show_my_name_checkbox"/>
 	<text name="group_titles_textbox">
 		グループ・タイトル：
 	</text>
-	<check_box label="グループ・タイトルをすべて非表示"
-	     name="show_all_title_checkbox" />
-	<check_box label="自分のグループ・タイトルを隠す"
-	     name="show_my_title_checkbox" />
-	<check_box label="小さなアバター名" name="small_avatar_names_checkbox" />
-	<color_swatch label="" name="effect_color_swatch"
-	     tool_tip="カラー・ピッカーをクリックして開く" />
+	<check_box label="グループ・タイトルをすべて非表示" name="show_all_title_checkbox"/>
+	<check_box label="画面上で自分のグループ・タイトルを隠す" name="show_my_title_checkbox"/>
+	<color_swatch label="" name="effect_color_swatch" tool_tip="カラー・ピッカーをクリックして開く"/>
 	<text name="UI Size:">
 		UI サイズ：
 	</text>
-	<check_box label="解像度独立スケールを使用" name="ui_auto_scale" />
-	<spinner label="退席までの時間：" name="afk_timeout_spinner" />
-	<check_box label="オンライン・フレンド通知を表示"
-	     name="friends_online_notify_checkbox" />
-	<check_box label="ミニマップを回転" name="rotate_mini_map_checkbox" />
-	<check_box label="リンデン・ドル（L$）の支払い/受け取りを通知"
-	     name="notify_money_change_checkbox" />
-	<check_box label="次回起動時グラフィックカード自動検出"
-	     name="probe_hardware_checkbox"
-	     tool_tip="Second Lifeは、あなたのハードウェアに基づいて、いくつかのグラフィック設定を自動的に構成します。  新しいハードウェアをインストールした場合は、Second Lifeに再度検出させるようにしてください。" />
-	<check_box label="デフォルト・システムのカラー選択を使用"
-	     name="use_system_color_picker_checkbox"
-	     tool_tip="Second Life内蔵でない、デフォルト・システムのカラー選択を使用" />
-	<check_box label="オーバーレイ・バーに検索パネルを表示"
-	     name="show_search_panel"
-	     tool_tip="組み込みの検索パネルを表示します。" />
-	<text type="string" length="1" name="start_location_textbox">
+	<check_box label="解像度独立スケールを使用" name="ui_auto_scale"/>
+	<spinner label="退席までの時間：" name="afk_timeout_spinner"/>
+	<check_box label="ミニマップを回転" name="rotate_mini_map_checkbox"/>
+	<check_box label="リンデン・ドル（L$）の支払い/受け取りを通知" name="notify_money_change_checkbox"/>
+	<check_box label="デフォルト・システムのカラー選択を使用" name="use_system_color_picker_checkbox" tool_tip="Second Life内蔵でない、デフォルト・システムのカラー選択を使用"/>
+	<check_box label="オーバーレイ・バーに検索パネルを表示" name="show_search_panel" tool_tip="組み込みの検索パネルを表示します。"/>
+	<text length="1" name="start_location_textbox" type="string">
 		ログイン位置：
 	</text>
-	<text type="string" length="1" name="show_names_textbox">
+	<text length="1" name="show_names_textbox" type="string">
 		名前を表示：
 	</text>
-	<text type="string" length="1" name="effects_color_textbox">
+	<text length="1" name="effects_color_textbox" type="string">
 		自分の効果の色：
 	</text>
-	<text type="string" length="1" name="seconds_textbox">
+	<text length="1" name="seconds_textbox" type="string">
 		秒
 	</text>
-	<text type="string" length="1" name="crash_report_textbox">
+	<text length="1" name="crash_report_textbox" type="string">
 		クラッシュ報告：
 	</text>
-	<text type="string" length="1" name="language_textbox">
+	<text length="1" name="language_textbox" type="string">
 		言語：
 	</text>
-	<text type="string" length="1" name="language_textbox2">
+	<text length="1" name="language_textbox2" type="string">
 		（再起動にて反映）
 	</text>
-	<text name="region_name_prompt">
+	<string name="region_name_prompt">
 		&lt;地域の名前入力&gt;
-	</text>
+	</string>
 	<combo_box name="crash_behavior_combobox">
-		<combo_item type="string" length="1" name="Askbeforesending">
+		<combo_item length="1" name="Askbeforesending" type="string">
 			送る前に確認する
 		</combo_item>
-		<combo_item type="string" length="1" name="Alwayssend">
+		<combo_item length="1" name="Alwayssend" type="string">
 			常に送信
 		</combo_item>
-		<combo_item type="string" length="1" name="Neversend">
+		<combo_item length="1" name="Neversend" type="string">
 			送信しない
 		</combo_item>
 	</combo_box>
 	<combo_box name="language_combobox">
-		<combo_item type="string" length="1" name="System Default Language">
+		<combo_item length="1" name="System Default Language" type="string">
 			システム・デフォルト
 		</combo_item>
-		<combo_item type="string" length="1" name="English">
+		<combo_item length="1" name="English" type="string">
 			English (英語)
 		</combo_item>
-		<combo_item type="string" length="1" name="Chinese">
+		<combo_item length="1" name="Chinese" type="string">
 			汉语/漢語(中国語) – ベータ
 		</combo_item>
-		<combo_item type="string" length="1" name="Deutsch(German)">
+		<combo_item length="1" name="Deutsch(German)" type="string">
 			Deutsch (ドイツ語) – ベータ
 		</combo_item>
-		<combo_item type="string" length="1" name="French">
+		<combo_item length="1" name="French" type="string">
 			Français (フランス語) – ベータ
 		</combo_item>
-		<combo_item type="string" length="1" name="(Japanese)">
+		<combo_item length="1" name="(Japanese)" type="string">
 			日本語 – ベータ
 		</combo_item>
-		<combo_item type="string" length="1" name="(Korean)">
+		<combo_item length="1" name="(Korean)" type="string">
 			한국어 (韓国語) – ベータ
 		</combo_item>
-		<combo_item type="string" length="1" name="Portugese">
+		<combo_item length="1" name="Danish" type="string">
+			Dansk (デンマーク語) - Beta
+		</combo_item>
+		<combo_item length="1" name="Portugese" type="string">
 			Português (ポルトガル語) – ベータ
 		</combo_item>
-		<combo_item type="string" length="1" name="Spanish">
+		<combo_item length="1" name="Spanish" type="string">
 			Español (スペイン語) – ベータ
 		</combo_item>
 	</combo_box>
-	<check_box label="言語をオブジェクトと共有" name="language_is_public"
-	     tool_tip="優先言語をインワールドのオブジェクトが認識する" />
+	<check_box label="言語をオブジェクトと共有" name="language_is_public" tool_tip="優先言語をインワールドのオブジェクトが認識する"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index e7311d0292..7b987d58a2 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -74,7 +74,7 @@
 		品質および
 	</text>
 	<text name="QualityText">
-		実行：
+		パフォーマンス：
 	</text>
 	<text name="FasterText">
 		速い
diff --git a/indra/newview/skins/default/xui/ja/panel_region_debug.xml b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
index 5a3a33496e..4e6bae7172 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="デバッグ" name="Debug">
 	<text name="region_text_lbl">
 		地域：
@@ -6,44 +6,35 @@
 	<text name="region_text">
 		未知
 	</text>
-	<check_box label="スクリプト無効化" name="disable_scripts_check"
-	     tool_tip="この地域のスクリプトをすべて無効化" />
-	<button label="?" name="disable_scripts_help" />
-	<check_box label="衝突を無効化" name="disable_collisions_check"
-	     tool_tip="この地域の非アバター衝突を無効化" />
-	<button label="?" name="disable_collisions_help" />
-	<check_box label="物理作用を無効化" name="disable_physics_check"
-	     tool_tip="この地域の物理作用をすべて無効化" />
-	<button label="?" name="disable_physics_help" />
-	<button label="適用" name="apply_btn" />
+	<check_box label="スクリプト無効化" name="disable_scripts_check" tool_tip="この地域のスクリプトをすべて無効化"/>
+	<button label="?" name="disable_scripts_help"/>
+	<check_box label="衝突を無効化" name="disable_collisions_check" tool_tip="この地域の非アバター衝突を無効化"/>
+	<button label="?" name="disable_collisions_help"/>
+	<check_box label="物理作用を無効化" name="disable_physics_check" tool_tip="この地域の物理作用をすべて無効化"/>
+	<button label="?" name="disable_physics_help"/>
+	<button label="適用" name="apply_btn"/>
+	<text name="objret_text_lbl" width="120" >
+		オブジェクトの返却
+	</text>
+	<text name="resident_text_lbl">
+		住人:
+	</text>
 	<line_editor name="target_avatar_name">
 		(なし)
 	</line_editor>
-	<button label="選択..." name="choose_avatar_btn" />
-	<button
-	     label="人の土地のアバター・スクリプト・オブジェクトを返却"
-	     name="return_scripted_other_land_btn" />
-	<button label="アバターのスクリプト・オブジェクトをすべて返却"
-	     name="return_scripted_all_btn" />
-	<check_box label="スクリプトのあるオブジェクトのみを返却"
-	     name="return_scripts"
-	     tool_tip="スクリプトがあるオブジェクトのみを返却" />
-	<check_box label="他人の土地にあるオブジェクトのみを返却"
-	     name="return_other_land"
-	     tool_tip="他人に属する土地にあるオブジェクトのみを返却" />
-	<check_box label="この不動産の各地域のオブジェクトを返却"
-	     name="return_estate_wide"
-	     tool_tip="この不動産に含まれているすべての地域のオブジェクトを返却" />
-	<button label="返却" name="return_btn" />
-	<button label="上部コライダー取得" name="top_colliders_btn"
-	     tool_tip="衝突する可能性が最も高いオブジェクトのリスト" />
-	<button label="?" name="top_colliders_help" />
-	<button label="上部スクリプト取得" name="top_scripts_btn"
-	     tool_tip="スクリプトの実行に最も時間を費やしているオブジェクトのリスト" />
-	<button label="?" name="top_scripts_help" />
-	<button label="地域再起動" name="restart_btn"
-	     tool_tip="2分間のカウントダウン後、地域を再起動" />
-	<button label="?" name="restart_help" />
-	<button label="再起動を遅延" name="cancel_restart_btn"
-	     tool_tip="地域の再起動を１時間遅延する" />
+	<button label="選択..." name="choose_avatar_btn"/>
+	<text name="options_text_lbl">
+		オプション:
+	</text>
+	<check_box label="スクリプトのあるオブジェクトのみを返却" name="return_scripts" tool_tip="スクリプトがあるオブジェクトのみを返却"/>
+	<check_box label="他人の土地にあるオブジェクトのみを返却" name="return_other_land" tool_tip="他人に属する土地にあるオブジェクトのみを返却"/>
+	<check_box label="この不動産の各地域のオブジェクトを返却" name="return_estate_wide" tool_tip="この不動産に含まれているすべての地域のオブジェクトを返却"/>
+	<button label="返却" name="return_btn"/>
+	<button label="上部コライダー取得" name="top_colliders_btn" tool_tip="衝突する可能性が最も高いオブジェクトのリスト"/>
+	<button label="?" name="top_colliders_help"/>
+	<button label="上部スクリプト取得" name="top_scripts_btn" tool_tip="スクリプトの実行に最も時間を費やしているオブジェクトのリスト"/>
+	<button label="?" name="top_scripts_help"/>
+	<button label="地域再起動" name="restart_btn" tool_tip="2分間のカウントダウン後、地域を再起動"/>
+	<button label="?" name="restart_help"/>
+	<button label="再起動を遅延" name="cancel_restart_btn" tool_tip="地域の再起動を１時間遅延する"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
index 26b3432e1f..67f05eb7e1 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="不動産" name="Estate">
 	<text name="estate_help_text">
-		このタブの設定を変更するとこの不動産内の全ての地域に影響を与えます。
+		このタブの設定を変更するとこの不動産内
+の全ての地域に影響を与えます。
 	</text>
 	<text name="estate_text">
 		不動産：
diff --git a/indra/newview/skins/default/xui/ja/panel_region_general.xml b/indra/newview/skins/default/xui/ja/panel_region_general.xml
index 0708c9c70e..cd1b7cea69 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_general.xml
@@ -3,20 +3,20 @@
 	<text name="region_text_lbl">
 		地域：
 	</text>
-	<text name="region_text">
+	<text name="region_text" left="90">
 		未知
 	</text>
-	<text name="version_channel_text_lbl">
-		バージョン:
+	<text name="version_channel_text_lbl" width="100">
+		バージョン：
 	</text>
-	<text name="version_channel_text">
+	<text name="version_channel_text" left="90">
 		不明
 	</text>
 	<check_box label="土地整備をブロック" name="block_terraform_check" />
 	<button label="?" name="terraform_help" />
 	<check_box label="飛行をブロック" name="block_fly_check" />
 	<button label="?" name="fly_help" />
-	<check_box label="損害を許可" name="allow_damage_check" />
+	<check_box label="ダメージを許可" name="allow_damage_check" />
 	<button label="?" name="damage_help" />
 	<check_box label="プッシュを制限" name="restrict_pushobject" />
 	<button label="?" name="restrict_pushobject_help" />
@@ -46,6 +46,6 @@
 	<button label="適用" name="apply_btn" />
 	<button label="ユーザー1人ホームテレポート" name="kick_btn" />
 	<button label="ユーザー全員ホームテレポート" name="kick_all_btn" />
-	<button label="メッセージを領域へ送信..." name="im_btn" />
+	<button label="メッセージを地域へ送信..." name="im_btn" />
 	<button label="テレハブの管理..." name="manage_telehub_btn" />
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
index bfbb2c1bd4..eb06ad7eee 100644
--- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="status">
-	<text type="string" length="1" name="ParcelNameText"
-	     tool_tip="あなたが立っている土地区画の名前。 「土地情報」をクリックしてください。">
+	<text length="1" name="ParcelNameText" tool_tip="あなたが立っている土地区画の名前。 「土地情報」をクリックしてください。" type="string">
 		区画名はここです
 	</text>
-	<text type="string" length="1" name="BalanceText" tool_tip="口座残高">
+	<text length="1" name="BalanceText" tool_tip="口座残高" type="string">
 		ローディング．．．
 	</text>
-	<button label="" label_selected="" name="buycurrency" tool_tip="貨幣の購入" />
-	<text type="string" length="12" name="TimeText" tool_tip="現在時刻（太平洋時）">
+	<button label="" label_selected="" name="buycurrency" tool_tip="貨幣の購入"/>
+	<text length="12" name="TimeText" tool_tip="現在時刻（太平洋時）" type="string">
 		12：00 AM
 	</text>
 	<text name="StatBarDaysOfWeek">
@@ -17,29 +16,27 @@
 	<text name="StatBarMonthsOfYear">
 		1月:2月:3月:4月:5月:6月:7月:8月:9月:10月:11月:12月
 	</text>
-	<button label="" label_selected="" name="scriptout"
-	     tool_tip="スクリプト警告およびエラー" />
-	<button label="" label_selected="" name="health" tool_tip="健康状態" />
-	<text type="string" length="1" name="HealthText" tool_tip="健康状態">
+	<button label="" label_selected="" name="scriptout" tool_tip="スクリプト警告およびエラー"/>
+	<button label="" label_selected="" name="health" tool_tip="健康状態"/>
+	<text length="1" name="HealthText" tool_tip="健康状態" type="string">
 		100%
 	</text>
-	<button label="" label_selected="" name="fly" tool_tip="飛行禁止" />
-	<button label="" label_selected="" name="build" tool_tip="作成禁止" />
-	<button label="" label_selected="" name="scripts" tool_tip="スクリプトなし" />
-	<button name="no_fly" tool_tip="飛行禁止" />
-	<button name="no_build" tool_tip="制作/ＲＥＺ禁止" />
-	<button name="no_scripts" tool_tip="スクリプト禁止" />
-	<button label="" label_selected="" name="restrictpush" tool_tip="llPushObject制限" />
-	<button name="status_voice" tool_tip="ボイス有効" />
-	<button name="status_no_voice"
-	     tool_tip="ここではボイスを使用できません。" />
-	<button label="" label_selected="" name="buyland" tool_tip="この区画を購入" />
+	<button label="" label_selected="" name="fly" tool_tip="飛行禁止"/>
+	<button label="" label_selected="" name="build" tool_tip="作成禁止"/>
+	<button label="" label_selected="" name="scripts" tool_tip="スクリプトなし"/>
+	<button name="no_fly" tool_tip="飛行禁止"/>
+	<button name="no_build" tool_tip="制作/ＲＥＺ禁止"/>
+	<button name="no_scripts" tool_tip="スクリプト禁止"/>
+	<button label="" label_selected="" name="restrictpush" tool_tip="プッシングを制限"/>
+	<button name="status_voice" tool_tip="ボイス有効"/>
+	<button name="status_no_voice" tool_tip="ここではボイスを使用できません。"/>
+	<button label="" label_selected="" name="buyland" tool_tip="この区画を購入"/>
 	<text name="packet_loss_tooltip">
 		パケット損失
 	</text>
 	<text name="bandwidth_tooltip">
 		帯域幅
 	</text>
-	<line_editor label="検索" name="search_editor" tool_tip="Second Lifeを検索" />
-	<button name="search_btn" tool_tip="Second Lifeを検索" />
+	<line_editor label="検索" name="search_editor" tool_tip="Second Lifeを検索"/>
+	<button name="search_btn" tool_tip="Second Lifeを検索"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pl/floater_about.xml b/indra/newview/skins/default/xui/pl/floater_about.xml
new file mode 100755
index 0000000000..2eb3455e0e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_about.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_about" title="O Second Life">
+	<text_editor name="credits_editor">
+		Second Life zostało stworzone dla Was przez: Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ i wielu innych.
+
+  Podziękowania dla następujących rezydentów za pomoc w pracy nad obecną wersją Second Life: Aminom Marvin, ava ganache, Balthazar Fouroux, CrystalShard Foo, Davec Horsforth, Drew Dwi, Ellla McMahon, Gellan Glenelg, Harleen Gretzky, istephanija munro, Iustinian Tomsen, JC Glimmer, Joeseph Albanese, kelly young, Latif Khalifa, Lex Neva, McCabe Maxsted, Michi Lumin, moni duettmann, Moon Metty, motor loon, Opensource Obscure, Sky Hye, Soap Clawtooth, velveeta biedermann, zeebster colasanti
+
+  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.
+
+  Wszystkie prawa zastrzeżone.  Szczegóły w pliku licenses.txt.
+
+  Programowanie dźwięku czatu: Polycom(R) Siren14(TM) 
+  (ITU-T Rec. G.722.1 Annex C)
+  
+  Polska wersja klienta: Maciek Marksman, Malwina Dollinger, Magnus Balczo
+  IMy z sugestiami, komentarzami i poprawkami mile widziane
+
+  We can only see a short distance ahead, but we can see plenty there that needs to be done. --Alan Turing
+	</text_editor>
+	<string name="you_are_at">
+		Położenie: [POSITION]
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_about_land.xml b/indra/newview/skins/default/xui/pl/floater_about_land.xml
new file mode 100755
index 0000000000..fa01ebf0fa
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_about_land.xml
@@ -0,0 +1,431 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floaterland" title="O Posiadłości">
+	<tab_container name="landtab">
+		<panel label="Ogólne" name="land_general_panel">
+			<text length="1" name="Name:" type="string">
+				Nazwa:
+			</text>
+			<text length="1" name="Description:" type="string">
+				Opis:
+			</text>
+			<text length="1" name="Owner:" type="string">
+				Właściciel:
+			</text>
+			<text length="1" name="OwnerText" type="string">
+				Leyla Linden
+			</text>
+			<button label="Profile..." label_selected="Profile..." name="Profile..."/>
+			<text length="1" name="Group:" type="string">
+				Groupa:
+			</text>
+			<button label="Ustaw..." label_selected="Ustaw..." name="Set..."/>
+			<check_box label="Udostępnij przypisywanie na grupę" name="check deed" tool_tip="Oficer grupy ma prawo przepisać prawo własności posiadłości na grupę. Posiadłość wspierana jest przez przydziały pochodzące od członków grupy."/>
+			<button label="Przypisz..." label_selected="Przypisz..." name="Deed..." tool_tip="Prawo przypisania posiadłości na grupę może dokonać jedynie oficer grupy."/>
+			<check_box label="Właścicel dokonuje wpłat związanych z posiadłością" name="check contrib" tool_tip="Kiedy posiadłość zostaje przypisana na grupę, poprzedni właściciel realizuje wpłaty z nią związane w celu jej utrzymania."/>
+			<text length="1" name="For Sale:" type="string">
+				Na Sprzedaż:
+			</text>
+			<text length="1" name="Not for sale." type="string">
+				Nie
+			</text>
+			<text length="1" name="For Sale: Price L$[PRICE]." type="string">
+				Cena: [PRICE]L$.
+			</text>
+			<button label="Sprzedaj Posiadłość..." label_selected="Sprzedaj Posiadłość..." name="Sell Land..."/>
+			<text length="1" name="For sale to" type="string">
+				Na sprzedaż dla: [BUYER]
+			</text>
+			<text length="1" name="Sell with landowners objects in parcel." type="string">
+				Obiekty są zawarte w sprzedaży.
+			</text>
+			<text length="1" name="Selling with no objects in parcel." type="string">
+				Obiekty nie są zawarte w sprzedaży.
+			</text>
+			<button label="Anuluj Sprzedaż" label_selected="Anuluj Sprzedaż" name="Cancel Land Sale"/>
+			<text length="1" name="Claimed:" type="string">
+				Data:
+			</text>
+			<text length="1" name="DateClaimText" type="string">
+				Tue Aug 15 13:47:25 2006
+			</text>
+			<text length="1" name="PriceLabel" type="string">
+				Obszar:
+			</text>
+			<text length="1" name="PriceText" type="string">
+				4048 m
+			</text>
+			<text length="1" name="Traffic:" type="string">
+				Ruch:
+			</text>
+			<text length="1" name="DwellText" type="string">
+				0
+			</text>
+			<button label="Kup Posiadłość" label_selected="Kup Posiadłość" name="Buy Land..."/>
+			<button label="Kup dla Grupy..." label_selected="Kup dla Grupy..." name="Buy For Group..."/>
+			<button label="Kup Przepustkę..." label_selected="Kup Przeputkę..." name="Buy Pass..." tool_tip="Przepustka udostępnia tymczasowy wstęp na posiadłość."/>
+			<button label="Porzuć z Posiadłości..." label_selected="Porzuć z Posiadłości..." name="Abandon Land..."/>
+			<button label="Odzyskaj Posiadłość..." label_selected="Odzyskaj Posiadłość..." name="Reclaim Land..."/>
+			<button label="Sprzedaż przez Lindenów..." label_selected="Sprzedaż przez Lindenów..." name="Linden Sale..." tool_tip="Posiadłość musi mieć właściciela, zawartość oraz nie może być wystawiona na aukcę."/>
+			<string name="new users only">
+				Tylko nowi użytkownicy
+			</string>
+			<string name="anyone">
+				Każdy
+			</string>
+			<string name="area_text">
+				Obszar
+			</string>
+			<string name="area_size_text">
+				[AREA] m
+			</string>
+			<string name="auction_id_text">
+				Numer aukcji: [ID]
+			</string>
+			<string name="need_tier_to_modify">
+				Musisz zaakceptować zakup by móc modyfikować posiadłość.
+			</string>
+			<string name="group_owned_text">
+				(Własność Grupy)
+			</string>
+			<string name="profile_text">
+				Profil...
+			</string>
+			<string name="info_text">
+				Info...
+			</string>
+			<string name="public_text">
+				(publiczne)
+			</string>
+			<string name="none_text">
+				(brak)
+			</string>
+			<string name="sale_pending_text">
+				(Sprzedaż w Toku Realizacji)
+			</string>
+			<string name="no_selection_text">
+				Posiadłość nie wybrana.
+Idź do Świat &gt; O Posiadłości albo wybierz inną posiadłość żeby pokazać jej dane.
+			</string>
+		</panel>
+		<panel label="Umowa" name="land_covenant_panel">
+			<text length="1" name="covenant_timestamp_text" type="string">
+				Ostatnia Modyfikacja Wed Dec 31 16:00:00 1969
+			</text>
+			<text length="1" name="region_name_lbl" type="string">
+				Region:
+			</text>
+			<text length="1" name="region_name_text" type="string">
+				leyla
+			</text>
+			<text length="1" name="estate_name_lbl" type="string">
+				Posiadłość:
+			</text>
+			<text length="1" name="estate_name_text" type="string">
+				Główne
+			</text>
+			<text length="1" name="estate_owner_lbl" type="string">
+				Właściciel:
+			</text>
+			<text length="1" name="estate_owner_text" type="string">
+				(brak)
+			</text>
+			<text length="1" name="resellable_clause" type="string">
+				Posiadłość zakupiona w tym regionie nie może być odsprzedana.
+			</text>
+			<text length="1" name="changeable_clause" type="string">
+				Posiadłość zakupiona w tym regionie nie może być łączona/dzielona
+			</text>
+			<text_editor length="1" name="covenant_editor" type="string">
+				Ta posiadłość nie wymaga żadej umowy.
+			</text_editor>
+			<string name="can_resell">
+				Posiadłość zakupiona w tym regionie może być odsprzedana.
+			</string>
+			<string name="can_not_resell">
+				Posiadłość zakupiona w tym regionie nie może być odsprzedana.
+			</string>
+			<string name="can_change">
+				Posiadłość zakupiona w tym regionie może być łączona/dzielona
+			</string>
+			<string name="can_not_change">
+				Posiadłość zakupiona w tym regionie nie może być łączona/dzielona
+			</string>
+		</panel>
+		<panel label="Obiekty" name="land_objects_panel">
+			<text length="1" name="parcel_object_bonus" type="string">
+				Ilość Ekstra Obiektów: [BONUS]
+			</text>
+			<text length="1" name="Simulator primitive usage:" type="string">
+				Ilość używanych elementów:
+			</text>
+			<text length="1" name="objects_available" type="string">
+				[COUNT] z [MAX] ([AVAILABLE] jest dostępne)
+			</text>
+			<string name="objects_available_text">
+				[COUNT] z [MAX] ([AVAILABLE] jest dostępne)
+			</string>
+			<string name="objects_deleted_text">
+				[COUNT] z [MAX] ([DELETED] zostanie usunięte)
+			</string>
+			<text length="1" name="Primitives parcel supports:" type="string">
+				Maksymalna ilość elementów:
+			</text>
+			<text length="1" name="object_contrib_text" type="string">
+				[COUNT]
+			</text>
+			<text length="1" name="Primitives on parcel:" type="string">
+				Elementy w posiadłości:
+			</text>
+			<text length="1" name="total_objects_text" type="string">
+				[COUNT]
+			</text>
+			<text length="1" name="Owned by parcel owner:" type="string">
+				Właściciela posiadłości:
+			</text>
+			<text length="1" name="owner_objects_text" type="string">
+				[COUNT]
+			</text>
+			<button label="Pokaż" label_selected="Pokaż" name="ShowOwner"/>
+			<button label="Zwróć..." label_selected="Zwróć..." name="ReturnOwner..." tool_tip="Zwróć obiekty do ich właścicieli."/>
+			<text length="1" name="Set to group:" type="string">
+				Grupy:
+			</text>
+			<text length="1" name="group_objects_text" type="string">
+				[COUNT]
+			</text>
+			<button label="Pokaż" label_selected="Pokaż" name="ShowGroup"/>
+			<button label="Zwróć..." label_selected="Zwróć..." name="ReturnGroup..." tool_tip="Zwróć obiekty do ich właścicieli.."/>
+			<text length="1" name="Owned by others:" type="string">
+				Innych Rezydentów:
+			</text>
+			<text length="1" name="other_objects_text" type="string">
+				[COUNT]
+			</text>
+			<button label="Pokaż" label_selected="Pokaż" name="ShowOther"/>
+			<button label="Zwróć..." label_selected="Zwróć..." name="ReturnOther..." tool_tip="Zwróć obiekty do ich właścicieli."/>
+			<text length="1" name="Selected / sat upon:" type="string">
+				Wybranych:
+			</text>
+			<text length="1" name="selected_objects_text" type="string">
+				[COUNT]
+			</text>
+			<text length="1" name="Autoreturn" type="string">
+				Zwracaj obiekty innych Rezydentów (minut, 0 = wyłącz):
+			</text>
+			<text length="1" name="Object Owners:" type="string">
+				Właściciel Obiektów
+			</text>
+			<button label="Odśwież Listę" label_selected="Odśwież Listę" name="Refresh List"/>
+			<button label="Zwróć obiekty..." label_selected="Zwróć obiekty..." name="Return objects..."/>
+			<name_list name="owner list">
+				<column label="Typ" name="type"/>
+				<column name="online_status"/>
+				<column label="Nazwa" name="name"/>
+				<column label="Liczba" name="count"/>
+			</name_list>
+		</panel>
+		<panel label="Opcje" name="land_options_panel">
+			<text length="1" name="allow_label" type="string">
+				Udostępnij innym Rezydentom:
+			</text>
+			<check_box label="Edytowanie Terenu" name="edit land check" tool_tip="Wybrana - każdy może kształtować Twój teren. Najlepiej jest zostawić tą opcję nie wybraną, Ty zawsze możesz kształtowć Twój teren."/>
+			<check_box label="Zapisywania Miejsca" name="check landmark"/>
+			<check_box label="Latanie" name="check fly" tool_tip="Wybrana - Rezydenci mogą latać na Twojej posiadłości. Nie wybrana - mogą tylko wlatywać do lub latać ponad Twoją posiadłością."/>
+			<text length="1" name="allow_label2" type="string">
+				Budowanie:
+			</text>
+			<check_box label="Wszyscy" name="edit objects check"/>
+			<check_box label="Grupa" name="edit group objects check"/>
+			<text length="1" name="allow_label3" type="string">
+				Nowe Obiekty:
+			</text>
+			<check_box label="Wszyscy" name="all object entry check"/>
+			<check_box label="Gropa" name="group object entry check"/>
+			<text length="1" name="allow_label4" type="string">
+				Skrypty:
+			</text>
+			<check_box label="Wszyscy" name="check other scripts"/>
+			<check_box label="Grupa" name="check group scripts"/>
+			<text length="1" name="land_options_label" type="string">
+				Opcje Posiadłości:
+			</text>
+			<check_box label="Bezpieczna (brak zniszczeń)" name="check safe" tool_tip="Wybrana - posiadłość jest bezpieczna - zniszczenia w walce są zablokowane. Nie wybrana - zniszczenia w walce są włączone."/>
+			<check_box label="Popychanie niedozwolone" name="PushRestrictCheck" tool_tip="Nie pozwalaj skryptom na popychanie. Wybranie tej opcji może być przydatne do ograniczenia zakłóceń spokoju w Twojej posiadłości."/>
+			<check_box label="Wyświetlaj w wyszukiwarce (30L$/tyg.)" name="ShowDirectoryCheck" tool_tip="Udostępnij ukazywanie się nazwy posiadłości w wyszukiwarce"/>
+			<combo_box name="land category">
+				<combo_item name="AnyCategory">
+					Każda
+				</combo_item>
+				<combo_item name="LindenLocation">
+					Linden Lokacja
+				</combo_item>
+				<combo_item name="Adult">
+					Dla osób 18+
+				</combo_item>
+				<combo_item name="Arts&amp;Culture">
+					Sztuka i Kultura
+				</combo_item>
+				<combo_item name="Business">
+					Biznes
+				</combo_item>
+				<combo_item name="Educational">
+					Edukacyjna
+				</combo_item>
+				<combo_item name="Gaming">
+					Gra
+				</combo_item>
+				<combo_item name="Hangout">
+					Poznawanie ludzi
+				</combo_item>
+				<combo_item name="NewcomerFriendly">
+					Przyjazna dla nowych
+				</combo_item>
+				<combo_item name="Parks&amp;Nature">
+					Parki i Natura
+				</combo_item>
+				<combo_item name="Residential">
+					Mieszkalna
+				</combo_item>
+				<combo_item name="Shopping">
+					Komercja/Sklepy
+				</combo_item>
+				<combo_item name="Other">
+					Inna
+				</combo_item>
+			</combo_box>
+			<button label="?" label_selected="?" name="?"/>
+			<check_box label="Dla osób 18+" name="MatureCheck" tool_tip="Informacje dotyczące posiadłości lub jej zawartość zakwalifikowana jest dla osób dorosłych (18+)"/>
+			<text length="1" name="Snapshot:" type="string">
+				Zdjęcie:
+			</text>
+			<texture_picker label="" name="snapshot_ctrl" tool_tip="Kliknij by wybrać zdjęce"/>
+			<text length="1" name="landing_point" type="string">
+				Punkt Lądowania: [LANDING]
+			</text>
+			<string name="landing_point_none">
+				(brak)
+			</string>
+			<button label="Ustaw" label_selected="Ustaw" name="Set" tool_tip="Ustal miejsce lądowania dla przybywających gości. Używa położenia Twojego awatara na tej posiadłości."/>
+			<button label="Nowy" label_selected="Nowy" name="Clear" tool_tip="Clear the landing point."/>
+			<text length="1" name="Teleport Routing: " type="string">
+				Trasa Teleportacji:
+			</text>
+			<combo_box name="landing type" tool_tip="Trasa Teleportacj-ustaw w jaki sposób będzie sę odbywać proces telportacji w posiadłości.">
+				<combo_item length="1" name="Blocked" type="string">
+					Zablokowana
+				</combo_item>
+				<combo_item length="1" name="LandingPoint" type="string">
+					Punkt Lądowania
+				</combo_item>
+				<combo_item length="1" name="Anywhere" type="string">
+					Gdziekolwiek
+				</combo_item>
+			</combo_box>
+			<string name="push_restrict_text">
+				Popychanie niedozwolone
+			</string>
+			<string name="push_restrict_region_text">
+				Popychanie niedozwolone (Ustawienie Regionu)
+			</string>
+		</panel>
+		<panel label="Media" name="land_media_panel">
+			<text length="1" name="with media:" type="string">
+				Typ Mediów:
+			</text>
+			<combo_box name="media type" tool_tip=""/>
+			<text length="1" name="at URL:" type="string">
+				Media URL:
+			</text>
+			<button label="Ustaw..." label_selected="Ustaw..." name="set_media_url"/>
+			<text length="1" name="Description:" type="string">
+				Opis:
+			</text>
+			<line_editor name="url_description" tool_tip="Text displayed next to play/load button"/>
+			<text length="1" name="Media texture:" type="string">
+				Zmień
+Teksturę:
+			</text>
+			<texture_picker label="" name="media texture" tool_tip="Kliknij by wybrać zdjęcie"/>
+			<text name="replace_texture_help">
+				(Obiekty używające tej tekstury będą wyświetlały
+film lub stronę internetową po naciśnięciu
+przycisku odtwarzania.)
+			</text>
+			<text length="1" name="Options:" type="string">
+				Opcje
+Mediów:
+			</text>
+			<check_box label="Automatyczna Skala" name="media_auto_scale" tool_tip="Wybranie tej opcji dobierze odpowiedni rozmiar zawartości mediów dla tej posiadłości automatycznie. Może to mieć znaczący wpływ na jakość odtwarzanego materialu - może zwolnić i zmniejszyć jakość materiału."/>
+			<check_box label="Powtórka Odtwarzania" name="media_loop" tool_tip="Odtwarzaj media z powtórką. Po wyświetleniu materialu, rozpocznie się odtwarzanie od początku."/>
+			<check_box label="Ukryj Media URL" name="hide_media_url" tool_tip="Wybranie tej opcji, zablokuje widok adresu do medów wszystkim nieautoryzowanym użytkownikom. Nie dotyczy to jednak typów HTML."/>
+			<check_box label="Ukryj URL Muzyki" name="hide_music_url" tool_tip="Wybranie tej opcji, zablokuje widok adresu do medów muzycznych w posiadłości wszystkim nieautoryzowanym użytkownikom"/>
+			<text length="1" name="media_size" tool_tip="Rozmiar dla ładowania mediów internetowych. Zostaw 0 dla ustawień domyślnych." type="string">
+				Rozmiar:
+			</text>
+			<spinner name="media_size_width" tool_tip="Rozmiar dla ładowania mediów internetowych. Zostaw 0 dla ustawień domyślnych."/>
+			<spinner name="media_size_height" tool_tip="Rozmiar dla ładowania mediów internetowych. Zostaw 0 dla ustawień domyślnych."/>
+			<text length="1" name="pixels" type="string">
+				pixeli
+			</text>
+			<text length="1" name="MusicURL:" type="string">
+				URL Muzyki:
+			</text>
+			<text length="1" name="Sound:" type="string">
+				Dźwięk:
+			</text>
+			<check_box label="Ogranicz dźwięki przestrzenne w posiadłości" name="check sound local"/>
+			<text length="1" name="Voice settings:" type="string">
+				Głos:
+			</text>
+			<radio_group name="parcel_voice_channel" width="310">
+				<radio_item length="1" name="Estate" type="string">
+					Użyj kanału przestrzennego na posiadlości
+				</radio_item>
+				<radio_item length="1" name="Private" type="string">
+					Użyj kanału prywatnego na posiadlości
+				</radio_item>
+				<radio_item length="1" name="Disabled" type="string">
+					Zablokuj używanie kanału przestrzennego na posiadlości
+				</radio_item>
+			</radio_group>
+		</panel>
+		<panel label="Dostęp" name="land_access_panel">
+			<text length="1" name="Limit access to this parcel to:" type="string">
+				Dostęp do tej posiadłości:
+			</text>
+			<check_box label="Publiczny" name="public_access"/>
+			<text length="1" name="Only Allow" type="string">
+				Zablokuj dostęp dla:
+			</text>
+			<check_box label="Rezydentów niezarejestrowanych w systemie płatniczym z Linden Lab" name="limit_payment" tool_tip="Ban unidentified residents."/>
+			<check_box label="Rezydentów z brakiem weryfikacji wieku " name="limit_age_verified" tool_tip="Zbanuj Rezydetów bez weryfikacji wieku. Odwiedź support.secondlife.com po więcej informacji."/>
+			<string name="estate_override">
+				Jedna lub więcej z tych opcji ustawiona jest z poziomu posiadłości
+			</string>
+			<check_box label="Udostępnij wejście grupie: [GROUP]" name="GroupCheck" tool_tip="Ustaw grupę w głównej zakładce"/>
+			<check_box label="Sprzedaj wejściówki:" name="PassCheck" tool_tip="Otwórz tymczasowy dostęp do tej posiadłości"/>
+			<combo_box name="pass_combo">
+				<combo_item name="Anyone">
+					Każdemu
+				</combo_item>
+				<combo_item name="Group">
+					Grupie
+				</combo_item>
+			</combo_box>
+			<spinner label="Cena w L$:" name="PriceSpin"/>
+			<spinner label="Ilość godzin dostępu:" name="HoursSpin"/>
+			<text label="Zawsze udostępniaj" name="AllowedText">
+				Dozwoleni Rezydenci
+			</text>
+			<name_list name="AccessList" tool_tip="([LISTED] na liście, [MAX] max)"/>
+			<button label="Dodaj..." label_selected="Dodaj..." name="add_allowed"/>
+			<button label="Usuń" label_selected="Usuń" name="remove_allowed"/>
+			<text label="Ban" name="BanCheck">
+				Nieporządani Rezydenci (bany)
+			</text>
+			<name_list name="BannedList" tool_tip="([LISTED] na liście, [MAX] max)"/>
+			<button label="Dodaj..." label_selected="Dodaj..." name="add_banned"/>
+			<button label="Usuń" label_selected="Usuń" name="remove_banned"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml b/indra/newview/skins/default/xui/pl/floater_animation_preview.xml
new file mode 100755
index 0000000000..d1300a0e3c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_animation_preview.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Animation Preview" title="">
+	<text name="name_label">
+		Nazwa:
+	</text>
+	<text name="description_label">
+		Opis:
+	</text>
+	<spinner label="Pierwszeństwo" name="priority"
+	     tool_tip="Kontroluj,które z animacji,które też używasz mogą zostać zdominowane przez tą animację" />
+	<check_box label="Loop" name="loop_check" tool_tip="Powtarzaj tę animację" />
+	<spinner label="In(%)" name="loop_in_point"
+	     tool_tip="Wybierz punkt, od którego chcesz zacząć powtarzać animację" />
+	<spinner label="Out(%)" name="loop_out_point"
+	     tool_tip="Wybierz punkt, od którego chcesz zakończyć powtarznie animacji" />
+	<text name="hand_label">
+		Pozycja Ręki
+	</text>
+	<combo_box label="" name="hand_pose_combo"
+	     tool_tip="Kontroluje co robi ręka podczas animacji">
+		<combo_item name="Spread">
+			Rozciągaj
+		</combo_item>
+		<combo_item name="Relaxed">
+			Odpocznij
+		</combo_item>
+		<combo_item name="PointBoth">
+			Wskazuj
+		</combo_item>
+		<combo_item name="Fist">
+			Pięść
+		</combo_item>
+		<combo_item name="RelaxedLeft">
+			Lewa-Odpocznij
+		</combo_item>
+		<combo_item name="PointLeft">
+			Wskazuj Lewą
+		</combo_item>
+		<combo_item name="FistLeft">
+			Zaciśnij Lewą
+		</combo_item>
+		<combo_item name="RelaxedRight">
+			Prawa-Odpocznj
+		</combo_item>
+		<combo_item name="PointRight">
+			Wskazuj Prawą
+		</combo_item>
+		<combo_item name="FistRight">
+			Zaciśnij Prawą
+		</combo_item>
+		<combo_item name="SaluteRight">
+			Salutuj Prawą
+		</combo_item>
+		<combo_item name="Typing">
+			Pisz
+		</combo_item>
+		<combo_item name="PeaceRight">
+			Prawa-Pokój
+		</combo_item>
+	</combo_box>
+	<text name="emote_label">
+		Ekspresja
+	</text>
+	<combo_box label="" name="emote_combo"
+	     tool_tip="Kontroluj co wykonuje twarz w czasie animacji">
+		<combo_item name="[None]">
+			[Żadne]
+		</combo_item>
+		<combo_item name="Aaaaah">
+			Aaaaah
+		</combo_item>
+		<combo_item name="Afraid">
+			Obawa
+		</combo_item>
+		<combo_item name="Angry">
+			Zlość
+		</combo_item>
+		<combo_item name="BigSmile">
+			Duży Uśmiech
+		</combo_item>
+		<combo_item name="Bored">
+			Znudzenie
+		</combo_item>
+		<combo_item name="Cry">
+			Placz
+		</combo_item>
+		<combo_item name="Disdain">
+			Wzgarda
+		</combo_item>
+		<combo_item name="Embarrassed">
+			Zakłopotanie
+		</combo_item>
+		<combo_item name="Frown">
+			Marszczenie Brwi
+		</combo_item>
+		<combo_item name="Kiss">
+			Pocałunek
+		</combo_item>
+		<combo_item name="Laugh">
+			Śmiech
+		</combo_item>
+		<combo_item name="Plllppt">
+			Plllppt
+		</combo_item>
+		<combo_item name="Repulsed">
+			Odrzucenie
+		</combo_item>
+		<combo_item name="Sad">
+			Smutek
+		</combo_item>
+		<combo_item name="Shrug">
+			Wzruszanie Ramionami
+		</combo_item>
+		<combo_item name="Smile">
+			Uśmiech
+		</combo_item>
+		<combo_item name="Surprise">
+			Niespodzianka
+		</combo_item>
+		<combo_item name="Wink">
+			Mrugnięcie
+		</combo_item>
+		<combo_item name="Worry">
+			Zmartwienie
+		</combo_item>
+	</combo_box>
+	<text name="preview_label">
+		Przeglądaj kiedy
+	</text>
+	<combo_box label="" name="preview_base_anim"
+	     tool_tip="Przetestuj zachowanie animacji kiedy awatar wykonuje normalne czynności">
+		<combo_item name="Standing">
+			Stanie
+		</combo_item>
+		<combo_item name="Walking">
+			Chodzenie
+		</combo_item>
+		<combo_item name="Sitting">
+			Siedzenie
+		</combo_item>
+		<combo_item name="Flying">
+			Latanie
+		</combo_item>
+	</combo_box>
+	<spinner label="Złagodzić w (sekund)" name="ease_in_time"
+	     tool_tip="Ilość Czasu (w sekundach), w których animacje mieszają się" />
+	<spinner label="Złagodzić na zewnątrz (sekund)" name="ease_out_time"
+	     tool_tip="Ilość Czasu (w sekundach), w których animacje oddzielają się" />
+	<button label="" name="play_btn" tool_tip="Play/pause your animation." />
+	<button label="" name="stop_btn" tool_tip="Stop animation playback" />
+	<slider label="" name="playback_slider" />
+	<text name="bad_animation_text">
+		Niemożliwość odczytania pliku animacji do wyświetlenia/
+	
+	Sugerujemy pliki BVH eksportowane z pozycji.
+	</text>
+	<button label="Anuluj" name="cancel_btn" />
+	<button label="Upload (L$[AMOUNT])" name="ok_btn" />
+	<string name="failed_to_initialize">
+		Inicjalizacja ruchu nie powiodła się.
+	</string>
+	<string name="anim_too_long">
+		Długość pliku animacji wynosi [LENGTH] sekund.
+
+Maksymalna długość pliku animacji wynosi [MAX_LENGTH] sekund.
+	</string>
+	<string name="failed_file_read">
+		Niemożliwość odczytania pliku animacji do wyświetlenia.
+
+[STATUS]
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_auction.xml b/indra/newview/skins/default/xui/pl/floater_auction.xml
new file mode 100755
index 0000000000..a81850c2fd
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_auction.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_auction" title="Rozpocznij Sprzedaż Posiadłości">
+	<check_box label="Zawierając żółte ogrodzenie" name="fence_check" />
+	<button label="Zdjęce" label_selected="Zdjęce" name="snapshot_btn" />
+	<button label="OK" label_selected="OK" name="ok_btn" />
+	<string name="already for sale">
+		Nie możesz umiescić posiadłości na aukcji, jeżeli już została wystawiona na sprzedaż.
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml b/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml
new file mode 100755
index 0000000000..f460a402e2
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="avatarpicker" title="Wybierz Rezydenta">
+	<text name="instruct_search_resident_name">
+		Wpisz imię Rezydenta
+	</text>
+	<button label="Znajdź" label_selected="Znajdź" name="Find" />
+	<text name="Or select their calling card:">
+		lub wybierz wizytówkę:
+	</text>
+	<button label="Zamknij" label_selected="Zamknij" name="Close" />
+	<button label="Wybierz" label_selected="Wybierz" name="Select" />
+	<string name="NotFound">
+		&apos;[TEXT]&apos; nie odnaleziony
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
new file mode 100755
index 0000000000..f6f36d5b68
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="avatar_texture_debug" title="Tekstury Awatara">
+	<text name="baked_label">
+		Tekstury Renderowane
+	</text>
+	<text name="composite_label">
+		Tekstury Kompozytowe
+	</text>
+	<texture_picker label="Głowa" name="baked_head" />
+	<texture_picker label="Makijaż" name="head_bodypaint" />
+	<texture_picker label="Włosy" name="hair" />
+	<button label="Zrzuć" label_selected="Zrzuć" name="Dump" />
+	<texture_picker label="Oczy" name="baked_eyes" />
+	<texture_picker label="Oko" name="eye_texture" />
+	<texture_picker label="Góra Część Ciała" name="baked_upper_body" />
+	<texture_picker label="Tatuaż Górnej Części Ciała" name="upper_bodypaint" />
+	<texture_picker label="Podkoszulek" name="undershirt" />
+	<texture_picker label="Rękawiczki" name="gloves" />
+	<texture_picker label="Koszula" name="shirt" />
+	<texture_picker label="Wierznie Górne Ubranie" name="upper_jacket" />
+	<texture_picker label="Dolna Część Ciała" name="baked_lower_body" />
+	<texture_picker label="Tatuaż Dolnej Części Ciała" name="lower_bodypaint" />
+	<texture_picker label="Majtasy" name="underpants" />
+	<texture_picker label="Skarpety" name="socks" />
+	<texture_picker label="Buty" name="shoes" />
+	<texture_picker label="Spodnie" name="pants" />
+	<texture_picker label="Kurtka" name="jacket" />
+	<texture_picker label="Spódnica" name="baked_skirt" />
+	<texture_picker label="Spódnica" name="skirt_texture" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_beacons.xml b/indra/newview/skins/default/xui/pl/floater_beacons.xml
new file mode 100644
index 0000000000..3216704e60
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_beacons.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="beacons" title="Emitery">
+	<panel name="beacons_panel">
+		<check_box label="Dotykalne Obiekty Skryptowane" name="touch_only"/>
+		<check_box label="Obiekty Skryptowane" name="scripted"/>
+		<check_box label="Obiekty Fizyczne" name="physical"/>
+		<check_box label="Źródła Dźwięku" name="sounds"/>
+		<check_box label="Źródła Cząsteczek" name="particles"/>
+		<check_box label="Generuj Rozjaśnienia" name="highlights"/>
+		<check_box label="Generuj Emitery" name="beacons"/>
+		<text name="beacon_width_label">
+			Szerokość Emitera:
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_build_options.xml b/indra/newview/skins/default/xui/pl/floater_build_options.xml
new file mode 100755
index 0000000000..71363e3954
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_build_options.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="build options floater" title="Opcje Siatki">
+	<spinner label="Jednostka Siatki (metry)" name="GridResolution" />
+	<spinner label="Rozmiary Siatki (metry)" name="GridDrawSize" />
+	<check_box label="Udostępnij Podjednostkowe Dopasowywanie" name="GridSubUnit" />
+	<check_box label="Pokaż Sekcje Skrośne" name="GridCrossSection" />
+	<slider label="Nieprzezroczystość Siatki" name="GridOpacity" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_bumps.xml b/indra/newview/skins/default/xui/pl/floater_bumps.xml
new file mode 100755
index 0000000000..88b1ed4fb3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_bumps.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_bumps" title="Zderzenia, Popchnięcia, Uderzenia">
+	<string name="none_detected">
+		Brak
+	</string>
+	<string name="bump">
+		[TIME]  [FIRST] [LAST] awatar zderzył się z Tobą
+	</string>
+	<string name="llpushobject">
+		[TIME]  [FIRST] [LAST] awatar pochnął Cię swoim skryptem
+	</string>
+	<string name="selected_object_collide">
+		[TIME]  [FIRST] [LAST] awatar uderzył Cię swoim obiektem
+	</string>
+	<string name="scripted_object_collide">
+		[TIME]  [FIRST] [LAST] awatar uderzył Cię swoim skryptowanym obiektem
+	</string>
+	<string name="physical_object_collide">
+		[TIME]  [FIRST] [LAST] awatar uderzył Cię swoim fizycznym obiektem
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_contents.xml b/indra/newview/skins/default/xui/pl/floater_buy_contents.xml
new file mode 100755
index 0000000000..ba0fa74143
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_buy_contents.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_buy_contents" title="Kup Zawartość">
+	<text name="contains_text">
+		[NAME] zawiera:
+	</text>
+	<text name="buy_text">
+		Kup za L$[AMOUNT] od [NAME]?
+	</text>
+	<button label="Anuluj" label_selected="Anuluj" name="cancel_btn" />
+	<button label="Kup" label_selected="Kup" name="buy_btn" />
+	<check_box label="Załóż ubrania teraz" name="wear_check" />
+	<string name="no_copy_text">
+		(bez prawa kopiowania)
+	</string>
+	<string name="no_modify_text">
+		(bez prawa modyfikacji)
+	</string>
+	<string name="no_transfer_text">
+		(bez prawa transferu)
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_currency.xml b/indra/newview/skins/default/xui/pl/floater_buy_currency.xml
new file mode 100755
index 0000000000..c15bc05a09
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_buy_currency.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="buy currency" title="Kup $L">
+	<text name="info_buying">
+		Kup L$:
+	</text>
+	<text name="info_cannot_buy">
+		Brak możliwości zakupu L$ teraz:
+	</text>
+	<text name="info_need_more">
+		Potrzebujesz wiecęj L$:
+	</text>
+	<text name="error_message">
+		Pojawienie się błedu.
+	</text>
+	<button label="Idź do strony internetowej" name="error_web" />
+	<text name="contacting">
+		Kontaktowanie z LindeX...
+	</text>
+	<text name="buy_action_unknown">
+		Kup L$ w systemie walutowej wymiany LindeX
+	</text>
+	<text name="buy_action">
+		[NAME] [PRICE]L$
+	</text>
+	<text name="currency_action">
+		Kup L$
+	</text>
+	<line_editor name="currency_amt">
+		1234
+	</line_editor>
+	<text name="currency_est">
+		za [USD]US$
+	</text>
+	<text name="getting_data">
+		Otrzymywanie danych...
+	</text>
+	<text name="balance_label">
+		Obecnie posiadasz
+	</text>
+	<text name="balance_amount">
+		[AMT]L$
+	</text>
+	<text name="buying_label">
+		Kupujesz
+	</text>
+	<text name="buying_amount">
+		[AMT]L$
+	</text>
+	<text name="total_label">
+		Twój nowy stan konta
+	</text>
+	<text name="total_amount">
+		[AMT]L$
+	</text>
+	<text name="purchase_warning_repurchase">
+		Potwierdzając tę transkację zgadzasz się na zakup TYLKO waluty.
+Proszę spróbować wykonać operację jeszcze raz.
+	</text>
+	<text name="purchase_warning_notenough">
+		Nie zakupujesz wystarczającej ilości waluty.
+proszę zwiększyć ilość.
+	</text>
+	<button label="Anuluj" name="cancel_btn" />
+	<button label="Kup" name="buy_btn" />
+	<string name="buy_currency">
+		Kup [LINDENS]L$ za [USD]US$
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_land.xml b/indra/newview/skins/default/xui/pl/floater_buy_land.xml
new file mode 100755
index 0000000000..fe2b327252
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_buy_land.xml
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="buy land" title="Buy Land">
+	<text name="region_name_label">
+		Region:
+	</text>
+	<text name="region_name_text">
+		(brak danych)
+	</text>
+	<text name="estate_name_label">
+		Majątek:
+	</text>
+	<text name="estate_name_text">
+		(brak danych)
+	</text>
+	<text name="estate_owner_label">
+		Właściciel Majątku:
+	</text>
+	<text name="estate_owner_text">
+		(brak danych)
+	</text>
+	<text name="resellable_changeable_label">
+		Posiadłości zakupione w tym Regionie:
+	</text>
+	<text name="resellable_clause">
+		Posiadłosci zakupione w tym Regionie mogą lub nie mogą być odsprzedane.
+	</text>
+	<text name="changeable_clause">
+		mogą lub nie mogą być łaczone i dzielone.
+	</text>
+	<text name="covenant_text">
+		Musisz zaakceptować Umowę z Majątku:
+	</text>
+	<text_editor name="covenant_editor">
+		Ładowanie...
+	</text_editor>
+	<check_box label="Zgadzam się na Powyższą Umowę." name="agree_covenant" />
+	<text name="info_parcel_label">
+		Posiadłość:
+	</text>
+	<text name="info_parcel">
+		Scotopteryx 138,204
+	</text>
+	<text name="info_size_label">
+		Obszar:
+	</text>
+	<text name="info_size">
+		1024 m.
+	</text>
+	<text name="info_price_label">
+		Cena:
+	</text>
+	<text name="info_price">
+		1500 L$, obiekty wliczone
+	</text>
+	<text name="info_action">
+		Zakup tej Posiadłości spowoduje:
+	</text>
+	<text name="error_message">
+		Coś się nie zgadza.
+	</text>
+	<button label="Idź na stronę www" name="error_web" />
+	<text name="account_action">
+		Zmianę Twojego konta na Premium.
+	</text>
+	<text name="account_reason">
+		Tylko członkowie z kontem Premium mogą mieć Posiadłosci.
+	</text>
+	<combo_box name="account_level">
+		<combo_item name="US$9.95/month,billedmonthly">
+			9.95US$/miesiąc, płatne miesięcznie
+		</combo_item>
+		<combo_item name="US$7.50/month,billedquarterly">
+			7.50US$/miesiąc, płatne kwartalnie
+		</combo_item>
+		<combo_item name="US$6.00/month,billedannually">
+			6.00US$/miesiąc, płatne rocznie
+		</combo_item>
+	</combo_box>
+	<text name="land_use_action">
+		Zwiększ opłatę za używanie Posiadłości do 40US$/miesiąc.
+	</text>
+	<text name="land_use_reason">
+		Twoje Posiadłości mają powierzchnię 1,309 metrów.
+Ta Posiadłość ma 512 metrów.
+	</text>
+	<text name="purchase_action">
+		Zapłać Rezydentowi Jasiowi 4000L$ za Posiadłość
+	</text>
+	<text name="currency_reason">
+		Masz 2,100L$.
+	</text>
+	<text name="currency_action">
+		Kup więcej L$
+	</text>
+	<line_editor name="currency_amt">
+		1000
+	</line_editor>
+	<text name="currency_est">
+		za około [AMOUNT2]US$
+	</text>
+	<text name="currency_balance">
+		Masz 2,100L$.
+	</text>
+	<check_box label="Zabierz [AMOUNT] metrów donacji z Grupy." name="remove_contribution" />
+	<button label="Zakup" name="buy_btn" />
+	<button label="Anuluj" name="cancel_btn" />
+	<string name="can_resell">
+		Może być odsprzedana.
+	</string>
+	<string name="can_not_resell">
+		Nie może być odsprzedana.
+	</string>
+	<string name="can_change">
+		Mogą być łączone i dzielone.
+	</string>
+	<string name="can_not_change">
+		Nie mogą być łączone ani dzielone.
+	</string>
+	<string name="cant_buy_for_group">
+		Nie masz pozwolenia na zakup Posiadłości dla Twojej aktywnej Grupy.
+	</string>
+	<string name="no_land_selected">
+		Obszar nie jest wybrany.
+	</string>
+	<string name="multiple_parcels_selected">
+		Wybrałeś wiele różnych Posiadłości.
+Spróbuj wybrać mniejszy obszar.
+	</string>
+	<string name="no_permission">
+		Nie masz pozwolenia na zakup Posiadłości dla Twojej aktywnej Grupy.
+	</string>
+	<string name="parcel_not_for_sale">
+		Wybrana Posiadłość nie jest na sprzedaż.
+	</string>
+	<string name="group_already_owns">
+		Ta Posiadłość już należy do Grupy.
+	</string>
+	<string name="you_already_own">
+		Ta Posiadłość już należy do Ciebie.
+	</string>
+	<string name="set_to_sell_to_other">
+		Wybrana Posiadłość będzie sprzedana komu innemu.
+	</string>
+	<string name="no_public_land">
+		Wybrany obszar nie ma publicznych Posiadłości.
+	</string>
+	<string name="not_owned_by_you">
+		Wybrana Posiadłość należy do kogoś innego. 
+Spróbuj wybrać inny obszar.
+	</string>
+	<string name="processing">
+		Przetwarzanie Twojego zakupu...
+ 
+(Może zająć kilka minut)
+	</string>
+	<string name="fetching_error">
+		Błąd podczas wczytywania informacji zakupu Posiadłości.
+	</string>
+	<string name="buying_will">
+		Zakup tej Posiadłości spowoduje:
+	</string>
+	<string name="buying_for_group">
+		Zakup Posiadłości dla Grupy:
+	</string>
+	<string name="cannot_buy_now">
+		Nie możesz teraz kupić:
+	</string>
+	<string name="not_for_sale">
+		Nie jest na sprzedaż:
+	</string>
+	<string name="none_needed">
+		wszystko w porządku
+	</string>
+	<string name="must_upgrade">
+		Musisz mieć konto Premium żebyś mógł mieć Posiadłości.
+	</string>
+	<string name="cant_own_land">
+		Twoje konto pozwala Ci mieć Posiadłości.
+	</string>
+	<string name="land_holdings">
+		Twoje Posiadłości mają [BUYER] metrów.
+	</string>
+	<string name="pay_to_for_land">
+		Zapłać [SELLER] [AMOUNT]L$ za Posiadłość
+	</string>
+	<string name="buy_for_US">
+		Kup [AMOUNT]L$ za około [AMOUNT2]US$ ,
+	</string>
+	<string name="parcel_meters">
+		Ta Posiadłość ma [AMOUNT] metrów.
+	</string>
+	<string name="premium_land">
+		To jest wartościowa Posiadłość i kosztuje [AMOUNT] za metr.
+	</string>
+	<string name="discounted_land">
+		To jest przeceniona Posiadłość i kosztuje [AMOUNT] za metr.
+	</string>
+	<string name="meters_supports_object">
+		[AMOUNT] metrów
+pozwala na [AMOUNT2] obikty
+	</string>
+	<string name="sold_with_objects">
+		sprzedane z obiektami
+	</string>
+	<string name="insufficient_land_credits">
+		Grupa [GROUP] musi mieć wystarczający kredyt na
+używanie Posiadłości żeby sfinalizować ten zakup.
+	</string>
+	<string name="have_enough_lindens">
+		Masz [AMOUNT]L$ co wystarcza na zakup tej Posiadłości.
+	</string>
+	<string name="not_enough_lindens">
+		Masz tylko [AMOUNT]L$ i potrzebujesz [AMOUNT2]L$ dodatkowo.
+	</string>
+	<string name="balance_left">
+		Po zakupie zostanie Ci [AMOUNT]L$.
+	</string>
+	<string name="balance_needed">
+		Musisz dokupić [AMOUNT]L$ żeby kupić tą Posiadłość.
+	</string>
+	<string name="no_parcel_selected">
+		(Posiadłość nie wybrana)
+	</string>
+	<string name="buy_currency">
+		Kup [LINDENS]L$ za około [USD]US$
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_object.xml b/indra/newview/skins/default/xui/pl/floater_buy_object.xml
new file mode 100755
index 0000000000..82839cae18
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_buy_object.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="contents" title="Kup kopię obiektu">
+	<text name="contents_text">
+		i jego zawartość:
+	</text>
+	<text name="buy_text">
+		Kup za [AMOUNT]L$ od [NAME]?
+	</text>
+	<button label="Anuluj" label_selected="Anuluj" name="cancel_btn" />
+	<button label="Kup" label_selected="Kup" name="buy_btn" />
+	<string name="title_buy_text">
+		Kup
+	</string>
+	<string name="title_buy_copy_text">
+		Kup kopię
+	</string>
+	<string name="no_copy_text">
+		(bez prawa kopiowania)
+	</string>
+	<string name="no_modify_text">
+		(bez prawa modyfikacji)
+	</string>
+	<string name="no_transfer_text">
+		(bez prawa transferu)
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_camera.xml b/indra/newview/skins/default/xui/pl/floater_camera.xml
new file mode 100755
index 0000000000..985d69a9e1
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_camera.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="move floater" title="">
+	<string name="rotate_tooltip">
+		Odwracaj kamerę wokół obiektu
+	</string>
+	<string name="zoom_tooltip">
+		Najedź kamerą w kierunku obiektu
+	</string>
+	<string name="move_tooltip">
+		Poruszaj kamerą w dół/górę oraz w prawo/lewo
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_choose_group.xml b/indra/newview/skins/default/xui/pl/floater_choose_group.xml
new file mode 100755
index 0000000000..789c40e48c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_choose_group.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="groups" title="Grupy">
+	<text name="groupdesc">
+		Wybierz grupę:
+	</text>
+	<button label="OK" label_selected="OK" name="OK" />
+	<button label="Anuluj" label_selected="Anuluj" name="Cancel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_color_picker.xml b/indra/newview/skins/default/xui/pl/floater_color_picker.xml
new file mode 100755
index 0000000000..d6ffe1837a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_color_picker.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="ColorPicker" title="Wybór Koloru">
+	<text name="r_val_text">
+		Czerwony:
+	</text>
+	<text name="g_val_text">
+		Zielony:
+	</text>
+	<text name="b_val_text">
+		Niebieski:
+	</text>
+	<text name="h_val_text">
+		Odcień:
+	</text>
+	<text name="s_val_text">
+		Nasycenie:
+	</text>
+	<text name="l_val_text">
+		Luminacja:
+	</text>
+	<check_box label="Zastosuj od razu" name="apply_immediate" />
+	<button label="" label_selected="" name="color_pipette" />
+	<button label="Anuluj" label_selected="Anuluj" name="cancel_btn" />
+	<button label="Wybierz" label_selected="Wybierz" name="select_btn" />
+	<text name="Current color:">
+		Obecny Kolor:
+	</text>
+	<text name="(Drag below to save.)">
+		(Przeciągnij tutaj)
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_critical.xml b/indra/newview/skins/default/xui/pl/floater_critical.xml
new file mode 100755
index 0000000000..a6558ae92b
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_critical.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container" title="">
+	<button label="Kontynuuj" label_selected="Kontynuuj" name="Continue" />
+	<button label="Anuluj" label_selected="Anuluj" name="Cancel" />
+	<text name="tos_heading">
+		Proszę przeczytać poniższą wiadomość ostrożnie
+	</text>
+	<text_editor name="tos_text">
+		TOS_TEXT
+	</text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_customize.xml b/indra/newview/skins/default/xui/pl/floater_customize.xml
new file mode 100755
index 0000000000..0649d33aa4
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_customize.xml
@@ -0,0 +1,457 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater customize" title="Wygląd">
+	<tab_container name="customize tab container">
+		<panel label="Części Ciała" name="body_parts_placeholder" />
+		<panel label="Kształt" name="Shape">
+			<button label="Przywróć" label_selected="Przywróć" name="Revert" />
+			<button label="Ciało" label_selected="Ciało" name="Body" />
+			<button label="Głowa" label_selected="Głowa" name="Head" />
+			<button label="Oczy" label_selected="Oczy" name="Eyes" />
+			<button label="Uszy" label_selected="Uszy" name="Ears" />
+			<button label="Nos" label_selected="Nos" name="Nose" />
+			<button label="Usta" label_selected="Usta" name="Mouth" />
+			<button label="Broda " label_selected="Broda" name="Chin" />
+			<button label="Tułów" label_selected="Tułów" name="Torso" />
+			<button label="Nogi" label_selected="Nogi" name="Legs" />
+			<radio_group name="sex radio">
+				<radio_item type="string" length="1" name="radio">
+					Kobieta
+				</radio_item>
+				<radio_item type="string" length="1" name="radio2">
+					Mężczyzna
+				</radio_item>
+			</radio_group>
+			<button label="Losowe" label_selected="Losowe" name="Randomize" />
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: zabroniona modyfikacja
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: ładowanie...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: niezałożone
+			</text>
+			<text type="string" length="1" name="path">
+				Zapisane w [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Załóż nowy kształt poprzez przeciągnięcie go ze swojego inwentarza 
+na awatara. Alternatywnie, możesz także stworzyć własny kształt 
+z plików roboczych. --&gt; (Kliknij na Nowy Kształt)
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Nie posiadasz prawa do modyfikowania tego kształtu.
+			</text>
+			<button label="Nowy Kształt" label_selected="Nowy Kształt" name="Create New" />
+			<button label="Zdejmij" label_selected="Zdejmij" name="Take Off" />
+			<button label="Zapisz" label_selected="Zapisz" name="Save" />
+			<button label="Zapisz jako" label_selected="Zapisz jako" name="Save As" />
+		</panel>
+		<panel label="Skórka" name="Skin">
+			<button label="Kolor Skórki" label_selected="Kolor Skórki" name="Skin Color" />
+			<button label="Detale Twarzy" label_selected="Detale Twarzy" name="Face Detail" />
+			<button label="Makijaż" label_selected="Makijaż" name="Makeup" />
+			<button label="Detale Ciała" label_selected="Detale Ciała" name="Body Detail" />
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: modyfikacja zabroniona
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: ładowanie...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: niezałożone
+			</text>
+			<text type="string" length="1" name="path">
+				Zapisane w [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Załóż nową skórkę poprzez przeciągnięcie jej ze swojego inwentarza 
+na awatara. Alternatywnie, możesz także stworzyć własną skórkę 
+z plików roboczych. --&gt; (Kliknij na Nowa Skórka)
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Nie posiadasz prawa do modyfikowania tej skórki.
+			</text>
+			<texture_picker label="Tatuaże Głowy" name="Head Tattoos"
+			     tool_tip="Kliknij by wybrać teksturę" />
+			<texture_picker label="Tatuaże Górne" name="Upper Tattoos"
+			     tool_tip="Kliknij by wybrać teksturę" />
+			<texture_picker label="Tatuaże Dolne" name="Lower Tattoos"
+			     tool_tip="Kliknij by wybrać teksturę" />
+			<button label="Losowe" label_selected="Losowe" name="Randomize" />
+			<button label="Nowa Skórka" label_selected="Nowa Skórka" name="Create New" />
+			<button label="Zdejmij" label_selected="Zdejmij" name="Take Off" />
+			<button label="Zapisz" label_selected="Zapisz" name="Save" />
+			<button label="Zapisz jako" label_selected="Zapisz jako" name="Save As" />
+			<button label="Przywróć" label_selected="Przywróć" name="Revert" />
+		</panel>
+		<panel label="Włosy" name="Hair">
+			<button label="Kolor" label_selected="Kolor" name="Color" />
+			<button label="Styl" label_selected="Styl" name="Style" />
+			<button label="Brwi" label_selected="Brwi" name="Eyebrows" />
+			<button label="Twarzy" label_selected="Twarzy" name="Facial" />
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: modyfikacja zabroniona
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: ładowanie...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: niezałożone
+			</text>
+			<text type="string" length="1" name="path">
+				Zapisane w [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Załóż nowe włosy poprzez przeciągnięcie ich ze swojego inwentarza 
+na awatara. Alternatywnie, możesz także stworzyć własne włosy 
+z plików roboczych. --&gt; (Kliknij na Nowe Włosy)
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Nie posiadasz prawa do modyfikowania tych włosów.
+			</text>
+			<texture_picker label="Texture" name="Texture" tool_tip="Kliknij by wybrać teksturę" />
+			<button label="Losowe" label_selected="Losowe" name="Randomize" />
+			<button label="Nowe Włosy" label_selected="Nowe Włosy" name="Create New" />
+			<button label="Zdejmij" label_selected="Zdejmij" name="Take Off" />
+			<button label="Zapisz" label_selected="Zapisz" name="Save" />
+			<button label="Zapisz jako" label_selected="Zapisz jako" name="Save As" />
+			<button label="Przywróć" label_selected="Przywróć" name="Revert" />
+		</panel>
+		<panel label="Oczy" name="Eyes">
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: modyfikacja zabroniona
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: ładowanie...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: niezałożone
+			</text>
+			<text type="string" length="1" name="path">
+				Zapisane w [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Załóż nowe oczy poprzez przeciągnięcie ich ze swojego inwentarza 
+na awatara. Alternatywnie, możesz także stworzyć własne oczy 
+z plików roboczych. --&gt; (Kliknij na Nowe Oczy)
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Nie posiadasz prawa do modyfikowania tych oczów.
+			</text>
+			<texture_picker label="Iris" name="Iris" tool_tip="Kliknij by wybrać teksturę" />
+			<button label="Losowe" label_selected="Losowe" name="Randomize" />
+			<button label="Nowe Oczy" label_selected="Nowe Oczy" name="Create New" />
+			<button label="Zdejmij" label_selected="Zdejmij" name="Take Off" />
+			<button label="Zapisz" label_selected="Zapisz" name="Save" />
+			<button label="Zapisz jako" label_selected="Zapisz jako" name="Save As" />
+			<button label="Przywróć" label_selected="Przywróć" name="Revert" />
+		</panel>
+		<panel label="Ubrania" name="clothes_placeholder" />
+		<panel label="Koszula" name="Shirt">
+			<texture_picker label="Materiał" name="Fabric" tool_tip="Kliknij by wybrać teksturę" />
+			<color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij by wybrać kolor" />
+			<button label="Nowa Koszula" label_selected="Nowa Koszula" name="Create New" />
+			<button label="Zdejmij" label_selected="Zdejmij" name="Take Off" />
+			<button label="Zapisz" label_selected="Zapisz" name="Save" />
+			<button label="Zapisz jako" label_selected="Zapisz jako" name="Save As" />
+			<button label="Przywróć" label_selected="Przywróć" name="Revert" />
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: modyfikowanie zabronione
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: ładowanie...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: niezałożone
+			</text>
+			<text type="string" length="1" name="path">
+				Zapisane w [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Załóż nową koszulę poprzez przeciągnięcie jej ze swojego inwentarza 
+na awatara. Alternatywnie, możesz także stworzyć własną koszulę 
+z plików roboczych. --&gt; (Kliknij na Nowa Koszula)
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Nie posiadasz prawa do modyfikowania tej koszuli.
+			</text>
+		</panel>
+		<panel label="Spodnie" name="Pants">
+			<texture_picker label="Materiał" name="Fabric" tool_tip="Kliknij tutaj by wybrać teksturę" />
+			<color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij by wybrać kolor" />
+			<button label="Nowe Spodnie" label_selected="Nowe Spodnie" name="Create New" />
+			<button label="Zdejmij" label_selected="Zdejmij" name="Take Off" />
+			<button label="Zapisz" label_selected="Zapisz" name="Save" />
+			<button label="Zapisz jako" label_selected="Zapisz jako" name="Save As" />
+			<button label="Przywróć" label_selected="Przywróć" name="Revert" />
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: modyfikcja zabroniona
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: ładowanie...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: niezałożone
+			</text>
+			<text type="string" length="1" name="path">
+				Zapisane w [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Załóż nowe spodnie poprzez przeciągnięcie ich ze swojego inwentarza 
+na awatara. Alternatywnie, możesz także stworzyć własne spodnie 
+z plików roboczych. --&gt; (Kliknij na Nowe Spodnie)
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Nie posiadasz prawa do modyfikowania tych spodni.
+			</text>
+		</panel>
+		<panel label="Buty" name="Shoes">
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: modyfikacja zabroniona
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: ładwanie...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: niezałożone
+			</text>
+			<text type="string" length="1" name="path">
+				Zapisane w [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Załóż nowe buty poprzez przeciągnięcie ich ze swojego inwentarza 
+na awatara. Alternatywnie, możesz także stworzyć własne buty 
+z plików roboczych. --&gt; (Kliknij na Nowe Buty)
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Nie posiadasz prawa do modyfikowania tych butów.
+			</text>
+			<texture_picker label="Materiał" name="Fabric" tool_tip="Kliknij by wybrać teksturę" />
+			<color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij by wybrać kolor" />
+			<button label="Nowe Buty" label_selected="Nowe Buty" name="Create New" />
+			<button label="Zdejmij" label_selected="Zdejmij" name="Take Off" />
+			<button label="Zapisz" label_selected="Zapisz" name="Save" />
+			<button label="Zapisz jako" label_selected="Zapisz jako" name="Save As" />
+			<button label="Przywróć" label_selected="Przywróć" name="Revert" />
+		</panel>
+		<panel label="Skarpety" name="Socks">
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: modyfikacja zabroniona
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: ładowanie...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: niezałożone
+			</text>
+			<text type="string" length="1" name="path">
+				Zapisane w [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Załóż nowe skarpety poprzez przeciągnięcie ich ze swojego inwentarza 
+na awatara. Alternatywnie, możesz także stworzyć własne skarpety 
+z plików roboczych. --&gt; (Kliknij na Nowe Skarpety)
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Nie posiadasz prawa do modyfikowania tych skarpet.
+			</text>
+			<texture_picker label="Materiał" name="Fabric" tool_tip="Kliknij by wybrać teksturę" />
+			<color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij by wybrać kolor" />
+			<button label="Nowe Skarpety" label_selected="Nowe Skarpety" name="Create New" />
+			<button label="Zdejmij" label_selected="Zdejmij" name="Take Off" />
+			<button label="Zapisz" label_selected="Zapisz" name="Save" />
+			<button label="Zapisz jako" label_selected="Zapisz jako" name="Save As" />
+			<button label="Przywróć" label_selected="Przywróć" name="Revert" />
+		</panel>
+		<panel label="Kurtka" name="Jacket">
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: modyfikacja zabroniona
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: ładowanie...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: niezałożone
+			</text>
+			<text type="string" length="1" name="path">
+				Zapisane w [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Załóż nową kurtkę poprzez przeciągnięcie jej ze swojego inwentarza 
+na awatara. Alternatywnie, możesz także stworzyć własną kurtkę 
+z plików roboczych. --&gt; (Kliknij na Nowa Kurtka)
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Nie posiadasz prawa do modyfikowania tej kurtki.
+			</text>
+			<texture_picker label="Górny Materiał" name="Upper Fabric"
+			     tool_tip="Kliknij by wybrać teksturę" />
+			<texture_picker label="Dolny Materiał" name="Lower Fabric" tool_tip="Kliknij by wybrać kolor" />
+			<color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij by wybrać kolor" />
+			<button label="Nowa Kurtka" label_selected="Nowa Kurtka" name="Create New" />
+			<button label="Zdejmij" label_selected="Zdejmij" name="Take Off" />
+			<button label="Zapisz" label_selected="Zapisz" name="Save" />
+			<button label="Zapisz jako" label_selected="Zapisz jako" name="Save As" />
+			<button label="Przywróć" label_selected="Przywróć" name="Revert" />
+		</panel>
+		<panel label="Rękawiczki" name="Gloves">
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: modyfikacja zabroniona
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: ładowanie...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: niezałożone
+			</text>
+			<text type="string" length="1" name="path">
+				Zapisane w [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Załóż nowe rękawiczki poprzez przeciągnięcie ich ze swojego inwentarza 
+na awatara. Alternatywnie, możesz także stworzyć własne rękawiczki 
+z plików roboczych. --&gt; (Kliknij na Nowe Rękawiczki)
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Nie posiadasz prawa do modyfikowania tych rękawiczek
+			</text>
+			<texture_picker label="Materiał" name="Fabric" tool_tip="Kliknij by wybrać teksturę" />
+			<color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij by wybrać kolor" />
+			<button label="Nowe Rękawiczki" label_selected="Nowe Rękawiczki" name="Create New" />
+			<button label="Zdejmij" label_selected="Zdejmij" name="Take Off" />
+			<button label="Zapisz" label_selected="Zapisz" name="Save" />
+			<button label="Zapisz jako" label_selected="Zapisz jako" name="Save As" />
+			<button label="Przywróć" label_selected="Przywróć" name="Revert" />
+		</panel>
+		<panel label="Podkoszulek" name="Undershirt">
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: modyfikacja zabroniona
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: ładowanie...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: niezałożone
+			</text>
+			<text type="string" length="1" name="path">
+				Zapisane w [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Załóż nowy podkoszulek poprzez przeciągnięcie ich ze swojego inwentarza 
+na awatara. Alternatywnie, możesz także stworzyć własny podkoszulek 
+z plików roboczych. --&gt; (Kliknij na Nowy Podkoszulek)
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Nie posiadasz prawa do modyfikowania tego podkoszulka.
+			</text>
+			<texture_picker label="Materiał" name="Fabric" tool_tip="Kliknij by wybrać teksturę" />
+			<color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij by wybrać kolor" />
+			<button label="Nowy Podkoszulek" label_selected="Nowy Podkoszulek" name="Create New" />
+			<button label="Zdejmij" label_selected="Zdejmij" name="Take Off" />
+			<button label="Zapisz" label_selected="Zapisz" name="Save" />
+			<button label="Zapisz jako" label_selected="Zapisz jako" name="Save As" />
+			<button label="Przywróć" label_selected="Przywróć" name="Revert" />
+		</panel>
+		<panel label="Bielizna" name="Underpants">
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: modyfikacja zabroniona
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: ładowanie...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: niezałożone
+			</text>
+			<text type="string" length="1" name="path">
+				Zapisane w [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Załóż nową bieliznę poprzez przeciągnięcie jej ze swojego inwentarza 
+na awatara. Alternatywnie, możesz także stworzyć własną bieliznę 
+z plików roboczych. --&gt; (Kliknij na Nowa Bielizna)
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Nie posiadasz prawa do modyfikowania tej bielizny.
+			</text>
+			<texture_picker label="Materiał" name="Fabric" tool_tip="Kliknij by wybrać teksturę" />
+			<color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij by wybrać kolor" />
+			<button label="Nowa Bielizna" label_selected="Nowa Bielizna" name="Create New" />
+			<button label="Zdejmij" label_selected="Zdejmij" name="Take Off" />
+			<button label="Zapisz" label_selected="Zapisz" name="Save" />
+			<button label="Zapisz jako" label_selected="Zapisz jako" name="Save As" />
+			<button label="Przywróć" label_selected="Przywróć" name="Revert" />
+		</panel>
+		<panel label="Spódnica" name="Skirt">
+			<text type="string" length="1" name="title">
+				[DESC]
+			</text>
+			<text type="string" length="1" name="title_no_modify">
+				[DESC]: modyfikacja zabroniona
+			</text>
+			<text type="string" length="1" name="title_loading">
+				[DESC]: ładowanie...
+			</text>
+			<text type="string" length="1" name="title_not_worn">
+				[DESC]: niezałożone
+			</text>
+			<text type="string" length="1" name="path">
+				Zapisane w [PATH]
+			</text>
+			<text type="string" length="1" name="not worn instructions">
+				Załóż nową spódnicę poprzez przeciągnięcie jej ze swojego inwentarza 
+na awatara. Alternatywnie, możesz także stworzyć własną spódnicę 
+z plików roboczych. --&gt; (Kliknij na Nowa Spódnica)
+			</text>
+			<text type="string" length="1" name="no modify instructions">
+				Nie posiadasz prawa do modyfikowania tej spódnicy.
+			</text>
+			<texture_picker label="Materiał" name="Fabric" tool_tip="Kliknij by wybrać teksturę" />
+			<color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij by wybrać kolor" />
+			<button label="Nowa Spódnica" label_selected="Nowa Spódnica" name="Create New" />
+			<button label="Zdejmij" label_selected="Zdejmij" name="Take Off" />
+			<button label="Zapisz" label_selected="Zapisz" name="Save" />
+			<button label="Zapisz jako" label_selected="Zapisz jako" name="Save As" />
+			<button label="Przywróć" label_selected="Przywróć" name="Revert" />
+		</panel>
+	</tab_container>
+	<button label="Zamknij" label_selected="Zamknij" name="Close" />
+	<button label="Zapisz Wszystko" label_selected="Zapisz Wszystko" name="Save All" />
+	<button label="Stwórz Ubranie" label_selected="Stwórz Ubranie" name="Make Outfit" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml
new file mode 100755
index 0000000000..5f376f5cf3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Day Cycle Floater" title="Edytor Cyklu Dnia">
+	<tab_container name="Day Cycle Tabs">
+		<panel label="Cykl Dnia" name="Day Cycle">
+			<button label="?" name="WLDayCycleHelp" />
+			<multi_slider label="" name="WLTimeSlider" />
+			<multi_slider label="" name="WLDayCycleKeys" />
+			<text type="string" length="1" name="WL12am">
+				12am
+			</text>
+			<text type="string" length="1" name="WL3am">
+				3am
+			</text>
+			<text type="string" length="1" name="WL6am">
+				6am
+			</text>
+			<text type="string" length="1" name="WL9amHash">
+				9am
+			</text>
+			<text type="string" length="1" name="WL12pmHash">
+				12pm
+			</text>
+			<text type="string" length="1" name="WL3pm">
+				3pm
+			</text>
+			<text type="string" length="1" name="WL6pm">
+				6pm
+			</text>
+			<text type="string" length="1" name="WL9pm">
+				9pm
+			</text>
+			<text type="string" length="1" name="WL12am2">
+				12am
+			</text>
+			<text type="string" length="1" name="WL12amHash">
+				|
+			</text>
+			<text type="string" length="1" name="WL3amHash">
+				I
+			</text>
+			<text type="string" length="1" name="WL6amHash">
+				|
+			</text>
+			<text type="string" length="1" name="WL9amHash2">
+				I
+			</text>
+			<text type="string" length="1" name="WL12pmHash2">
+				|
+			</text>
+			<text type="string" length="1" name="WL3pmHash">
+				I
+			</text>
+			<text type="string" length="1" name="WL6pmHash">
+				|
+			</text>
+			<text type="string" length="1" name="WL9pmHash">
+				I
+			</text>
+			<text type="string" length="1" name="WL12amHash2">
+				|
+			</text>
+			<button label="Dodaj" label_selected="Dodaj" name="WLAddKey" />
+			<button label="Usuń" label_selected="Usuń" name="WLDeleteKey" />
+			<text type="string" length="1" name="WLCurKeyFrameText">
+				Preferencje Czasu:
+			</text>
+			<text type="string" length="1" name="WLCurKeyTimeText">
+				Czas:
+			</text>
+			<spinner label="Godz" name="WLCurKeyHour" />
+			<spinner label="Min" name="WLCurKeyMin" />
+			<text type="string" length="1" name="WLCurKeyTimeText2">
+				Ustawienia:
+			</text>
+			<combo_box label="Preset" name="WLKeyPresets" />
+			<text type="string" length="1" name="DayCycleText">
+				Przerwij:
+			</text>
+			<combo_box label="5 min" name="WLSnapOptions" />
+			<text type="string" length="1" name="DayCycleText2">
+				Długość Cyklu:
+			</text>
+			<spinner label="Godz" name="WLLengthOfDayHour" />
+			<spinner label="Min" name="WLLengthOfDayMin" />
+			<spinner label="Sek" name="WLLengthOfDaySec" />
+			<text type="string" length="1" name="DayCycleText3">
+				Wygląd:
+			</text>
+			<button label="Patrz" label_selected="Patrz" name="WLAnimSky" />
+			<button label="Wyłącz" label_selected="Wyłącz" name="WLStopAnimSky" />
+			<button label="Używaj Czasu Regionu" label_selected="Używaj Czasu Regionu"
+			     name="WLUseLindenTime" />
+			<button label="Zapisz Test Dnia" label_selected="Zapisz Test Dnia"
+			     name="WLSaveDayCycle" />
+			<button label="Załaduj Test Dnia" label_selected="Załaduj Test Dnia"
+			     name="WLLoadDayCycle" />
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_device_settings.xml b/indra/newview/skins/default/xui/pl/floater_device_settings.xml
new file mode 100755
index 0000000000..0122aa819e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_device_settings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_device_settings"
+     title="Ustawienia Urządzeń Komunikacji Głosowej" />
diff --git a/indra/newview/skins/default/xui/pl/floater_env_settings.xml b/indra/newview/skins/default/xui/pl/floater_env_settings.xml
new file mode 100755
index 0000000000..fbb8eca70e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_env_settings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Environment Editor Floater" title="Edytor Środowiska">
+	<text type="string" length="1" name="EnvTimeText">
+		Czas
+	</text>
+	<text type="string" length="1" name="EnvTimeText2">
+		12:00 PM
+	</text>
+	<slider label="" name="EnvTimeSlider" />
+	<text type="string" length="1" name="EnvCloudText">
+		Chmury:
+	</text>
+	<slider label="" name="EnvCloudSlider" />
+	<text type="string" length="1" name="EnvWaterColorText">
+		Kolor Wody
+	</text>
+	<color_swatch label="" name="EnvWaterColor" tool_tip="Kliknij by wybrać kolor" />
+	<text type="string" length="1" name="EnvWaterFogText">
+		Zamglenie:
+	</text>
+	<slider label="" name="EnvWaterFogSlider" />
+	<button label="Używaj Czasu Regionu" name="EnvUseEstateTimeButton" />
+	<button label="Zaawansowane Niebo" name="EnvAdvancedSkyButton" />
+	<button label="Zaawansowana Woda" name="EnvAdvancedWaterButton" />
+	<button label="?" name="EnvSettingsHelpButton" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_gesture.xml b/indra/newview/skins/default/xui/pl/floater_gesture.xml
new file mode 100755
index 0000000000..a05408dfc5
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_gesture.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="gestures" title="Aktywne Gesty">
+	<text name="help_label">
+		Kliknij podwójnie by aktywować głos i animację gestu.
+	</text>
+	<scroll_list name="gesture_list">
+		<column label="Aktywuj" name="trigger" />
+		<column label="Klucz" name="shortcut" />
+		<column label="" name="key" />
+		<column label="Nazwa" name="name" />
+	</scroll_list>
+	<button label="Nowy" name="new_gesture_btn" />
+	<button label="Edytuj" name="edit_btn" />
+	<button label="Odtwarzaj" name="play_btn" />
+	<button label="Zatrzymaj" name="stop_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_god_tools.xml b/indra/newview/skins/default/xui/pl/floater_god_tools.xml
new file mode 100755
index 0000000000..92de69eb5e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_god_tools.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="godtools floater" title="Boskie Narzędzia">
+	<tab_container name="GodTools Tabs">
+		<panel label="Grid" name="grid">
+			<button label="Usuń wszystkich użytkowników" label_selected="Usuń wszystkich użytkowników" name="Kick all users"/>
+			<button label="Wyrównaj ten region&apos;s Widoczność Buforu Mapy" label_selected="Wyrównaj ten region&apos;s Widoczność Buforu Mapy" name="Flush This Region&apos;s Map Visibility Caches"/>
+		</panel>
+		<panel label="Region" name="region">
+			<text name="Sim Name:">
+				Nazwa Symulatora:
+			</text>
+			<line_editor name="region name"/>
+			<check_box label="Wstęp" name="check prelude" />
+			<check_box label="Korekta Słońca" name="check fixed sun" tool_tip="Skorektuj ustawienia pozycji słońca."/>
+			<check_box label="Zresetuj Pozycję Miejsca Startwego" name="check reset home" />
+			<check_box label="Widoczny" name="check visible" tool_tip="Wybierz tę opcję by ustawić region widocznym dla wszystkich."/>
+			<check_box label="Zniszczenia" name="check damage" tool_tip="Wybierz tę opcję by uruchomić opcję zniszczeń w regionie."/>
+			<check_box label="Zablokuj Monitorowanie Trafficu" name="block dwell" tool_tip="Wybierz tę opcję by zablokować monitorowanie trafficu w regionie."/>
+			<check_box label="Zablokuj Terraformowanie" name="block terraform" tool_tip="Wybierz tę opcję by zablokować terraforming w regionie"/>
+			<check_box label="Piaskownica" name="is sandbox" />
+			<button label="Bake Teren" label_selected="Bake Teren" name="Bake Terrain" tool_tip="Zachowaj obecne ustawienia jako domyślne"/>
+			<button label="Cofnięcie Modyfikacji" label_selected="Cofnięcie Modyfikacji" name="Revert Terrain" tool_tip="Przywróć Ustawienia Domyślne Regionu."/>
+			<button label="Zamień Teren" label_selected="Zamień Teren" name="Swap Terrain" />
+			<text name="estate id">
+				ID Regionu:
+			</text>
+			<line_editor name="estate"/>
+			<text name="parent id">
+				Parent ID:
+			</text>
+			<line_editor name="parentestate" tool_tip="This is the parent estate for this region"/>
+			<text name="Grid Pos: ">
+				Pozycje Gridu:
+			</text>
+			<line_editor name="gridposx" tool_tip="Pozycja x gridu dla regionu"/>
+			<line_editor name="gridposy" tool_tip="Pozycja y gridu dla regionu"/>
+			<text name="Redirect to Grid: ">
+				Przełącz do gridu:
+			</text>
+			<line_editor name="redirectx"/>
+			<line_editor name="redirecty"/>
+			<spinner name="billable factor"/>
+			<text name="billable factor text">
+				Czynnik Płatnośći:
+			</text>
+			<spinner name="land cost"/>
+			<text name="land cost text">
+				L$/m:
+			</text>
+			<button label="Odśwież" label_selected="Odśwież" name="Refresh" />
+			<button label="Apply" label_selected="Apply" name="Apply" />
+			<button label="Wybierz Region" label_selected="Wybierz Region" name="Select Region" tool_tip="Wybierz cały region za pomocą narzędzi edycji terenu"/>
+			<button label="Automatyczne Zapisanie" label_selected="Automatyczne Zapisanie" name="Autosave now" />
+		</panel>
+		<panel label="Obiekty" name="objects">
+			<text name="Sim Name:">
+				Nazwa Symulatora:
+			</text>
+			<text name="region name">
+				Welsh
+			</text>
+			<check_box label="Wyłącz Skrypty" name="disable scripts" />
+			<check_box label="Deaktywuj Kolizje" name="disable collisions" />
+			<check_box label="Wylącz Fizykę" name="disable physics" />
+			<button label="Zastosuj" label_selected="Zastosuj" name="Apply" />
+			<button label="Ustaw Cel" label_selected="Set Target" name="Set Target" />
+			<text name="target_avatar_name">
+				(brak)
+			</text>
+			<button label="Usuń cel &apos;s skryptowane obiekty na innych posiadłościach" label_selected="Usuń cel &apos;s skryptowane obiekty na innych posiadłościach" name="Delete Target&apos;s Scripted Objects On Others Land" />
+			<button label="Usuń cel &apos;s skryptowane obiekty na jakichkolwiek posiadłościach" label_selected="Usuń cel &apos;s skryptowane obiekty na jakichkolwiek posiadłościach" name="Delete Target&apos;s Scripted Objects On *Any* Land" />
+			<button label="Usuń wszystkie cele i obiekty" label_selected="Usuń wszystkie cele i obiekty" name="Delete *ALL* Of Target&apos;s Objects" />
+			<button label="Główne Kolizje" label_selected="Główne Kolizje" name="Get Top Colliders" />
+			<button label="Główne Skrypty" label_selected="Główne Skrypty" name="Get Top Scripts" />
+			<button label="Treść skryptów" label_selected="Treść skryptów" name="Scripts digest" tool_tip="Wyświetla listę wszystkich skryptów i liczbę ich zastosowań."/>
+		</panel>
+		<panel label="Zarządaj" name="request">
+			<text name="Destination:">
+				Cel:
+			</text>
+			<combo_box name="destination">
+				<combo_item name="Selection">
+					Selekcja
+				</combo_item>
+				<combo_item name="AgentRegion">
+					Agent Regionu
+				</combo_item>
+			</combo_box>
+			<text name="Request:">
+				Rządanie:
+			</text>
+			<combo_box name="request">
+				<combo_item name="colliders&lt;steps&gt;">
+					kolidery &lt;kroki&gt;
+				</combo_item>
+				<combo_item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;">
+					skrypty &lt;policz&gt;,&lt;opcjonalnie powtórzenie&gt;
+				</combo_item>
+				<combo_item name="objects&lt;pattern&gt;">
+					obiekty &lt;powtórzenia&gt;
+				</combo_item>
+				<combo_item name="rez&lt;asset_id&gt;">
+					rez &lt;asset_id&gt;
+				</combo_item>
+			</combo_box>
+			<text name="Parameter:">
+				Parameter:
+			</text>
+			<line_editor name="parameter"/>
+			<button label="Zarządaj" label_selected="Zarządaj" name="Make Request"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml
new file mode 100755
index 0000000000..f05456b4c5
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Hardware Settings Floater" title="Ustawienia Dysku Twardego">
+	<text type="string" length="1" name="Filtering:">
+		Filtrowanie:
+	</text>
+	<check_box label="Filtrowanie Anizotropowe" name="ani" />
+	<text type="string" length="1" name="Antialiasing:">
+		Antialiasing:
+	</text>
+	<combo_box label="Antialiasing" name="fsaa">
+		<combo_item name="FSAADisabled">
+			Wyłączone
+		</combo_item>
+		<combo_item name="2x">
+			2x
+		</combo_item>
+		<combo_item name="4x">
+			4x
+		</combo_item>
+		<combo_item name="8x">
+			8x
+		</combo_item>
+		<combo_item name="16x">
+			16x
+		</combo_item>
+	</combo_box>
+	<spinner label="Gamma:" name="gamma" />
+	<text type="string" length="1" name="(brightness, lower is brighter)">
+		(jaskrawość, jasny, 0=domyślny)
+	</text>
+	<text type="string" length="1" name="Enable VBO:">
+		Włącz VBO:
+	</text>
+	<check_box label="Włącz Bufor Vertexów OpenGL" name="vbo" tool_tip="" />
+	<slider label="Pamięć Tekstur (MB):" name="GrapicsCardTextureMemory" tool_tip="" />
+	<spinner label="Stosunek Dystansu Mgły:" name="fog" />
+	<button label="OK" label_selected="OK" name="OK" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_hud.xml b/indra/newview/skins/default/xui/pl/floater_hud.xml
new file mode 100755
index 0000000000..916473f063
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_hud.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_hud" title="Samouczek" />
diff --git a/indra/newview/skins/default/xui/pl/floater_im.xml b/indra/newview/skins/default/xui/pl/floater_im.xml
new file mode 100755
index 0000000000..00a91bdf6c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_im.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater name="im_floater" title="Wiadomość (IM)">
+	<string name="only_user_message">
+		Jesteś jedyną osobą w tej konferencji.
+	</string>
+	<string name="offline_message">
+		[FIRST] [LAST] - ta osoba jest obecnie niedostępna.
+	</string>
+	<string name="invite_message">
+		Kliknij na [BUTTON NAME] przycisk by zaakceptować/dołączyć do tej rozmowy.
+	</string>
+	<string name="muted_message">
+		Ten rezydent jest przez Ciebie wyciszony. Wysyłanie wiadomośći automatycznie wyłączy tryb wyciszenia.
+	</string>
+	<string name="generic_request_error">
+		Błąd. Spróbuj ponownie za kilka minut.
+	</string>
+	<string name="insufficient_perms_error">
+		Nie posiadasz praw do kontynuacji.
+	</string>
+	<string name="session_does_not_exist_error">
+		Ta konferencja jest już zakończona.
+	</string>
+	<string name="no_ability_error">
+		Nie posiadesz tego przywileju.
+	</string>
+	<string name="not_a_mod_error">
+		Nie jesteś moderatorem konferencji.
+	</string>
+	<string name="muted_error">
+		Moderator wyciszył Cię.
+	</string>
+	<string name="add_session_event">
+		Nie można dodać nikogo do czatu z [RECIPIENT].
+	</string>
+	<string name="message_session_event">
+		Nie można wysłać Twojej wiadomości do sesji czatu z [RECIPIENT].
+	</string>
+	<string name="removed_from_group">
+		Usunięto Cię z grupy.
+	</string>
+	<string name="close_on_no_ability">
+		Nie posiadasz praw by uczestniczyć w tej konferencji.
+	</string>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_image_preview.xml b/indra/newview/skins/default/xui/pl/floater_image_preview.xml
new file mode 100755
index 0000000000..620c3f4124
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_image_preview.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Image Preview" title="">
+	<text name="name_label">
+		Nazwa:
+	</text>
+	<text name="description_label">
+		Opis:
+	</text>
+	<text name="preview_label">
+		Wyświetl obraz jako:
+	</text>
+	<combo_box label="Rodzaj Ubrania" name="clothing_type_combo">
+		<combo_item name="Image">
+			Obraz
+		</combo_item>
+		<combo_item name="Hair">
+			Włosy
+		</combo_item>
+		<combo_item name="FemaleHead">
+			Damska Głowa
+		</combo_item>
+		<combo_item name="FemaleUpperBody">
+			Damska Górna Część Ciała
+		</combo_item>
+		<combo_item name="FemaleLowerBody">
+			Damska Górna Część Ciała
+		</combo_item>
+		<combo_item name="MaleHead">
+			Męska Głowa
+		</combo_item>
+		<combo_item name="MaleUpperBody">
+			Męska Górna Część Ciała
+		</combo_item>
+		<combo_item name="MaleLowerBody">
+			Męska Dolna Część Ciała
+		</combo_item>
+		<combo_item name="Skirt">
+			Spódnica
+		</combo_item>
+		<combo_item name="SculptedPrim">
+			Prim Rzeźbiony
+		</combo_item>
+	</combo_box>
+	<text name="bad_image_text">
+		Unable to read image.
+
+Próbuj zachować obraz jako 24 bit Targa (.tga).
+	</text>
+	<check_box label="Use lossless compression" name="lossless_check" />
+	<button label="Anuluj" name="cancel_btn" />
+	<button label="Załaduj (L$[AMOUNT])" name="ok_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_inspect.xml b/indra/newview/skins/default/xui/pl/floater_inspect.xml
new file mode 100755
index 0000000000..f9f76d286f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_inspect.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="inspect" title="Inspekcja Obiektów">
+	<scroll_list name="object_list" tool_tip="">
+		<column label="Nazwa" name="object_name" />
+		<column label="Właściciel" name="owner_name" />
+		<column label="Twórca" name="creator_name" />
+		<column label="Data Kreacji" name="creation_date" />
+	</scroll_list>
+	<button label="Zobacz Profil Właściciela..." label_selected="" name="button owner"
+	     tool_tip="" />
+	<button label="Zobacz Profil Twórcy..." label_selected="" name="button creator"
+	     tool_tip="" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_inventory.xml b/indra/newview/skins/default/xui/pl/floater_inventory.xml
new file mode 100755
index 0000000000..07fbaa3e8a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_inventory.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Inventory" title="Inwentarz">
+	<search_editor label="Wyszukiwarka" name="inventory search editor"/>
+	<tab_container name="inventory filter tabs">
+		<inventory_panel label="Wszystkie Obiekty" name="All Items"/>
+		<inventory_panel label="Nowe Obiekty" name="Recent Items"/>
+	</tab_container>
+	<menu_bar name="Inventory Menu">
+		<menu label="Plik" name="File">
+			<menu_item_call label="Otwórz" name="Open"/>
+			<menu_item_call label="Nowe Okno" name="New Window"/>
+			<menu_item_call label="Pokaż Filtr" name="Show Filters"/>
+			<menu_item_call label="Zresetuj Filtr" name="Reset Current"/>
+			<menu_item_call label="Zamknij Wszystkie Foldery" name="Close All Folders"/>
+			<menu_item_call label="Opróżnij Kosz" name="Empty Trash"/>
+		</menu>
+		<menu label="Stwórz" name="Create">
+			<menu_item_call label="Nowy Folder" name="New Folder"/>
+			<menu_item_call label="Nowy Skrypt" name="New Script"/>
+			<menu_item_call label="Nową Notę" name="New Note"/>
+			<menu_item_call label="Nowy Gest" name="New Gesture"/>
+			<menu name="New Clothes">
+				<menu_item_call label="Nowa Koszula" name="New Shirt"/>
+				<menu_item_call label="Nowe Spodnie" name="New Pants"/>
+				<menu_item_call label="Nowe Buty" name="New Shoes"/>
+				<menu_item_call label="Nowe Skarpety" name="New Socks"/>
+				<menu_item_call label="Nowa Kurtka" name="New Jacket"/>
+				<menu_item_call label="Nowa Spódnica" name="New Skirt"/>
+				<menu_item_call label="Nowe Rękawiczki" name="New Gloves"/>
+				<menu_item_call label="Nowy Podkoszulek" name="New Undershirt"/>
+				<menu_item_call label="Nowa Bielizna" name="New Underpants"/>
+			</menu>
+			<menu name="New Body Parts">
+				<menu_item_call label="Nowy Kształt" name="New Shape"/>
+				<menu_item_call label="Nową Skórkę" name="New Skin"/>
+				<menu_item_call label="Nowe Włosy" name="New Hair"/>
+				<menu_item_call label="Nowe Oczy" name="New Eyes"/>
+			</menu>
+		</menu>
+		<menu label="Porządkuj" name="Sort">
+			<menu_item_check label="Według Imienia" name="By Name"/>
+			<menu_item_check label="Według Daty" name="By Date"/>
+			<menu_item_check label="Foldery Zawsze Według Imienia" name="Folders Always By Name"/>
+			<menu_item_check label="Ułożenie Folderów od Góry" name="System Folders To Top"/>
+		</menu>
+	</menu_bar>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
new file mode 100755
index 0000000000..1e3de7f50d
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="item properties" title="Właściwości Obiektów w Inwentarzu">
+	<text name="LabelItemNameTitle">
+		Nazwa:
+	</text>
+	<text name="LabelItemDescTitle">
+		Opis:
+	</text>
+	<text name="LabelCreatorTitle">
+		Twórca:
+	</text>
+	<text name="LabelCreatorName">
+		Nicole Linden
+	</text>
+	<button label="Profil..." label_selected="" name="BtnCreator" />
+	<text name="LabelOwnerTitle">
+		Właściciel:
+	</text>
+	<text name="LabelOwnerName">
+		Thrax Linden
+	</text>
+	<button label="Profil..." label_selected="" name="BtnOwner" />
+	<text name="LabelAcquiredTitle">
+		Nabyte:
+	</text>
+	<text name="LabelAcquiredDate">
+		Wed May 24 12:50:46 2006
+	</text>
+	<text name="OwnerLabel">
+		Opcje:
+	</text>
+	<check_box label="Modyfikuj" name="CheckOwnerModify" />
+	<check_box label="Kopiuj" name="CheckOwnerCopy" />
+	<check_box label="Sprzedaj/Oddaj" name="CheckOwnerTransfer" />
+	<text name="BaseMaskDebug">
+		P:
+	</text>
+	<text name="OwnerMaskDebug">
+		W:
+	</text>
+	<text name="GroupMaskDebug">
+		G:
+	</text>
+	<text name="EveryoneMaskDebug">
+		W:
+	</text>
+	<text name="NextMaskDebug">
+		N:
+	</text>
+	<check_box label="Udostępnij grupie" name="CheckShareWithGroup" />
+	<check_box label="Udostępnij kopiowanie każdemu" name="CheckEveryoneCopy" />
+	<text name="NextOwnerLabel">
+		Następna Osoba:
+	</text>
+	<check_box label="Modyfikuje" name="CheckNextOwnerModify" />
+	<check_box label="Kopiuje" name="CheckNextOwnerCopy" />
+	<check_box label="Sprzedaje/Oddaje" name="CheckNextOwnerTransfer" />
+	<text name="SaleLabel">
+		Zaznacz Artykuł:
+	</text>
+	<check_box label="Sprzedaż" name="CheckPurchase" />
+	<radio_group name="RadioSaleType">
+		<radio_item name="radio">
+			Oryginał
+		</radio_item>
+		<radio_item name="radio2">
+			Kopia
+		</radio_item>
+	</radio_group>
+	<text name="TextPrice">
+		Cena:  L$
+	</text>
+	<string name="unknown">
+		(nieznany)
+	</string>
+	<string name="public">
+		(publiczny)
+	</string>
+	<string name="you_can">
+		Opcje:
+	</string>
+	<string name="owner_can">
+		Właściciel może:
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml
new file mode 100755
index 0000000000..fb4e30d2a3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Inventory Finder" title="Nowe Obiekty">
+	<check_box label="Animacje" name="check_animation" />
+	<check_box label="Wizytówki" name="check_calling_card" />
+	<check_box label="Ubrania" name="check_clothing" />
+	<check_box label="Gesty" name="check_gesture" />
+	<check_box label="Zakładki Miejsc" name="check_landmark" />
+	<check_box label="Noty" name="check_notecard" />
+	<check_box label="Obiekty" name="check_object" />
+	<check_box label="Skrypty" name="check_script" />
+	<check_box label="Dźwięki" name="check_sound" />
+	<check_box label="Tekstury" name="check_texture" />
+	<check_box label="Zdjęcia" name="check_snapshot" />
+	<button label="Wszystko" label_selected="Wszystko" name="All" />
+	<button label="Żadne" label_selected="Żadne" name="None" />
+	<check_box label="Zawsze pokazuj foldery" name="check_show_empty" />
+	<check_box label="Od czasu wylogowania" name="check_since_logoff" />
+	<text type="string" length="1" name="- OR -">
+		- LUB -
+	</text>
+	<spinner label="Od godzin" name="spin_hours_ago" />
+	<spinner label="Od dni" name="spin_days_ago" />
+	<button label="Zamknij" label_selected="Zamknij" name="Close" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_joystick.xml b/indra/newview/skins/default/xui/pl/floater_joystick.xml
new file mode 100755
index 0000000000..918486a847
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_joystick.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Joystick" title="Konfiguracja Joysticka">
+	<check_box name="enable_joystick">
+		Aktywuj Joystick:
+	</check_box>
+	<spinner label="Mapowanie Osi X" name="JoystickAxis1"/>
+	<spinner label="Mapowanie Osi Y" name="JoystickAxis2"/>
+	<spinner label="Mapowanie Osi Z" name="JoystickAxis0"/>
+	<spinner label="Mapowanie Podziału" name="JoystickAxis4"/>
+	<spinner label="Mapowanie Yaw" name="JoystickAxis5"/>
+	<spinner label="Mapowanie Rollingu" name="JoystickAxis3"/>
+	<spinner label="MapowanieOgniska" name="JoystickAxis6"/>
+	<check_box label="Bezpośrednia" name="ZoomDirect"/>
+	<check_box label=" Kursor 3D" name="Cursor3D"/>
+	<check_box label="Poziom Auto" name="AutoLeveling"/>
+	<text length="1" name="Control Modes:" type="string">
+		Tryby Kontroli:
+	</text>
+	<check_box name="JoystickAvatarEnabled">
+		Awatar
+	</check_box>
+	<check_box name="JoystickBuildEnabled">
+		Buduj
+	</check_box>
+	<check_box name="JoystickFlycamEnabled">
+		Kamera podczas latania
+	</check_box>
+	<text name="XScale">
+		Skala X
+	</text>
+	<spinner name="AvatarAxisScale1"/>
+	<spinner name="BuildAxisScale1"/>
+	<spinner name="FlycamAxisScale1"/>
+	<text name="YScale">
+		Skala Y
+	</text>
+	<spinner name="AvatarAxisScale2"/>
+	<spinner name="BuildAxisScale2"/>
+	<spinner name="FlycamAxisScale2"/>
+	<text name="ZScale">
+		Skala Z
+	</text>
+	<spinner name="AvatarAxisScale0"/>
+	<spinner name="BuildAxisScale0"/>
+	<spinner name="FlycamAxisScale0"/>
+	<text name="PitchScale">
+		Skala Podziału
+	</text>
+	<spinner name="AvatarAxisScale4"/>
+	<spinner name="BuildAxisScale4"/>
+	<spinner name="FlycamAxisScale4"/>
+	<text name="YawScale">
+		Skala Yaw
+	</text>
+	<spinner name="AvatarAxisScale5"/>
+	<spinner name="BuildAxisScale5"/>
+	<spinner name="FlycamAxisScale5"/>
+	<text name="RollScale">
+		Skala Rollingu
+	</text>
+	<spinner name="BuildAxisScale3"/>
+	<spinner name="FlycamAxisScale3"/>
+	<text name="XDeadZone">
+		Martwa Strefa X
+	</text>
+	<spinner name="AvatarAxisDeadZone1"/>
+	<spinner name="BuildAxisDeadZone1"/>
+	<spinner name="FlycamAxisDeadZone1"/>
+	<text name="YDeadZone">
+		Martwa Strefa Y
+	</text>
+	<spinner name="AvatarAxisDeadZone2"/>
+	<spinner name="BuildAxisDeadZone2"/>
+	<spinner name="FlycamAxisDeadZone2"/>
+	<text name="ZDeadZone">
+		Martwa Strefa Z
+	</text>
+	<spinner name="AvatarAxisDeadZone0"/>
+	<spinner name="BuildAxisDeadZone0"/>
+	<spinner name="FlycamAxisDeadZone0"/>
+	<text name="PitchDeadZone">
+		Martwa Podziałka
+	</text>
+	<spinner name="AvatarAxisDeadZone4"/>
+	<spinner name="BuildAxisDeadZone4"/>
+	<spinner name="FlycamAxisDeadZone4"/>
+	<text name="YawDeadZone">
+		Martwa Strefa Yaw
+	</text>
+	<spinner name="AvatarAxisDeadZone5"/>
+	<spinner name="BuildAxisDeadZone5"/>
+	<spinner name="FlycamAxisDeadZone5"/>
+	<text name="RollDeadZone">
+		Martwa Strefa Rollingu
+	</text>
+	<spinner name="BuildAxisDeadZone3"/>
+	<spinner name="FlycamAxisDeadZone3"/>
+	<text name="Feathering">
+		Wnikanie
+	</text>
+	<slider label="" name="AvatarFeathering"/>
+	<slider label="" name="BuildFeathering"/>
+	<slider label="" name="FlycamFeathering"/>
+	<text name="ZoomScale2">
+		Skala Ogniskowej
+	</text>
+	<spinner label="" name="FlycamAxisScale6"/>
+	<text name="ZoomDeadZone">
+		Martwa Ogniskowa
+	</text>
+	<spinner label="" name="FlycamAxisDeadZone6"/>
+	<button label="Ustawienia Domyślne Nawigatora Przestrzeni" name="SpaceNavigatorDefaults"/>
+	<button label="OK" label_selected="OK" name="ok_btn"/>
+	<button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/>
+	<string name="JoystickMonitor">
+		Monitor Joysticka
+	</string>
+	<string name="Axis">
+		Osie [NUM]
+	</string>
+	<string name="NoDevice">
+		brak detekcji urządzenia
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_lagmeter.xml b/indra/newview/skins/default/xui/pl/floater_lagmeter.xml
new file mode 100755
index 0000000000..236a8767fd
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_lagmeter.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_lagmeter" title="Pomiar Lagów">
+	<button label="" label_selected="" name="client_lagmeter"
+	     tool_tip="Status lagów klienta" />
+	<text name="client">
+		Klient:
+	</text>
+	<text name="client_text">
+		W Normie
+	</text>
+	<button label="" label_selected="" name="network_lagmeter"
+	     tool_tip="Network lag status" />
+	<text name="network">
+		Sieć:
+	</text>
+	<text name="network_text">
+		W Normie
+	</text>
+	<button label="" label_selected="" name="server_lagmeter" tool_tip="Server lag status" />
+	<text name="server">
+		Serwer:
+	</text>
+	<text name="server_text">
+		W Normie
+	</text>
+	<button label="?" name="server_help" />
+	<button label="&gt;&gt;" name="minimize" />
+	<string name="max_title_msg">
+		Pomiar Lagów
+	</string>
+	<string name="max_width_px">
+		360
+	</string>
+	<string name="min_title_msg">
+		Lag
+	</string>
+	<string name="min_width_px">
+		90
+	</string>
+	<string name="client_text_msg">
+		Klient
+	</string>
+	<string name="client_frame_rate_critical_fps">
+		10
+	</string>
+	<string name="client_frame_rate_warning_fps">
+		15
+	</string>
+	<string name="client_frame_time_window_bg_msg">
+		W normie, okno w tle
+	</string>
+	<string name="client_frame_time_critical_msg">
+		Szybkość ramy klienta poniżej [CLIENT_FRAME_RATE_CRITICAL]
+	</string>
+	<string name="client_frame_time_warning_msg">
+		Szybkość ramy klienta pomiędzy [CLIENT_FRAME_RATE_CRITICAL] i [CLIENT_FRAME_RATE_WARNING]
+	</string>
+	<string name="client_frame_time_normal_msg">
+		W Normie
+	</string>
+	<string name="client_draw_distance_cause_msg">
+		Przyczyna: Dystans rysowania jest za wysoki
+	</string>
+	<string name="client_texture_loading_cause_msg">
+		Przyczyna: Ładowanie obrazu
+	</string>
+	<string name="client_texture_memory_cause_msg">
+		Przyczyna: Za dużo obrazów w pamięci
+	</string>
+	<string name="client_complex_objects_cause_msg">
+		Przyczyna: Za dużo zlożonych obiektów
+	</string>
+	<string name="network_text_msg">
+		Sieć
+	</string>
+	<string name="network_packet_loss_critical_pct">
+		10
+	</string>
+	<string name="network_packet_loss_warning_pct">
+		5
+	</string>
+	<string name="network_packet_loss_critical_msg">
+		Połączenie spada ponad [NETWORK_PACKET_LOSS_CRITICAL]% pakietów
+	</string>
+	<string name="network_packet_loss_warning_msg">
+		Połączenie spada [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% pakietów
+	</string>
+	<string name="network_performance_normal_msg">
+		W normie
+	</string>
+	<string name="network_ping_critical_ms">
+		600
+	</string>
+	<string name="network_ping_warning_ms">
+		300
+	</string>
+	<string name="network_ping_critical_msg">
+		Połączenie czasu ping jest zakończone [NETWORK_PING_CRITICAL] ms
+	</string>
+	<string name="network_ping_warning_msg">
+		Połączenie czasu ping wynosi [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
+	</string>
+	<string name="network_packet_loss_cause_msg">
+		Złe połączenie lub przepustowość
+	</string>
+	<string name="network_ping_cause_msg">
+		Złe połączenie lub aplikacje plików
+	</string>
+	<string name="server_text_msg">
+		Serwer
+	</string>
+	<string name="server_frame_rate_critical_fps">
+		20
+	</string>
+	<string name="server_frame_rate_warning_fps">
+		30
+	</string>
+	<string name="server_single_process_max_time_ms">
+		20
+	</string>
+	<string name="server_frame_time_critical_msg">
+		Szybkość ramy symulatora poniżej [SERVER_FRAME_RATE_CRITICAL]
+	</string>
+	<string name="server_frame_time_warning_msg">
+		Szybkość ramy symulatora pomiędzy [SERVER_FRAME_RATE_CRITICAL] i [SERVER_FRAME_RATE_WARNING]
+	</string>
+	<string name="server_frame_time_normal_msg">
+		W Normie
+	</string>
+	<string name="server_physics_cause_msg">
+		Przyczyna: Za dużo obiektów fizycznych
+	</string>
+	<string name="server_scripts_cause_msg">
+		Przyczyna: Za dużo obieków skryptowanych
+	</string>
+	<string name="server_net_cause_msg">
+		Przyczyna: Za duży traffic sieci
+	</string>
+	<string name="server_agent_cause_msg">
+		Przyczyna: Za dużo poruszających się awatarów w regionie
+	</string>
+	<string name="server_images_cause_msg">
+		Przyczyna: Za dużo kalkulacji obrazu
+	</string>
+	<string name="server_generic_cause_msg">
+		Przyczyna: Symulator ładuje się zbyt powoli
+	</string>
+	<string name="smaller_label">
+		&gt;&gt;
+	</string>
+	<string name="bigger_label">
+		&lt;&lt;
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_land_holdings.xml b/indra/newview/skins/default/xui/pl/floater_land_holdings.xml
new file mode 100755
index 0000000000..1763d143f5
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_land_holdings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="land holdings floater" title="My Land">
+	<scroll_list name="parcel list">
+		<column label="Nazwa" name="name" />
+		<column label="Położenie" name="location" />
+		<column label="Obszar" name="area" />
+		<column label="" name="hidden" />
+	</scroll_list>
+	<button label="Teleportuj" label_selected="Teleport" name="Teleport"
+	     tool_tip="Teleportuj się do centrum tej Posiadłości." />
+	<button label="Pokaż na Mapie" label_selected="Show on Map" name="Show on Map"
+	     tool_tip="Pokaż to miejsce na mapie świata." />
+	<text name="contrib_label">
+		Donacje dla Twoich Grup:
+	</text>
+	<scroll_list name="grant list">
+		<column label="Grupa" name="group" />
+		<column label="Obszar" name="area" />
+	</scroll_list>
+	<text name="allowed_label">
+		Dozwolone udziały w Posiadłościach przy obecnym planie płatności:
+	</text>
+	<text name="allowed_text">
+		[AREA] metrów
+	</text>
+	<text name="current_label">
+		Udziały w Posiadłościach:
+	</text>
+	<text name="current_text">
+		[AREA] metrów
+	</text>
+	<text name="available_label">
+		Dostępne na zakup Posiadłości:
+	</text>
+	<text name="available_text">
+		[AREA] metrów
+	</text>
+	<string name="area_string">
+		[AREA] metrów
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml
new file mode 100755
index 0000000000..46c75269e3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script ed float" title="Skrypt: Nowy Skrypt">
+	<button label="Zresetuj" label_selected="Zresetuj" name="Reset" />
+	<check_box label="Włączony" name="running" />
+	<check_box label="Mono" name="mono" />
+	<string name="not_allowed">
+		Nie masz praw by widzieć zawartość tego skryptu.
+	</string>
+	<string name="script_running">
+		Włączony
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml b/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml
new file mode 100755
index 0000000000..a0fa00dffe
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script ed float" title="LSL Wiki">
+	<check_box label="Idź za kursorem" name="lock_check" />
+	<combo_box label="Zablokuj" name="history_combo" />
+	<button label="Wróć" name="back_btn" />
+	<button label="Do Przodu" name="fwd_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_media_browser.xml b/indra/newview/skins/default/xui/pl/floater_media_browser.xml
new file mode 100755
index 0000000000..851f20add1
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_media_browser.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_about" title="Przeglądarka Mediów">
+	<layout_stack name="stack1">
+		<layout_panel name="nav_controls">
+			<button label="Wróć" name="back" />
+			<button label="Do Przodu" name="forward" />
+			<button label="Załaduj" name="reload" />
+			<button label="Idź" name="go" />
+		</layout_panel>
+		<layout_panel name="parcel_owner_controls">
+			<button label="Wyślij Obecny URL do Posiadłości" name="assign" />
+		</layout_panel>
+		<layout_panel name="external_controls">
+			<button label="Open in My Web Browser" name="open_browser" />
+			<check_box label="Zawsze otwieraj w mojej przeglądarce internetowej" name="open_always" />
+			<button label="Zamknij" name="close" />
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml
new file mode 100755
index 0000000000..fe977e96c5
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="MemLeak" title="Symulacja Przecieków Alokacji Pamięci">
+	<spinner label="Prędkość Przecieków (byty na klatkę):" name="leak_speed" />
+	<spinner label="Max Przecieki (MB):" name="max_leak" />
+	<text name="total_leaked_label">
+		Przeciekło: [SIZE] KB
+	</text>
+	<text name="note_label_1">
+		[NOTE1]
+	</text>
+	<text name="note_label_2">
+		[NOTE2]
+	</text>
+	<button label="Start" name="start_btn" />
+	<button label="Stop" name="stop_btn" />
+	<button label="Uwolnij" name="release_btn" />
+	<button label="Zamknij" name="close_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_moveview.xml b/indra/newview/skins/default/xui/pl/floater_moveview.xml
new file mode 100755
index 0000000000..715fec0bae
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_moveview.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="move floater" title="">
+	<button label="" label_selected="" name="turn left btn" tool_tip="Obróć w lewo" />
+	<button label="" label_selected="" name="turn right btn" tool_tip="Obroć w Prawo" />
+	<button label="" label_selected="" name="move up btn"
+	     tool_tip="Skocz lub zacznij latać w górę" />
+	<button label="" label_selected="" name="move down btn"
+	     tool_tip="Pochyl się lub zacznij latać w dół" />
+	<joystick_slide name="slide left btn" tool_tip="Przesuń w lewo" />
+	<joystick_slide name="slide right btn" tool_tip="Przesuń w prawo" />
+	<joystick_turn name="forward btn" tool_tip="Przesuń do przodu" />
+	<joystick_turn name="backward btn" tool_tip="Przesuń do tyłu" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_mute_object.xml b/indra/newview/skins/default/xui/pl/floater_mute_object.xml
new file mode 100755
index 0000000000..a09c6baac2
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_mute_object.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="mute by name" title="Wycisz Obiekt Według Nazwy">
+	<text name="message">
+		Wyciszenie obiektu jest skuteczne jedynie na czacie oraz w wiadomościach IM. Nie obejmuje natomiast dźwięków.
+By wyciszyć obiekt musisz wpisać dokładnie jego nazwę.
+	</text>
+	<line_editor name="object_name">
+		Nazwa Obiektu
+	</line_editor>
+	<button label="Ok" name="OK" />
+	<button label="Anuluj" name="Cancel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_my_friends.xml b/indra/newview/skins/default/xui/pl/floater_my_friends.xml
new file mode 100755
index 0000000000..cc5f1f2a01
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_my_friends.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_my_friends" title="Kontakty">
+	<tab_container name="friends_and_groups">
+		<panel label="Znajomi" name="friends_panel" />
+		<panel label="Grupy" name="groups_panel" />
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_openobject.xml b/indra/newview/skins/default/xui/pl/floater_openobject.xml
new file mode 100755
index 0000000000..b7558917ee
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_openobject.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="objectcontents" title="Zawartość Obiektu">
+	<text type="string" length="1" name="object_name">
+		[DESC]:
+	</text>
+	<button label="Kopiuj do Inwentarza" label_selected="Kopiuj do Inwentarza"
+	     name="copy_to_inventory_button" />
+	<button label="Kopiuj i Zalóż" label_selected="Kopiuj i Załóż"
+	     name="copy_and_wear_button" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_pay.xml b/indra/newview/skins/default/xui/pl/floater_pay.xml
new file mode 100755
index 0000000000..154d2fc888
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_pay.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Give Money" title="">
+	<button label="L$1" label_selected="L$1" name="fastpay 1" />
+	<button label="L$5" label_selected="L$5" name="fastpay 5" />
+	<button label="L$10" label_selected="L$10" name="fastpay 10" />
+	<button label="L$20" label_selected="L$20" name="fastpay 20" />
+	<button label="Zapłać" label_selected="Zapłać" name="pay btn" />
+	<button label="Anuluj" label_selected="Anuluj" name="cancel btn" />
+	<text type="string" length="1" name="payee_label">
+		Zapłata dla:
+	</text>
+	<text type="string" length="1" name="payee_name">
+		[FIRST] [LAST]
+	</text>
+	<text type="string" length="1" name="fastpay text">
+		Szybka Zapłata:
+	</text>
+	<text type="string" length="1" name="amount text">
+		Suma:
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_pay_object.xml b/indra/newview/skins/default/xui/pl/floater_pay_object.xml
new file mode 100755
index 0000000000..ed0ef0fef8
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_pay_object.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Give Money" title="">
+	<text type="string" length="1" name="payee_group">
+		Zapłać Grupie:
+	</text>
+	<text type="string" length="1" name="payee_resident">
+		Zapłać Rezydentowi:
+	</text>
+	<text type="string" length="1" name="payee_name">
+		[FIRST] [LAST]
+	</text>
+	<text type="string" length="1" name="object_name_label">
+		Poprzez Obiekt:
+	</text>
+	<text type="string" length="1" name="object_name_text">
+		...
+	</text>
+	<text type="string" length="1" name="fastpay text">
+		Szybka Zapłata:
+	</text>
+	<text type="string" length="1" name="amount text">
+		Suma:
+	</text>
+	<button label="L$1" label_selected="L$1" name="fastpay 1" />
+	<button label="L$5" label_selected="L$5" name="fastpay 5" />
+	<button label="L$10" label_selected="L$10" name="fastpay 10" />
+	<button label="L$20" label_selected="L$20" name="fastpay 20" />
+	<button label="Zapłać" label_selected="Zapłać" name="pay btn" />
+	<button label="Anuluj" label_selected="Anuluj" name="cancel btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_post_process.xml b/indra/newview/skins/default/xui/pl/floater_post_process.xml
new file mode 100755
index 0000000000..21c92764f6
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_post_process.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Post-Process Floater" title="Ustawienia Przetwarzania Końcowego">
+	<tab_container name="Post-Process Tabs">
+		<panel label="Kolor Filtru" name="wmiColorFilterPanel">
+			<check_box label="Enable" name="wmiColorFilterToggle" />
+			<text type="string" length="1" name="wmiColorFilterBrightnessText">
+				Jasność
+			</text>
+			<slider label="" name="wmiColorFilterBrightness" />
+			<text type="string" length="1" name="wmiColorFilterSaturationText">
+				Nasycenie
+			</text>
+			<slider label="" name="wmiColorFilterSaturation" />
+			<text type="string" length="1" name="wmiColorFilterContrastText">
+				Kontrast
+			</text>
+			<slider label="" name="wmiColorFilterContrast" />
+			<text type="string" length="1" name="wmiColorFilterBaseText">
+				Kontrast Koloru Podstawowego
+			</text>
+			<slider label="R" name="wmiColorFilterBaseR" />
+			<slider label="G" name="wmiColorFilterBaseG" />
+			<slider label="B" name="wmiColorFilterBaseB" />
+			<slider label="I" name="wmiColorFilterBaseI" />
+		</panel>
+		<panel label="Wizja Nocna" name="wmiNightVisionPanel">
+			<check_box label="Udostępnij" name="wmiNightVisionToggle" />
+			<text type="string" length="1" name="wmiNightVisionBrightMultText">
+				Wielokrotne Wzmocnienie Światła
+			</text>
+			<slider label="" name="wmiNightVisionBrightMult" />
+			<text type="string" length="1" name="wmiNightVisionNoiseSizeText">
+				Rozmiar Szumu
+			</text>
+			<slider label="" name="wmiNightVisionNoiseSize" />
+			<text type="string" length="1" name="wmiNightVisionNoiseStrengthText">
+				Moc Szumu
+			</text>
+			<slider label="" name="wmiNightVisionNoiseStrength" />
+		</panel>
+		<panel label="Bloom" name="wmiBloomPanel">
+			<check_box label="Udostępnij" name="wmiBloomToggle" />
+			<text type="string" length="1" name="wmiBloomExtractText">
+				Ekstracja Luminacji
+			</text>
+			<slider label="" name="wmiBloomExtract" />
+			<text type="string" length="1" name="wmiBloomSizeText">
+				Rozmiar Rozmazania Obrazu
+			</text>
+			<slider label="" name="wmiBloomSize" />
+			<text type="string" length="1" name="wmiBloomStrengthText">
+				Moc Rozmazania Obrazu
+			</text>
+			<slider label="" name="wmiBloomStrength" />
+		</panel>
+		<panel label="Dodatki" name="Extras">
+			<button label="ZaładujEfekt" label_selected="ZaładujEfekt" name="PPLoadEffect" />
+			<button label="ZapiszEfekt" label_selected="ZapiszEfekt" name="PPSaveEffect" />
+			<line_editor label="Nazwa Efektu" name="PPEffectNameEditor" />
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_postcard.xml b/indra/newview/skins/default/xui/pl/floater_postcard.xml
new file mode 100755
index 0000000000..080edd5623
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_postcard.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Postcard" title="Wyślij Pocztówkę">
+	<text name="to_label">
+		Email Odbiorcy:
+	</text>
+	<text name="from_label">
+		Twój Email:
+	</text>
+	<text name="name_label">
+		Twoje Dane:
+	</text>
+	<text name="subject_label">
+		Temat:
+	</text>
+	<line_editor label="Wpisz treść tematu tutaj" name="subject_form"/>
+	<text name="msg_label">
+		Treść:
+	</text>
+	<text_editor name="msg_form">
+		Wpisz treść swojej wiadomości tutaj
+	</text_editor>
+	<text name="fine_print">
+		Jeżeli odbiorca tej pocztówki dołączy do Second Life, otrzymasz bonusa.
+	</text>
+	<button label="Anuluj" name="cancel_btn"/>
+	<button label="Wyślij" name="send_btn"/>
+	<string name="default_subject">
+		Pocztówki z Second Life.
+	</string>
+	<string name="default_message">
+		Sprawdź i przekonaj się sam!
+	</string>
+	<string name="upload_message">
+		&quot;Wysyłanie...&quot;
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_preferences.xml b/indra/newview/skins/default/xui/pl/floater_preferences.xml
new file mode 100755
index 0000000000..380738425e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_preferences.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Preferences" title="Ustawienia">
+	<button label="OK" label_selected="OK" name="OK" />
+	<button label="Anuluj" label_selected="Anuluj" name="Cancel" />
+	<button label="Zastosuj" label_selected="Zastosuj" name="Apply" />
+	<button label="O Second Life" label_selected="O Second Life" name="About..." />
+	<button label="Pomoc" label_selected="Pomoc" name="Help" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml
new file mode 100755
index 0000000000..abfa39b7f3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview_anim">
+	<text type="string" length="1" name="desc txt">
+		Opis:
+	</text>
+	<button label="Używaj w Świecie" label_selected="Stop" name="Anim play btn"
+	     tool_tip="Animacja będzie widoczna dla wszystkich." />
+	<button label="Używaj lokalnie" label_selected="Stop" name="Anim audition btn"
+	     tool_tip="Animacja będzie widoczna tylko dla Ciebie." />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_classified.xml b/indra/newview/skins/default/xui/pl/floater_preview_classified.xml
new file mode 100755
index 0000000000..cc7d276117
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_preview_classified.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="classified_preview" title="Reklama" />
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_event.xml b/indra/newview/skins/default/xui/pl/floater_preview_event.xml
new file mode 100755
index 0000000000..75e17f6fa2
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_preview_event.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="event_preview" title="Informacje o Imprezie" />
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml
new file mode 100755
index 0000000000..013780ebf9
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="gesture_preview">
+	<string name="stop_txt">
+		Stop
+	</string>
+	<string name="preview_txt">
+		Pokaż
+	</string>
+	<string name="none_text">
+		-- Brak --
+	</string>
+	<text name="desc_label">
+		Opis:
+	</text>
+	<text name="trigger_label">
+		Włączanie:
+	</text>
+	<text name="replace_text"
+	     tool_tip="Zmień włączającą frazę na inną. Na przykład zmiana &apos;witam&apos; na &apos;cześć&apos; zmieni czat &apos;Chciałem powiedzieć witam&apos; na &apos;Chciałem powiedzieć cześć&apos; i pokaże animację!">
+		Zamień na:
+	</text>
+	<line_editor name="replace_editor"
+	     tool_tip="Zmień włączającą frazę na inną. Na przykład zmiana &apos;witam&apos; na &apos;cześć&apos; zmieni czat &apos;Chciałem powiedzieć witam&apos; na &apos;Chciałem powiedzieć cześć&apos; i pokaże animację!" />
+	<text name="key_label">
+		Skrót:
+	</text>
+	<combo_box label="Brak" name="modifier_combo" />
+	<combo_box label="Brak" name="key_combo" />
+	<text name="library_label">
+		Zbiór:
+	</text>
+	<text name="steps_label">
+		Etapy:
+	</text>
+	<button label="Dodaj &gt;&gt;" name="add_btn" />
+	<button label="W Górę" name="up_btn" />
+	<button label="W Dół" name="down_btn" />
+	<button label="Usuń" name="delete_btn" />
+	<text name="help_label">
+		Wszystkie etapy nastąpią razem, 
+chyba, że dodasz pauzy.
+	</text>
+	<radio_group name="animation_trigger_type">
+		<radio_item name="start">
+			Start
+		</radio_item>
+		<radio_item name="stop">
+			Stop
+		</radio_item>
+	</radio_group>
+	<check_box label="do końca animacji" name="wait_anim_check" />
+	<check_box label="czas w sekundach" name="wait_time_check" />
+	<check_box label="Aktywny" name="active_check"
+	     tool_tip="Aktywne gesty można włączać używając przypisanej frazy w czacie albo używając przypisanego klawisza skrótowego. W przypaku konfliktu przypisań gesty zazwyczaj nie będą działać." />
+	<button label="Pokaż" name="preview_btn" />
+	<button label="Zapisz" name="save_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml
new file mode 100755
index 0000000000..88a95adb94
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview notecard" title="Note:">
+	<button label="Zapisz" label_selected="Zapisz" name="Save" />
+	<text type="string" length="1" name="desc txt">
+		Opis:
+	</text>
+	<text_editor type="string" length="1" name="Notecard Editor">
+		Ładowanie...
+	</text_editor>
+	<string name="no_object">
+		Nie można znaleść obiektu zawierającego tą notkę.
+	</string>
+	<string name="not_allowed">
+		Nie masz pozwolenia na zobaczenie tej notki.
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_sound.xml b/indra/newview/skins/default/xui/pl/floater_preview_sound.xml
new file mode 100755
index 0000000000..c9dd20128d
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_preview_sound.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview_sound">
+	<text type="string" length="1" name="desc txt">
+		Opis:
+	</text>
+	<button label="Odtwarzaj Lokalnie" label_selected="Odtwarzaj Lokalnie"
+	     name="Sound audition btn"
+	     tool_tip="Dźwięk będzie słyszalny tylko dla Ciebie." />
+	<button label="Odtwarzaj w Świecie" label_selected="Odtwarzaj w Świecie"
+	     name="Sound play btn"
+	     tool_tip="Dźwięk będzie słyszalny przez wszystkich." />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_texture.xml b/indra/newview/skins/default/xui/pl/floater_preview_texture.xml
new file mode 100755
index 0000000000..860feee9b1
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_preview_texture.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview_texture">
+	<text type="string" length="1" name="desc txt">
+		Opis:
+	</text>
+	<text type="string" length="1" name="dimensions">
+		Wymiary: [WIDTH] x [HEIGHT]
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_region_info.xml b/indra/newview/skins/default/xui/pl/floater_region_info.xml
new file mode 100755
index 0000000000..6e632fd9c3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_region_info.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="regioninfo" title="Region/Majątek" />
diff --git a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml
new file mode 100755
index 0000000000..3797740a95
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_report_abuse" title="Raport o Nadużyciu">
+	<texture_picker label="" name="screenshot"/>
+	<check_box label="Załącz zdjęcie ekranu" name="screen_check"/>
+	<text name="reporter_title">
+		Reporter:
+	</text>
+	<text name="reporter_field">
+		Loremipsum Dolorsitamut
+	</text>
+	<text name="sim_title">
+		Region:
+	</text>
+	<text name="sim_field">
+		Nazwa Regionu
+	</text>
+	<text name="pos_title">
+		Pozycja:
+	</text>
+	<text name="pos_field">
+		{128.1, 128.1, 15.4}
+	</text>
+	<text name="select_object_label">
+		Kliknij na przycisk, a pózniej na obiekt:
+	</text>
+	<button label="" label_selected="" name="pick_btn" tool_tip="Wybór obiektu - identyfikacja obiektu jako źródło raportu"/>
+	<text name="object_name_label">
+		Nazwa:
+	</text>
+	<text name="object_name">
+		Consetetur Sadipscing
+	</text>
+	<text name="owner_name_label">
+		Właściciel:
+	</text>
+	<text name="owner_name">
+		Hendrerit Vulputate
+	</text>
+	<combo_box name="category_combo" tool_tip="Kategoria -- wybierz kategorię, która najlepiej opisuje materię tego raportu">
+		<combo_item name="Select_category">
+			Wybierz Kategorię:
+		</combo_item>
+		<combo_item name="Age__Age_play">
+			Wiek &gt; Udawanie nieletniej osoby
+		</combo_item>
+		<combo_item name="Age__Adult_resident_on_Teen_Second_Life">
+			Wiek &gt; Dorosły Rezydent w Second Life dla nastolatków
+		</combo_item>
+		<combo_item name="Age__Underage_resident_on_Adult_Second_Life">
+			Wiek &gt; Nieletni Rezydent w Second Life dla dorosłych
+		</combo_item>
+		<combo_item name="Assault__Combat_sandbox___unsafe_area">
+			Napaść &gt; Piaskownica do walk / niebezpieczny obszar
+		</combo_item>
+		<combo_item name="Assault__Safe_area">
+			Napaść &gt; Bezpieczny obszar
+		</combo_item>
+		<combo_item name="Assault__Weapons_testing_sandbox">
+			Napaść &gt; Piaskownica do testowania broni
+		</combo_item>
+		<combo_item name="Commerce__Failure_to_deliver_product_or_service">
+			Handel &gt; Niedostarczenie produktu lub uslugi
+		</combo_item>
+		<combo_item name="Disclosure__Real_world_information">
+			Naruszenie tajemnicy &gt; Informacje z rzeczywistego świata
+		</combo_item>
+		<combo_item name="Disclosure__Remotely_monitoring chat">
+			Ujawnienie &gt; Monitorowanie czatu z dystansu
+		</combo_item>
+		<combo_item name="Disclosure__Second_Life_information_chat_IMs">
+			Ujawnienie &gt; Dane z Second Life / czatu / IM
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
+			Zakłócanie spokoju &gt; Nieuczciwe używanie zasobów regionu
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
+			Zakłócanie spokoju &gt; Przesadnie skryptowane obiekty
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Object_littering">
+			Zakłócanie spokoju &gt; Śmiecenie obiektami
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Repetitive_spam">
+			Zakłócanie spokoju &gt; Ciągły spam
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
+			Zakłócanie spokoju &gt; Nieporządany spam reklamowy
+		</combo_item>
+		<combo_item name="Fraud__L$">
+			Oszustwo &gt; L$
+		</combo_item>
+		<combo_item name="Fraud__Land">
+			Oszustwo &gt; Posiadłości
+		</combo_item>
+		<combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
+			Oszustwo &gt; Piramidy albo listy łańcuchowe
+		</combo_item>
+		<combo_item name="Fraud__US$">
+			Oszustwo &gt; US$
+		</combo_item>
+		<combo_item name="Harassment__Advert_farms___visual_spam">
+			Prześladowanie &gt; Farmy reklamowe / wizualny spam
+		</combo_item>
+		<combo_item name="Harassment__Defaming_individuals_or_groups">
+			Prześladowanie &gt; Obmawianie jedostek lub grup
+		</combo_item>
+		<combo_item name="Harassment__Impeding_movement">
+			Prześladowanie &gt; Ograniczanie ruchu
+		</combo_item>
+		<combo_item name="Harassment__Sexual_harassment">
+			Prześladowanie &gt; Molestowanie seksualne
+		</combo_item>
+		<combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
+			Prześladowanie &gt; Namawianie/zachęcanie innych do łamania Warunków Umowy (Terms of Service)
+		</combo_item>
+		<combo_item name="Harassment__Verbal_abuse">
+			Prześladowanie &gt; Znieważanie słowne
+		</combo_item>
+		<combo_item name="Indecency__Broadly_offensive_content_or_conduct">
+			Nieprzyzwoitość &gt; Bardzo obraźliwa treść lub postępowanie
+		</combo_item>
+		<combo_item name="Indecency__Broadly_visible_mature_content">
+			Nieprzyzwoitość &gt; Bardzo widoczna treść dla dorosłych
+		</combo_item>
+		<combo_item name="Indecency__Inappropriate_avatar_name">
+			Nieprzyzwoitość &gt; Niestosowne imię awatara
+		</combo_item>
+		<combo_item name="Indecency__Mature_content_in_PG_region">
+			Nieprzyzwoitość &gt; Zawartość dla dorosłych (18+) w regionie dla wszystkich (BO)
+		</combo_item>
+		<combo_item name="Intellectual_property_infringement_Content_Removal">
+			Naruszenie praw autorskich &gt; Usunięcie Treści
+		</combo_item>
+		<combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
+			Naruszenie praw autorskich &gt; CopyBot albo Nadużycie Przywilejów
+		</combo_item>
+		<combo_item name="Intolerance">
+			Nietolerancja
+		</combo_item>
+		<combo_item name="Land__Abuse_of_sandbox_resources">
+			Posiadłości &gt; Nadużywanie piaskownicy
+		</combo_item>
+		<combo_item name="Land__Encroachment__Objects_textures">
+			Posiadłości &gt; Naruszenie &gt; Obiekty/tekstury
+		</combo_item>
+		<combo_item name="Land__Encroachment__Particles">
+			Posiadłości &gt; Naruszenie &gt; Cząsteczki
+		</combo_item>
+		<combo_item name="Land__Encroachment__Trees_plants">
+			Posiadłości &gt; Naruszenie &gt; Drzewa/rośliny
+		</combo_item>
+		<combo_item name="Wagering_gambling">
+			Zakłady/hazard
+		</combo_item>
+		<combo_item name="Other">
+			Inne
+		</combo_item>
+	</combo_box>
+	<text name="abuser_name_title">
+		Dane osobowe:
+	</text>
+	<line_editor name="abuser_name_edit"/>
+	<button label="Wybierz Rezydenta" label_selected="" name="select_abuser" tool_tip="Wybierz dane Rezydenta"/>
+	<text name="abuser_name_title2">
+		Miejsce nadużycia:
+	</text>
+	<line_editor name="abuse_location_edit"/>
+	<text name="sum_title">
+		Podsumowanie:
+	</text>
+	<line_editor name="summary_edit"/>
+	<text name="dscr_title">
+		Szczegóły:
+	</text>
+	<text name="bug_aviso">
+		Proszę zachować specyfikę daty, miejsca, 
+materii nadużycia, fragmentów czatu/IM oraz obiektów.
+	</text>
+	<text_editor name="details_edit"/>
+	<text name="incomplete_title">
+		Pamiętaj: Niedokończone raporty nie podlegają inwestygacji!
+	</text>
+	<button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/>
+	<button label="Wyślij" label_selected="Wyślij" name="send_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_script_debug.xml b/indra/newview/skins/default/xui/pl/floater_script_debug.xml
new file mode 100755
index 0000000000..b41add8246
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_script_debug.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater name="script debug floater" title="Ostrzeżenie/Błąd Skryptu">
+	<tab_container name="Preview Tabs">
+		<floater label="Skrypt" name="all_scripts" title="[All scripts]" />
+	</tab_container>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_script_preview.xml b/indra/newview/skins/default/xui/pl/floater_script_preview.xml
new file mode 100755
index 0000000000..55a18be148
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_script_preview.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview lsl text" title="Skrypt: Skrypt Obrotu">
+	<text type="string" length="1" name="desc txt">
+		Opis:
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_script_queue.xml b/indra/newview/skins/default/xui/pl/floater_script_queue.xml
new file mode 100755
index 0000000000..70d4669a07
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_script_queue.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="queue" title="Zresetuj Pracę w Toku">
+	<button label="Zamknij" label_selected="Zamknij" name="close" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_script_search.xml b/indra/newview/skins/default/xui/pl/floater_script_search.xml
new file mode 100755
index 0000000000..ce5e980f54
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_script_search.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script search" title="Wyszukaj Skryptu">
+	<check_box label="Neutralne na wielkość" name="case_text" />
+	<button label="Wyszukaj" label_selected="Wyszukaj" name="search_btn" />
+	<button label="Zamień" label_selected="Zamień" name="replace_btn" />
+	<button label="Zamień Wszystko" label_selected="Zamień Wszystko"
+	     name="replace_all_btn" />
+	<text type="string" length="1" name="txt">
+		Szukaj
+	</text>
+	<text type="string" length="1" name="txt2">
+		Zamień
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_select_key.xml b/indra/newview/skins/default/xui/pl/floater_select_key.xml
new file mode 100755
index 0000000000..aa9e577738
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_select_key.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container" title="">
+	<button label="Anuluj" label_selected="Anuluj" name="Cancel" />
+	<text type="string" length="1" name="Save item as:">
+		By wybrać wciśnij klawisz
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_sell_land.xml b/indra/newview/skins/default/xui/pl/floater_sell_land.xml
new file mode 100755
index 0000000000..94500d0295
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_sell_land.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="sell land" title="Sell Land">
+	<text name="info_parcel_label">
+		Posiadłość:
+	</text>
+	<text name="info_parcel">
+		NAZWA POSIADŁOŚCI
+	</text>
+	<text name="info_size_label">
+		Obszar:
+	</text>
+	<text name="info_size">
+		[AREA] m.
+	</text>
+	<text name="info_action">
+		Aby sprzedać tą Posiadłość:
+	</text>
+	<text name="price_label">
+		Ustal cenę:
+	</text>
+	<text name="price_text">
+		Wybierz właściwą cenę za tą Posiadłość.
+	</text>
+	<text name="price_ld">
+		L$
+	</text>
+	<text name="price_per_m">
+		([PER_METER]L$ za metr)
+	</text>
+	<text name="sell_to_label">
+		Kupiec:
+	</text>
+	<text name="sell_to_text">
+		Wybierz sprzedaż dla kogokolwiek albo dla wybranego kupca.
+	</text>
+	<combo_box name="sell_to">
+		<combo_item name="--selectone--">
+			-- wybierz --
+		</combo_item>
+		<combo_item name="Anyone">
+			Ktokolwiek
+		</combo_item>
+		<combo_item name="Specificuser:">
+			Wybrany kupiec:
+		</combo_item>
+	</combo_box>
+	<button label="Wybierz..." name="sell_to_select_agent" />
+	<text name="sell_objects_label">
+		Obiekty sprzedawane razem z Posiadłością?
+	</text>
+	<text name="sell_objects_text">
+		Przekazywalne obiekty właściciela Posiadłości zmienią właściciela.
+	</text>
+	<radio_group name="sell_objects">
+		<radio_item name="no">
+			Nie, zatrzymaj obiekty
+		</radio_item>
+		<radio_item name="yes">
+			Tak, sprzedaj obiekty razem z Posiadłością
+		</radio_item>
+	</radio_group>
+	<button label="Pokaż Obiekty" name="show_objects" />
+	<text name="nag_message_label">
+		PAMIĘTAJ: Sprzedaż jest nieodwracalna.
+	</text>
+	<button label="Wystaw Ziemię na Sprzedaż" name="sell_btn" />
+	<button label="Anuluj" name="cancel_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_settings_debug.xml b/indra/newview/skins/default/xui/pl/floater_settings_debug.xml
new file mode 100755
index 0000000000..496f8af2db
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_settings_debug.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="settings_debug" title="Ustawienia Usuwania Błędów">
+	<combo_box name="boolean_combo">
+		<combo_item name="TRUE">
+			PRAWDA
+		</combo_item>
+		<combo_item name="FALSE">
+			NIEPRAWDA
+		</combo_item>
+	</combo_box>
+	<color_swatch label="Kolor" name="color_swatch"/>
+	<spinner label="x" name="val_spinner_1"/>
+	<spinner label="x" name="val_spinner_2"/>
+	<spinner label="x" name="val_spinner_3"/>
+	<spinner label="x" name="val_spinner_4"/>
+	<button label="Ustawienia domyślne" name="default_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_snapshot.xml b/indra/newview/skins/default/xui/pl/floater_snapshot.xml
new file mode 100755
index 0000000000..0dafbe5551
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_snapshot.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Snapshot" title="Wygląd Zdjęcia">
+	<text name="type_label">
+		Lokacja zapisu
+	</text>
+	<radio_group label="Rodzaje zdjęć" name="snapshot_type_radio">
+		<radio_item name="postcard">
+			Wyślij (email) pocztówkę
+		</radio_item>
+		<radio_item name="texture">
+			Załaduj do inwentarza (10L$)
+		</radio_item>
+		<radio_item name="local">
+			Zapisz na dysk
+		</radio_item>
+	</radio_group>
+	<text name="file_size_label">
+		Rozmiar pliku: [SIZE] KB
+	</text>
+	<button label="Odśwież Zdjęcie" name="new_snapshot_btn"/>
+	<button label="Wyślij" name="send_btn"/>
+	<button label="Załaduj (L$10)" name="upload_btn"/>
+	<flyout_button label="Zapisz" name="save_btn" tool_tip="Zapisz zdjęcie na dysk">
+		<flyout_button_item name="save_item">
+			Zapisz
+		</flyout_button_item>
+		<flyout_button_item name="saveas_item">
+			Zapisz Jako...
+		</flyout_button_item>
+	</flyout_button>
+	<button label="Anuluj" name="discard_btn"/>
+	<button label="Więcej &gt;&gt;" name="more_btn" tool_tip="Ustawienia Zaawansowane"/>
+	<button label="&lt;&lt; Mniej" name="less_btn" tool_tip="Ustawienia Zaawansowane"/>
+	<text name="type_label2">
+		Wymiar
+	</text>
+	<text name="format_label">
+		Format
+	</text>
+	<combo_box label="Rozdzielczość" name="postcard_size_combo">
+		<combo_item name="CurrentWindow">
+			Obecne Okno
+		</combo_item>
+		<combo_item name="640x480">
+			640x480
+		</combo_item>
+		<combo_item name="800x600">
+			800x600
+		</combo_item>
+		<combo_item name="1024x768">
+			1024x768
+		</combo_item>
+		<combo_item name="Custom">
+			Wybierz
+		</combo_item>
+	</combo_box>
+	<combo_box label="Rozdzielczość" name="texture_size_combo">
+		<combo_item name="CurrentWindow">
+			Obecne Okno
+		</combo_item>
+		<combo_item name="Small(128x128)">
+			Mały (128x128)
+		</combo_item>
+		<combo_item name="Medium(256x256)">
+			Średni (256x256)
+		</combo_item>
+		<combo_item name="Large(512x512)">
+			Duży (512x512)
+		</combo_item>
+		<combo_item name="Custom">
+			Wybierz
+		</combo_item>
+	</combo_box>
+	<combo_box label="Rozdzielczość" name="local_size_combo">
+		<combo_item name="CurrentWindow">
+			Obecne Okno
+		</combo_item>
+		<combo_item name="320x240">
+			320x240
+		</combo_item>
+		<combo_item name="640x480">
+			640x480
+		</combo_item>
+		<combo_item name="800x600">
+			800x600
+		</combo_item>
+		<combo_item name="1024x768">
+			1024x768
+		</combo_item>
+		<combo_item name="1280x1024">
+			1280x1024
+		</combo_item>
+		<combo_item name="1600x1200">
+			1600x1200
+		</combo_item>
+		<combo_item name="Custom">
+			Wybierz
+		</combo_item>
+	</combo_box>
+	<combo_box label="Format" name="local_format_combo">
+		<combo_item name="PNG">
+			PNG
+		</combo_item>
+		<combo_item name="JPEG">
+			JPEG
+		</combo_item>
+		<combo_item name="BMP">
+			BMP
+		</combo_item>
+	</combo_box>
+	<spinner label="Szer" name="snapshot_width"/>
+	<spinner label="Wys" name="snapshot_height"/>
+	<check_box label="Ograniczone Proporcje" name="keep_aspect_check"/>
+	<slider label="Jakość Zdjęcia" name="image_quality_slider"/>
+	<text name="layer_type_label">
+		Zapisz:
+	</text>
+	<combo_box label="Warstwy Obrazu" name="layer_types">
+		<combo_item name="Colors">
+			Kolory
+		</combo_item>
+		<combo_item name="Depth">
+			Głębokość
+		</combo_item>
+		<combo_item name="ObjectMattes">
+			Obiekty Ślepe
+		</combo_item>
+	</combo_box>
+	<check_box label="Pokaż interfejs na zdjęciu" name="ui_check"/>
+	<check_box label="Pokaż obiekty HUD na zdjęciu" name="hud_check"/>
+	<check_box label="Pozostaw otwarte po zapisaniu" name="keep_open_check"/>
+	<check_box label="Widok pełnego ekranu" name="freeze_frame_check"/>
+	<check_box label="Automatyczne odświeżenie" name="auto_snapshot_check"/>
+	<string name="unknown">
+		nieznany
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml
new file mode 100755
index 0000000000..af3ea5ee10
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Name/Description" title="dźwięk.wav">
+	<text name="name_label">
+		Opis:
+	</text>
+	<text name="description_label">
+		Opis:
+	</text>
+	<button label="Anuluj" label_selected="Anuluj" name="cancel_btn" />
+	<button label="Załaduj (L$10)" label_selected="Załaduj (L$10)" name="ok_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_telehub.xml b/indra/newview/skins/default/xui/pl/floater_telehub.xml
new file mode 100755
index 0000000000..33d353a937
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_telehub.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="telehub" title="Obsługa Teleportera">
+	<text name="status_text_connected">
+		Teleporter połączony z obiektem [OBJECT]
+	</text>
+	<text name="status_text_not_connected">
+		Brak połączenia z teleporterem
+	</text>
+	<text name="help_text_connected">
+		By usunąć wybierz Rozłącz.
+	</text>
+	<text name="help_text_not_connected">
+		Wybierz obiekt i kliknij Połącz z teleporterem
+	</text>
+	<button label="Connect Telehub" name="connect_btn" />
+	<button label="Rozłącz" name="disconnect_btn" />
+	<text name="spawn_points_text">
+		Punkty Składowe (pozycje - nie obiekty!):
+	</text>
+	<button label="Add Spawn" name="add_spawn_point_btn" />
+	<button label="Remove Spawn" name="remove_spawn_point_btn" />
+	<text name="spawn_point_help">
+		Wybierz obiekt i wybierz Dodaj by sprecyzować pozycję.
+Wówczas możesz przesunąć lub usunąć obiekt.
+Pozycje są relatywne do części centralnej teleportera.
+Wybierz obiekt z listy by zobaczyć jego pozycję w świecie.
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml
new file mode 100755
index 0000000000..f6802416cb
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="texture picker" title="Wybór Tekstury">
+	<string name="choose_picture">
+		Kliknij by wybrać obraz
+	</string>
+	<text length="1" name="Multiple" type="string">
+		Wiele
+	</text>
+	<text length="1" name="unknown" type="string">
+		Wymiary: [DIMENSIONS]
+	</text>
+	<button label="Domyślna" label_selected="Domyślna" name="Default"/>
+	<button label="Żadna" label_selected="Żadna" name="None"/>
+	<button label="Pusta" label_selected="Pusta" name="Blank"/>
+	<check_box label="Show Folders" name="show_folders_check"/>
+	<search_editor label="Wpisz nazwę tutaj by wyszukać" name="inventory search editor"/>
+	<check_box label="Zastosuj od razu" name="apply_immediate_check"/>
+	<button label="" label_selected="" name="Pipette"/>
+	<button label="Anuluj" label_selected="Anuluj" name="Cancel"/>
+	<button label="Wybierz" label_selected="Wybierz" name="Select"/>
+	<string name="pick title">
+		Wybór:
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml
new file mode 100755
index 0000000000..8e17e9cf50
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_tools.xml
@@ -0,0 +1,636 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="toolbox floater" title="">
+	<!-- Main floater tabs -->
+	<button label="" label_selected="" name="button focus" tool_tip="Zbliżenie"/>
+	<button label="" label_selected="" name="button move" tool_tip="Przesunięcie"/>
+	<button label="" label_selected="" name="button edit" tool_tip="Edycja"/>
+	<button label="" label_selected="" name="button create" tool_tip="Stwórz"/>
+	<button label="" label_selected="" name="button land" tool_tip="Teren"/>
+	<!-- Focus panel -->
+	<check_box label="Zbliżenie" name="radio zoom"/>
+	<volume_slider name="slider zoom"/>
+	<check_box label="Obracanie (Ctrl)" name="radio orbit"/>
+	<check_box label="Przesunięcie (Ctrl-Shift)" name="radio pan"/>
+	<!-- Move panel -->
+	<check_box label="Przesuń" name="radio move"/>
+	<check_box label="Podnieś (Ctrl)" name="radio lift"/>
+	<check_box label="Obróć (Ctrl-Shift)" name="radio spin"/>
+	<!-- Edit panel -->
+	<check_box label="Pozycja" name="radio position"/>
+	<check_box label="Obróć (Ctrl)" name="radio rotate"/>
+	<check_box label="Rozciągnij (Ctrl-Shift)" name="radio stretch"/>
+	<check_box label="Wybierz Teksturę" name="radio select face"/>
+	<check_box label="Edytuj Zlinkowane Części" name="checkbox edit linked parts"/>
+	<text name="text ruler mode">
+		Tryb Linijki:
+	</text>
+	<combo_box name="combobox grid mode">
+		<combo_item name="World">
+			Świat
+		</combo_item>
+		<combo_item name="Local">
+			Lokalnie
+		</combo_item>
+		<combo_item name="Reference">
+			Odniesienia
+		</combo_item>
+	</combo_box>
+	<check_box label="Rozciągnij 2 Strony" name="checkbox uniform"/>
+	<check_box label="Rozciągnij Teksturę" name="checkbox stretch textures"/>
+	<check_box label="Użyj Siatki" name="checkbox snap to grid"/>
+	<button label="Opcje..." label_selected="Opcje..." name="Options..."/>
+	<!-- Help text -->
+	<text name="text status">
+		Przeciągnij żeby przenieść, shift-przeciągnij żeby skopiować
+	</text>
+	<!-- Create panel -->
+	<button label="" label_selected="" name="ToolCube" tool_tip="Sześcian"/>
+	<button label="" label_selected="" name="ToolPrism" tool_tip="Graniastosłup"/>
+	<button label="" label_selected="" name="ToolPyramid" tool_tip="Ostrosłup"/>
+	<button label="" label_selected="" name="ToolTetrahedron" tool_tip="Czworościan"/>
+	<button label="" label_selected="" name="ToolCylinder" tool_tip="Walec"/>
+	<button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Pólwalec"/>
+	<button label="" label_selected="" name="ToolCone" tool_tip="Stożek"/>
+	<button label="" label_selected="" name="ToolHemiCone" tool_tip="Półstożek"/>
+	<button label="" label_selected="" name="ToolSphere" tool_tip="Kula"/>
+	<button label="" label_selected="" name="ToolHemiSphere" tool_tip="Półkula"/>
+	<button label="" label_selected="" name="ToolTorus" tool_tip="Torus"/>
+	<button label="" label_selected="" name="ToolTube" tool_tip="Rura"/>
+	<button label="" label_selected="" name="ToolRing" tool_tip="Pierścień"/>
+	<button label="" label_selected="" name="ToolTree" tool_tip="Drzewo"/>
+	<button label="" label_selected="" name="ToolGrass" tool_tip="Trawa"/>
+	<check_box label="Zostaw Narzędzia Wybrane" name="checkbox sticky"/>
+	<check_box label="Kopiuj Selekcję" name="checkbox copy selection"/>
+	<check_box label="Kopia Środka" name="checkbox copy centers"/>
+	<check_box label="Kopia Obrotu" name="checkbox copy rotates"/>
+	<!-- Land panel -->
+	<check_box label="Zaznaczanie" name="radio select land"/>
+	<check_box label="Niwelowanie" name="radio flatten"/>
+	<check_box label="Podnoszenie" name="radio raise"/>
+	<check_box label="Obniżanie" name="radio lower"/>
+	<check_box label="Wygładzanie" name="radio smooth"/>
+	<check_box label="Fałdowanie terenu" name="radio noise"/>
+	<check_box label="Cofnięcie modyfikacji" name="radio revert"/>
+	<combo_box name="combobox brush size">
+		<combo_item name="Small">
+			Małe
+		</combo_item>
+		<combo_item name="Medium">
+			Średnie
+		</combo_item>
+		<combo_item name="Large">
+			Duże
+		</combo_item>
+	</combo_box>
+	<volume_slider name="slider force"/>
+	<text length="1" name="Strength:" type="string">
+		Siła:
+	</text>
+	<button label="Zastosuj do selekcji" label_selected="Zastosuj do selekcji" name="button apply to selection" tool_tip="Modyfikuj zaznaczony teren"/>
+	<check_box label="Pokaż Właścicieli" name="checkbox show owners"/>
+	<button label="Więcej &gt;&gt;" name="button more" tool_tip="Zaawansowane Opcje"/>
+	<button label="&lt;&lt; Mniej" name="button less" tool_tip="Zaawansowane Opcje"/>
+	<!-- Sub-tabs -->
+	<tab_container name="Object Info Tabs">
+		<panel label="Ogólne" name="General">
+			<text name="Name:">
+				Nazwa:
+			</text>
+			<line_editor name="Object Name"/>
+			<text name="Description:">
+				Opis:
+			</text>
+			<line_editor name="Object Description"/>
+			<text name="Creator:">
+				Twórca:
+			</text>
+			<text name="Creator Name">
+				Thrax Linden
+			</text>
+			<button label="Profil..." label_selected="Profil..." name="button creator profile"/>
+			<text name="Owner:">
+				Właściciel:
+			</text>
+			<text name="Owner Name">
+				Thrax Linden
+			</text>
+			<button label="Profil..." label_selected="Profil..." name="button owner profile"/>
+			<text name="Group:">
+				Grupa:
+			</text>
+			<text name="Group Name Proxy">
+				The Lindens
+			</text>
+			<button label="Ustaw..." label_selected="Ustaw..." name="button set group"/>
+			<text name="prim info">
+				1 obiekt, 1 element
+			</text>
+			<text name="Permissions:">
+				Prawa:
+			</text>
+			<text name="perm_modify">
+				Nie masz prawda do modyfikacji tego obiektu
+			</text>
+			<check_box label="Udostępnij grupie" name="checkbox share with group" tool_tip="Pozwól członkom grupy przesuwać, modyfikować, kopiować i usuwać."/>
+			<string name="text deed continued">
+				Przypisz...
+			</string>
+			<string name="text deed">
+				Przypisz
+			</string>
+			<button label="Przypisz..." label_selected="Przypisz..." name="button deed" tool_tip=""/>
+			<check_box label="Pozwól przesuwać każdemu" name="checkbox allow everyone move"/>
+			<check_box label="Pozwól kopiować każdemu" name="checkbox allow everyone copy"/>
+			<check_box label="Pokaż w wyszukiwarce" name="search_check" tool_tip="Udostępnij wyświetlanie się tego przedmiotu w wynikach wyszukiwania"/>
+			<check_box label="Na Sprzedaż" name="checkbox for sale"/>
+			<text name="Cost">
+				Cena:  L$
+			</text>
+			<line_editor name="Edit Cost"/>
+			<radio_group name="sale type">
+				<radio_item name="Original">
+					Orginał
+				</radio_item>
+				<radio_item name="Copy">
+					Kopia
+				</radio_item>
+				<radio_item name="Contents">
+					Zawartość
+				</radio_item>
+			</radio_group>
+			<text name="Next owner can:">
+				Następny właściciel:
+			</text>
+			<check_box label="Zmienia" name="checkbox next owner can modify"/>
+			<check_box label="Kopiuje" name="checkbox next owner can copy"/>
+			<check_box label="Oddaje/Sprzedaje" name="checkbox next owner can transfer"/>
+			<text name="label click action">
+				Lewe Kliknięcie:
+			</text>
+			<combo_box name="clickaction">
+				<combo_item name="Touch/grab(default)">
+					Dotknij/chwyć (ustawienie domyślne)
+				</combo_item>
+				<combo_item name="Sitonobject">
+					Usiądź na Obiekt
+				</combo_item>
+				<combo_item name="Buyobject">
+					Kup Obiekt
+				</combo_item>
+				<combo_item name="Payobject">
+					Zapłać Obiektowi
+				</combo_item>
+				<combo_item name="Open">
+					Otwórz
+				</combo_item>
+				<combo_item name="Play">
+					Odtwarzaj Media
+				</combo_item>
+				<combo_item name="Opemmedia">
+					Otwrórz Media
+				</combo_item>
+			</combo_box>
+			<text name="B:">
+				B:
+			</text>
+			<text name="O:">
+				O:
+			</text>
+			<text name="G:">
+				G:
+			</text>
+			<text name="E:">
+				E:
+			</text>
+			<text name="N:">
+				N:
+			</text>
+			<text name="F:">
+				F:
+			</text>
+			<string name="text modify info 1">
+				Możesz modyfikować ten obiekt.
+			</string>
+			<string name="text modify info 2">
+				Możesz modyfikować te obiekty.
+			</string>
+			<string name="text modify info 3">
+				Nie możesz modyfikować tego obiektu.
+			</string>
+			<string name="text modify info 4">
+				Nie możesz modyfikować tych obieków.
+			</string>
+			<string name="text modify warning">
+				Musisz zaznaczyć cały obiekt by ustawić prawa.
+			</string>
+			<string name="Cost Default">
+				Cena:           L$
+			</string>
+			<string name="Cost Total">
+				Cena Całości:  L$
+			</string>
+			<string name="Cost Per Unit">
+				Cena Za:     L$
+			</string>
+			<string name="Cost Mixed">
+				Cena Mieszana
+			</string>
+			<string name="Sale Mixed">
+				Sprzedaż Mieszana
+			</string>
+		</panel>
+		<!-- Object sub-tab -->
+		<panel label="Obiekt" name="Object">
+			<text name="select_single">
+				Wybierz tylko jeden element by edytować jego parametry
+			</text>
+			<text name="edit_object">
+				Edytuj parametry obiektu:
+			</text>
+			<check_box label="Zablokowane" name="checkbox locked" tool_tip="Chroni obiekty przed ich przesunięciem lub usunięciem. Pomocne także w czasie budowania by uniknąc niepotrzebnych edycji."/>
+			<check_box label="Fizyczne" name="Physical Checkbox Ctrl" tool_tip="Umożliwia obcność sił grawitacyjnych i oddziaływania pomiędzy obiektami."/>
+			<check_box label="Tymczasowe" name="Temporary Checkbox Ctrl" tool_tip="Umożliwia usunięcie obiektu po 1 minucie od jego stworzenia."/>
+			<check_box label="Fantom" name="Phantom Checkbox Ctrl" tool_tip="Umożliwia zanik kolizji pomiędzy obiektami a awatarami."/>
+			<text name="label position">
+				Pozycja (metry)
+			</text>
+			<spinner label="X" name="Pos X"/>
+			<spinner label="Y" name="Pos Y"/>
+			<spinner label="Z" name="Pos Z"/>
+			<text name="label size">
+				Rozmiar (metry)
+			</text>
+			<spinner label="X" name="Scale X"/>
+			<spinner label="Y" name="Scale Y"/>
+			<spinner label="Z" name="Scale Z"/>
+			<text name="label rotation">
+				Obrót (stopnie)
+			</text>
+			<spinner label="X" name="Rot X"/>
+			<spinner label="Y" name="Rot Y"/>
+			<spinner label="Z" name="Rot Z"/>
+			<text name="label material">
+				Materiał
+			</text>
+			<combo_box name="material">
+				<combo_item name="Stone">
+					Kamień
+				</combo_item>
+				<combo_item name="Metal">
+					Metal
+				</combo_item>
+				<combo_item name="Glass">
+					Szkło
+				</combo_item>
+				<combo_item name="Wood">
+					Drewno
+				</combo_item>
+				<combo_item name="Flesh">
+					Ciało
+				</combo_item>
+				<combo_item name="Plastic">
+					Plastik
+				</combo_item>
+				<combo_item name="Rubber">
+					Guma
+				</combo_item>
+			</combo_box>
+			<text name="label basetype">
+				Rodzaj Bloku Budowalnego
+			</text>
+			<combo_box name="comboBaseType">
+				<combo_item name="Box">
+					Klocek
+				</combo_item>
+				<combo_item name="Cylinder">
+					Walec
+				</combo_item>
+				<combo_item name="Prism">
+					Graniastosłup
+				</combo_item>
+				<combo_item name="Sphere">
+					Kula
+				</combo_item>
+				<combo_item name="Torus">
+					Torus
+				</combo_item>
+				<combo_item name="Tube">
+					Rura
+				</combo_item>
+				<combo_item name="Ring">
+					Pierścień
+				</combo_item>
+				<combo_item name="Sculpted">
+					Skulpty
+				</combo_item>
+			</combo_box>
+			<text name="text cut">
+				Wykrój
+			</text>
+			<spinner label="B" name="cut begin"/>
+			<spinner label="E" name="cut end"/>
+			<text name="text hollow">
+				Wydrążenie
+			</text>
+			<text name="text skew">
+				Ukos/Skos
+			</text>
+			<spinner name="Scale 1"/>
+			<spinner name="Skew"/>
+			<text name="Hollow Shape">
+				Kształt Wydrążenia
+			</text>
+			<combo_box name="hole">
+				<combo_item name="Default">
+					Domyślny
+				</combo_item>
+				<combo_item name="Circle">
+					Koło
+				</combo_item>
+				<combo_item name="Square">
+					Kwadrat
+				</combo_item>
+				<combo_item name="Triangle">
+					Trójkąt
+				</combo_item>
+			</combo_box>
+			<text name="text twist">
+				Skręcenie
+			</text>
+			<spinner label="B" name="Twist Begin"/>
+			<spinner label="E" name="Twist End"/>
+			<text name="scale_taper">
+				Zwężenie
+			</text>
+			<text name="scale_hole">
+				Rozmiar Wgłębienia
+			</text>
+			<spinner label="X" name="Taper Scale X"/>
+			<spinner label="Y" name="Taper Scale Y"/>
+			<text name="text topshear">
+				Przesunięcie Górne
+			</text>
+			<spinner label="X" name="Shear X"/>
+			<spinner label="Y" name="Shear Y"/>
+			<text name="advanced_cut">
+				Wykrojenie Przekroju
+			</text>
+			<text name="advanced_dimple">
+				Przesunięcie Promienia
+			</text>
+			<spinner label="B" name="Path Limit Begin"/>
+			<spinner label="E" name="Path Limit End"/>
+			<text name="text taper2">
+				Zwężenie
+			</text>
+			<spinner label="X" name="Taper X"/>
+			<spinner label="Y" name="Taper Y"/>
+			<text name="text radius delta">
+				Promień
+			</text>
+			<text name="text revolutions">
+				Obroty
+			</text>
+			<spinner name="Radius Offset"/>
+			<spinner name="Revolutions"/>
+			<texture_picker label="Tekstura Skulptowa" name="sculpt texture control" tool_tip="Click to choose a picture"/>
+			<check_box label="Odbicie" name="sculpt mirror control" tool_tip="Odwraca skulpt wzdłóż osi X."/>
+			<check_box label="Środek na zewnątrz" name="sculpt invert control" tool_tip="Odwarca normalne skulptu."/>
+			<text name="label sculpt type">
+				Typ Ścięgna
+			</text>
+			<combo_box name="sculpt type control">
+				<combo_item name="None">
+					(żadne)
+				</combo_item>
+				<combo_item name="Sphere">
+					Kula
+				</combo_item>
+				<combo_item name="Torus">
+					Torus
+				</combo_item>
+				<combo_item name="Plane">
+					Płaczyzna
+				</combo_item>
+				<combo_item name="Cylinder">
+					Walec
+				</combo_item>
+			</combo_box>
+		</panel>
+		<!-- Features sub-tab -->
+		<panel label="Dodatki" name="Features">
+			<text name="select_single">
+				Wybierz tylko jeden element by edytować jego cechę.
+			</text>
+			<text name="edit_object">
+				Edytuj cechy obiektu:
+			</text>
+			<check_box label="Elastyczność" name="Flexible1D Checkbox Ctrl" tool_tip=""/>
+			<spinner label="Gładkość" name="FlexNumSections"/>
+			<spinner label="Ciężar" name="FlexGravity"/>
+			<spinner label="Drżenie" name="FlexFriction"/>
+			<spinner label="Wiatr" name="FlexWind"/>
+			<spinner label="Napięcie" name="FlexTension"/>
+			<spinner label="Siła X" name="FlexForceX"/>
+			<spinner label="Siła Y" name="FlexForceY"/>
+			<spinner label="Siła Z" name="FlexForceZ"/>
+			<check_box label="Światło" name="Light Checkbox Ctrl" tool_tip="Umożliwia emitajcę światła"/>
+			<text name="label color">
+				Kolor
+			</text>
+			<color_swatch label="" name="colorswatch" tool_tip="Kliknij by wybrać kolor"/>
+			<spinner label="Siła" name="Light Intensity"/>
+			<spinner label="Promień" name="Light Radius"/>
+			<spinner label="Spadek" name="Light Falloff"/>
+		</panel>
+		<!-- Texture sub-tab -->
+		<panel label="Tekstura" name="Texture">
+			<texture_picker label="Tekstura" name="texture control" tool_tip="Kliknij by wybrać obraz"/>
+			<color_swatch label="Kolor" name="colorswatch" tool_tip="Kliknij by wybrać kolor"/>
+			<text name="color trans">
+				Transparencja %
+			</text>
+			<spinner name="ColorTrans"/>
+			<text name="glow label">
+				Blask
+			</text>
+			<spinner name="glow"/>
+			<check_box label="Jasność" name="checkbox fullbright"/>
+			<text name="tex gen">
+				Mapowanie
+			</text>
+			<combo_box name="combobox texgen">
+				<combo_item name="Default">
+					Domyślne
+				</combo_item>
+				<combo_item name="Planar">
+					Planarne
+				</combo_item>
+			</combo_box>
+			<text name="label shininess">
+				Połysk
+			</text>
+			<combo_box name="combobox shininess">
+				<combo_item name="None">
+					Żadny
+				</combo_item>
+				<combo_item name="Low">
+					Niski
+				</combo_item>
+				<combo_item name="Medium">
+					Średni
+				</combo_item>
+				<combo_item name="High">
+					Wysoki
+				</combo_item>
+			</combo_box>
+			<text name="label bumpiness">
+				Powierzchnia
+			</text>
+			<combo_box name="combobox bumpiness">
+				<combo_item name="None">
+					Żadna
+				</combo_item>
+				<combo_item name="Brightness">
+					Najjaśniejsza
+				</combo_item>
+				<combo_item name="Darkness">
+					Najciemniejsza
+				</combo_item>
+				<combo_item name="woodgrain">
+					Drewniano-ziarnista
+				</combo_item>
+				<combo_item name="bark">
+					Kory Drzewa
+				</combo_item>
+				<combo_item name="bricks">
+					Cegieł
+				</combo_item>
+				<combo_item name="checker">
+					Planszy Szachowej
+				</combo_item>
+				<combo_item name="concrete">
+					Betonu
+				</combo_item>
+				<combo_item name="crustytile">
+					Płytki/Kafelki
+				</combo_item>
+				<combo_item name="cutstone">
+					Kamienia
+				</combo_item>
+				<combo_item name="discs">
+					Dysku CD
+				</combo_item>
+				<combo_item name="gravel">
+					Żwiru
+				</combo_item>
+				<combo_item name="petridish">
+					Skamieliny
+				</combo_item>
+				<combo_item name="siding">
+					Sidingu
+				</combo_item>
+				<combo_item name="stonetile">
+					Płytki Kamiennej
+				</combo_item>
+				<combo_item name="stucco">
+					Stucco
+				</combo_item>
+				<combo_item name="suction">
+					Suction
+				</combo_item>
+				<combo_item name="weave">
+					Fali
+				</combo_item>
+			</combo_box>
+			<text name="tex scale">
+				Ilość powtórzeń
+			</text>
+			<spinner label="Poziomo (U)" name="TexScaleU"/>
+			<check_box label="Odwróć" name="checkbox flip s"/>
+			<spinner label="Poziomo (V)" name="TexScaleV"/>
+			<check_box label="Odwróć" name="checkbox flip t"/>
+			<text name="tex rotate">
+				Obrót (stopnie)
+			</text>
+			<spinner name="TexRot"/>
+			<string name="string repeats per meter">
+				Powtórzenia /metr
+			</string>
+			<string name="string repeats per face">
+				Powtórzenia /powierzchnia
+			</string>
+			<text name="rpt">
+				Powtórzenia /metr
+			</text>
+			<spinner name="rptctrl"/>
+			<button label="Zastosuj" label_selected="Zastosuj" name="button apply"/>
+			<text name="tex offset">
+				Wyrównanie
+			</text>
+			<spinner label="Poziome (U)" name="TexOffsetU"/>
+			<spinner label="Pionowe (V)" name="TexOffsetV"/>
+			<text name="textbox autofix">
+				Wyrównaj Teksturę Mediów
+(must load first)
+			</text>
+			<button label="Wyrównaj" label_selected="Wyrównaj" name="button align"/>
+		</panel>
+		<panel label="Treść" name="Contents">
+			<button label="Nowy Skrypt..." label_selected="Nowy Skrypt..." name="button new script"/>
+		</panel>
+	</tab_container>
+	<!-- Land Info sub-tab -->
+	<panel name="land info panel">
+		<text name="label_area_price">
+			Cena: L$[PRICE] za [AREA] m
+		</text>
+		<text name="label_area">
+			Obszar: [AREA] m
+		</text>
+		<button label="Kup..." label_selected="Kup..." name="button buy land"/>
+		<button label="Anuluj..." label_selected="Anuluj..." name="button abandon land"/>
+		<button label="Podziel..." label_selected="Podziel..." name="button subdivide land"/>
+		<button label="Złącz..." label_selected="Złącz..." name="button join land"/>
+		<button label="O Posiadłości..." label_selected="O Posiadłości..." name="button about land"/>
+	</panel>
+	<string name="status_rotate">
+		Przeciągaj kolorowe pierścienie żeby obracać obiekt
+	</string>
+	<string name="status_scale">
+		Kliknij i przeciągaj żeby rozciągnąć wybraną stronę
+	</string>
+	<string name="status_move">
+		Wybierz opcję:
+	</string>
+	<string name="status_modifyland">
+		Kliknij i przytrzymaj żeby modyfikować teren
+	</string>
+	<string name="status_camera">
+		Kliknij i przeciągnij by zmienić widok
+	</string>
+	<string name="status_grab">
+		Opcje:
+	</string>
+	<string name="status_place">
+		Rodzaje obiektów:
+	</string>
+	<string name="status_selectland">
+		Edytowanie Terenu:
+	</string>
+	<string name="grid_screen_text">
+		Widok
+	</string>
+	<string name="grid_local_text">
+		Lokalnie
+	</string>
+	<string name="grid_world_text">
+		Świat
+	</string>
+	<string name="grid_reference_text">
+		Odniesienia
+	</string>
+	<string name="grid_attachment_text">
+		Załączniki
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_top_objects.xml b/indra/newview/skins/default/xui/pl/floater_top_objects.xml
new file mode 100755
index 0000000000..dafe420281
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_top_objects.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="top_objects" title="Ładowanie...">
+	<text name="title_text">
+		Ładowanie...
+	</text>
+	<scroll_list name="objects_list">
+		<column label="Wynik" name="score" />
+		<column label="Nazwa" name="name" />
+		<column label="Właściciel" name="owner" />
+		<column label="Miejsce" name="location" />
+		<column label="Czas" name="time" />
+	</scroll_list>
+	<text name="id_text">
+		ID Obiektu:
+	</text>
+	<button label="Pokaż Emitery" name="show_beacon_btn" />
+	<text name="obj_name_text">
+		Nazwa Obiektu:
+	</text>
+	<button label="Filtr" name="filter_object_btn" />
+	<text name="owner_name_text">
+		Owner Name:
+	</text>
+	<button label="Filter" name="filter_owner_btn" />
+	<button label="Zwróć Wybrane" name="return_selected_btn" />
+	<button label="Zwróć Wszystko" name="return_all_btn" />
+	<button label="Deaktywuj Wybrane" name="disable_selected_btn" />
+	<button label="Deaktywuj Wszystko" name="disable_all_btn" />
+	<button label="Odśwież" name="refresh_btn" />
+	<string name="top_scripts_title">
+		Główne Skrypty
+	</string>
+	<string name="top_scripts_text">
+		[COUNT] skryptów działa w czasie [TIME] ms
+	</string>
+	<string name="scripts_score_label">
+		Czas
+	</string>
+	<string name="top_colliders_title">
+		Główne Kolizje
+	</string>
+	<string name="top_colliders_text">
+		[COUNT] obiektów odczuwa działanie wielu potencjalnych kolizji
+	</string>
+	<string name="colliders_score_label">
+		Wynik
+	</string>
+	<string name="none_descriptor">
+		Nie odnalezione
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_tos.xml b/indra/newview/skins/default/xui/pl/floater_tos.xml
new file mode 100755
index 0000000000..32b25481c3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_tos.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container" title="">
+	<button label="Kontynuuj" label_selected="Kontynuuj" name="Continue" />
+	<button label="Anuluj" label_selected="Anuluj" name="Cancel" />
+	<check_box label="Zgadzam się na Warunki Serwisu (Terms of Service)" name="agree_chk" />
+	<text name="tos_heading">
+		Proszę dokładnie przeczytać następujące Warunki Serwisu (Terms of Service). Musisz zaakceptować
+umową żeby kontynuować logowanie do Second Life.
+	</text>
+	<text_editor name="tos_text">
+		TOS_TEXT
+	</text_editor>
+	<string name="real_url">
+		http://secondlife.com/app/tos/
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_url_entry.xml b/indra/newview/skins/default/xui/pl/floater_url_entry.xml
new file mode 100755
index 0000000000..af9d0c7997
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_url_entry.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="url_entry" title="">
+	<text name="media_label">
+		Media URL:
+	</text>
+	<button label="OK" name="ok_btn" />
+	<button label="Anuluj" name="cancel_btn" />
+	<button label="Wyczyść" name="clear_btn" />
+	<text name="loading_label">
+		Ładowanie...
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_water.xml b/indra/newview/skins/default/xui/pl/floater_water.xml
new file mode 100755
index 0000000000..61ffce4177
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_water.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Water Floater" title="Zaawansowany Edytor Wody">
+	<text type="string" length="1" name="KeyFramePresetsText">
+		Ustawienia Wody:
+	</text>
+	<button label="Nowe" label_selected="Nowe" name="WaterNewPreset" />
+	<button label="Zapisz" label_selected="Zapisz" name="WaterSavePreset" />
+	<button label="Usuń" label_selected="Usuń" name="WaterDeletePreset" />
+	<tab_container name="Water Tabs">
+		<panel label="Ustawienia" name="Settings">
+			<text type="string" length="1" name="BHText">
+				Kolor Podwodnej Mgły
+			</text>
+			<button label="?" name="WaterFogColorHelp" />
+			<color_swatch label="" name="WaterFogColor" tool_tip="Kliknij by wybrać kolor" />
+			<text type="string" length="1" name="WaterFogDensText">
+				Wykładnik Gęstości Mgły
+			</text>
+			<button label="?" name="WaterFogDensityHelp" />
+			<slider label="" name="WaterFogDensity" />
+			<text type="string" length="1" name="WaterUnderWaterFogModText">
+				Modyfikator Mgły
+			</text>
+			<button label="?" name="WaterUnderWaterFogModHelp" />
+			<slider label="" name="WaterUnderWaterFogMod" />
+			<text type="string" length="1" name="BDensText">
+				Skala Zmarszczeń
+			</text>
+			<button label="?" name="WaterNormalScaleHelp" />
+			<text type="string" length="1" name="BHText2">
+				1
+			</text>
+			<text type="string" length="1" name="BHText3">
+				2
+			</text>
+			<text type="string" length="1" name="BHText4">
+				3
+			</text>
+			<slider label="" name="WaterNormalScaleX" />
+			<slider label="" name="WaterNormalScaleY" />
+			<slider label="" name="WaterNormalScaleZ" />
+			<text type="string" length="1" name="HDText">
+				Skala Fresnela
+			</text>
+			<button label="?" name="WaterFresnelScaleHelp" />
+			<slider label="" name="WaterFresnelScale" />
+			<text type="string" length="1" name="FresnelOffsetText">
+				Przesunięcie Fresnela
+			</text>
+			<button label="?" name="WaterFresnelOffsetHelp" />
+			<slider label="" name="WaterFresnelOffset" />
+			<text type="string" length="1" name="DensMultText">
+				Górna Refrakcja
+			</text>
+			<button label="?" name="WaterScaleAboveHelp" />
+			<slider label="" name="WaterScaleAbove" />
+			<text type="string" length="1" name="WaterScaleBelowText">
+				Dolna Refrakcja
+			</text>
+			<button label="?" name="WaterScaleBelowHelp" />
+			<slider label="" name="WaterScaleBelow" />
+			<text type="string" length="1" name="MaxAltText">
+				Mnożnik Rozmycia
+			</text>
+			<button label="?" name="WaterBlurMultiplierHelp" />
+			<slider label="" name="WaterBlurMult" />
+		</panel>
+		<panel label="Rysowanie" name="Waves">
+			<text type="string" length="1" name="BHText">
+				Kierunek Dużych Fal
+			</text>
+			<button label="?" name="WaterWave1Help" />
+			<text type="string" length="1" name="WaterWave1DirXText">
+				X
+			</text>
+			<text type="string" length="1" name="WaterWave1DirYText">
+				Y
+			</text>
+			<slider label="" name="WaterWave1DirX" />
+			<slider label="" name="WaterWave1DirY" />
+			<text type="string" length="1" name="BHText2">
+				Kierunek Małych Fal
+			</text>
+			<button label="?" name="WaterWave2Help" />
+			<text type="string" length="1" name="WaterWave2DirXText">
+				X
+			</text>
+			<text type="string" length="1" name="WaterWave2DirYText">
+				Y
+			</text>
+			<slider label="" name="WaterWave2DirX" />
+			<slider label="" name="WaterWave2DirY" />
+			<text type="string" length="1" name="BHText3">
+				Mapa Normalnych
+			</text>
+			<button label="?" name="WaterNormalMapHelp" />
+			<texture_picker label="" name="WaterNormalMap" />
+		</panel>
+	</tab_container>
+	<string name="WLDefaultWaterNames">
+		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/pl/floater_wearable_save_as.xml
new file mode 100755
index 0000000000..b9071c0df9
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_wearable_save_as.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container" title="">
+	<button label="Zapisz" label_selected="Zapisz" name="Save" />
+	<button label="Anuluj" label_selected="Anuluj" name="Cancel" />
+	<text type="string" length="1" name="Save item as:">
+		Zachowaj jako:
+	</text>
+	<line_editor name="name ed">
+		Nowe [DESC]
+	</line_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_windlight_options.xml b/indra/newview/skins/default/xui/pl/floater_windlight_options.xml
new file mode 100755
index 0000000000..d2becee69c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_windlight_options.xml
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="WindLight floater" title="Zaawansowany Edytor Nieba">
+	<text type="string" length="1" name="KeyFramePresetsText">
+		Ustawienia Nieba:
+	</text>
+	<button label="Nowe" label_selected="Nowe" name="WLNewPreset" />
+	<button label="Zapisz" label_selected="Zapisz" name="WLSavePreset" />
+	<button label="Usuń" label_selected="Usuń" name="WLDeletePreset" />
+	<button label="Edytor Cyklu Dnia" label_selected="Day Cycle Editor"
+	     name="WLDayCycleMenuButton" />
+	<tab_container name="WindLight Tabs">
+		<panel label="Atmosfera" name="Atmosphere">
+			<text type="string" length="1" name="BHText">
+				Horyzont Błękitu
+			</text>
+			<button label="?" name="WLBlueHorizonHelp" />
+			<text type="string" length="1" name="BHText2">
+				R
+			</text>
+			<text type="string" length="1" name="BHText3">
+				G
+			</text>
+			<text type="string" length="1" name="BHText4">
+				B
+			</text>
+			<text type="string" length="1" name="BHText5">
+				I
+			</text>
+			<slider label="" name="WLBlueHorizonR" />
+			<slider label="" name="WLBlueHorizonG" />
+			<slider label="" name="WLBlueHorizonB" />
+			<slider label="" name="WLBlueHorizonI" />
+			<text type="string" length="1" name="BDensText">
+				Horyzont Zamglenia
+			</text>
+			<button label="?" name="WLHazeHorizonHelp" />
+			<slider label="" name="WLHazeHorizon" />
+			<text type="string" length="1" name="BDensText2">
+				Gęstość Błękitu
+			</text>
+			<button label="?" name="WLBlueDensityHelp" />
+			<text type="string" length="1" name="BHText6">
+				R
+			</text>
+			<text type="string" length="1" name="BHText7">
+				G
+			</text>
+			<text type="string" length="1" name="BHText8">
+				B
+			</text>
+			<text type="string" length="1" name="BHText9">
+				I
+			</text>
+			<slider label="" name="WLBlueDensityR" />
+			<slider label="" name="WLBlueDensityG" />
+			<slider label="" name="WLBlueDensityB" />
+			<slider label="" name="WLBlueDensityI" />
+			<text type="string" length="1" name="HDText">
+				Gęstość Zamglenia
+			</text>
+			<button label="?" name="WLHazeDensityHelp" />
+			<slider label="" name="WLHazeDensity" />
+			<text type="string" length="1" name="DensMultText">
+				Mnożnik Gęsości
+			</text>
+			<button label="?" name="WLDensityMultHelp" />
+			<slider label="" name="WLDensityMult" />
+			<text type="string" length="1" name="WLDistanceMultText">
+				Mnożnik Dystansu
+			</text>
+			<button label="?" name="WLDistanceMultHelp" />
+			<slider label="" name="WLDistanceMult" />
+			<text type="string" length="1" name="MaxAltText">
+				Max Wysokość
+			</text>
+			<button label="?" name="WLMaxAltitudeHelp" />
+			<slider label="" name="WLMaxAltitude" />
+		</panel>
+		<panel label="Światło" name="Lighting">
+			<text type="string" length="1" name="SLCText">
+				Kolor Słońca/Księżyca
+			</text>
+			<button label="?" name="WLSunlightColorHelp" />
+			<text type="string" length="1" name="BHText">
+				R
+			</text>
+			<text type="string" length="1" name="BHText2">
+				G
+			</text>
+			<text type="string" length="1" name="BHText3">
+				B
+			</text>
+			<text type="string" length="1" name="BHText4">
+				I
+			</text>
+			<slider label="" name="WLSunlightR" />
+			<slider label="" name="WLSunlightG" />
+			<slider label="" name="WLSunlightB" />
+			<slider label="" name="WLSunlightI" />
+			<text type="string" length="1" name="TODText">
+				Pozycja Słońca/Księżyca
+			</text>
+			<button label="?" name="WLTimeOfDayHelp" />
+			<slider label="" name="WLSunAngle" />
+			<text type="string" length="1" name="WLAmbientText">
+				Otoczenie
+			</text>
+			<button label="?" name="WLAmbientHelp" />
+			<text type="string" length="1" name="BHText5">
+				R
+			</text>
+			<text type="string" length="1" name="BHText6">
+				G
+			</text>
+			<text type="string" length="1" name="BHText7">
+				B
+			</text>
+			<text type="string" length="1" name="BHText8">
+				I
+			</text>
+			<slider label="" name="WLAmbientR" />
+			<slider label="" name="WLAmbientG" />
+			<slider label="" name="WLAmbientB" />
+			<slider label="" name="WLAmbientI" />
+			<text type="string" length="1" name="WLEastAngleText">
+				Pozycja Wschodu
+			</text>
+			<button label="?" name="WLEastAngleHelp" />
+			<slider label="" name="WLEastAngle" />
+			<text type="string" length="1" name="SunGlowText">
+				Blask Słońca
+			</text>
+			<button label="?" name="WLSunGlowHelp" />
+			<slider label="Ostrość" name="WLGlowB" />
+			<slider label="Rozmiar" name="WLGlowR" />
+			<text type="string" length="1" name="SceneGammaText">
+				Jasność Obrazu
+			</text>
+			<button label="?" name="WLSceneGammaHelp" />
+			<slider label="" name="WLGamma" />
+			<text type="string" length="1" name="WLStarText">
+				Blask Gwiazd
+			</text>
+			<button label="?" name="WLStarBrightnessHelp" />
+			<slider label="" name="WLStarAlpha" />
+		</panel>
+		<panel label="Chmury" name="Clouds">
+			<text type="string" length="1" name="WLCloudColorText">
+				Kolor Chmur
+			</text>
+			<button label="?" name="WLCloudColorHelp" />
+			<text type="string" length="1" name="BHText">
+				R
+			</text>
+			<text type="string" length="1" name="BHText2">
+				G
+			</text>
+			<text type="string" length="1" name="BHText3">
+				B
+			</text>
+			<text type="string" length="1" name="BHText4">
+				I
+			</text>
+			<slider label="" name="WLCloudColorR" />
+			<slider label="" name="WLCloudColorG" />
+			<slider label="" name="WLCloudColorB" />
+			<slider label="" name="WLCloudColorI" />
+			<text type="string" length="1" name="WLCloudColorText2">
+				Chmury (XY/Gęstość)
+			</text>
+			<button label="?" name="WLCloudDensityHelp" />
+			<text type="string" length="1" name="BHText5">
+				X
+			</text>
+			<text type="string" length="1" name="BHText6">
+				Y
+			</text>
+			<text type="string" length="1" name="BHText7">
+				G
+			</text>
+			<slider label="" name="WLCloudX" />
+			<slider label="" name="WLCloudY" />
+			<slider label="" name="WLCloudDensity" />
+			<text type="string" length="1" name="WLCloudCoverageText">
+				Pokrycie Chmur
+			</text>
+			<button label="?" name="WLCloudCoverageHelp" />
+			<slider label="" name="WLCloudCoverage" />
+			<text type="string" length="1" name="WLCloudScaleText">
+				Skala Chmur
+			</text>
+			<button label="?" name="WLCloudScaleHelp" />
+			<slider label="" name="WLCloudScale" />
+			<text type="string" length="1" name="WLCloudDetailText">
+				Szczegóły (XY/Gęstość)
+			</text>
+			<button label="?" name="WLCloudDetailHelp" />
+			<text type="string" length="1" name="BHText8">
+				X
+			</text>
+			<text type="string" length="1" name="BHText9">
+				Y
+			</text>
+			<text type="string" length="1" name="BHText10">
+				G
+			</text>
+			<slider label="" name="WLCloudDetailX" />
+			<slider label="" name="WLCloudDetailY" />
+			<slider label="" name="WLCloudDetailDensity" />
+			<text type="string" length="1" name="WLCloudScrollXText">
+				Przewijanie Chmur X
+			</text>
+			<button label="?" name="WLCloudScrollXHelp" />
+			<check_box label="Zablokuj" name="WLCloudLockX" />
+			<slider label="" name="WLCloudScrollX" />
+			<text type="string" length="1" name="WLCloudScrollYText">
+				Przewijanie Chmur Y
+			</text>
+			<button label="?" name="WLCloudScrollYHelp" />
+			<check_box label="Zablokuj" name="WLCloudLockY" />
+			<slider label="" name="WLCloudScrollY" />
+			<check_box label="Klasyczne Chmury" name="DrawClassicClouds" />
+			<button label="?" name="WLClassicCloudsHelp" />
+		</panel>
+	</tab_container>
+	<string name="WLDefaultSkyNames">
+		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_world_map.xml b/indra/newview/skins/default/xui/pl/floater_world_map.xml
new file mode 100755
index 0000000000..bd4758bc4e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_world_map.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="worldmap" title="Mapa Świata">
+	<tab_container name="maptab">
+		<panel label="Obiekty" name="objects_mapview" />
+		<panel label="Teren" name="terrain_mapview" />
+	</tab_container>
+	<text name="land_for_sale_label">
+		Na Sprzedaż
+	</text>
+	<text name="auction_label">
+		Aukcja
+	</text>
+	<text name="you_label">
+		Ty
+	</text>
+	<text name="home_label">
+		Start
+	</text>
+	<button label="Start" label_selected="Start" name="Go Home"
+	     tool_tip="Teleportuj się do miejsca startowego" />
+	<text name="person_label">
+		Osoba
+	</text>
+	<check_box label=" " name="people_chk" />
+	<text name="infohub_label">
+		Informacja
+	</text>
+	<check_box label="" name="infohub_chk" />
+	<text name="telehub_label">
+		Teleporter
+	</text>
+	<check_box label="" name="telehubchk" />
+	<text name="land_for_sale_label2">
+		Na Sprzedaż
+	</text>
+	<check_box label="" name="land_for_sale_chk" />
+	<text name="events_label">
+		Impreza
+	</text>
+	<check_box label="" name="event_chk" />
+	<text name="events_mature_label">
+		Impreza (18+)
+	</text>
+	<check_box label="" name="event_mature_chk" />
+	<combo_box label="Dostępni Znajomi" name="friend combo" tool_tip="Znajomi na mapie">
+		<combo_item name="none_selected">
+			Dostępni Znajomi
+		</combo_item>
+	</combo_box>
+	<combo_box label="Zapisane Miejsca" name="landmark combo"
+	     tool_tip="Zapisane miejsca na mapie">
+		<combo_item name="none_selected">
+			Zapisane Miejsca
+		</combo_item>
+	</combo_box>
+	<line_editor label="Szukaj po nazwie regionu" name="location"
+	     tool_tip="Wpisz nazwę regionu" />
+	<button label="Szukaj" name="DoSearch" tool_tip="Wyszukiwaie regionu" />
+	<text name="search_label">
+		Wyniki wyszukiwania:
+	</text>
+	<scroll_list name="search_results">
+		<column label="" name="icon" />
+		<column label="" name="sim_name" />
+	</scroll_list>
+	<text name="location_label">
+		Położenie:
+	</text>
+	<spinner name="spin x" tool_tip="współrzędne X na mapie" />
+	<spinner name="spin y" tool_tip="współrzędne Y na mapie" />
+	<spinner name="spin z" tool_tip="współrzędne Z na mapie" />
+	<button label="Teleportuj" label_selected="Teleportuj" name="Teleport"
+	     tool_tip="Teleportuj do wybranego miejsca" />
+	<button label="Pokaż Cel" label_selected="Pokaż Cel" name="Show Destination"
+	     tool_tip="Wycentruj miejsce celu na mapie" />
+	<button label="Wyczyść" label_selected="Wyczyść" name="Clear"
+	     tool_tip="Stop tracking" />
+	<button label="Pokaż moje miejsce" label_selected="Pokaż moje miejsce"
+	     name="Show My Location" tool_tip="Wycentruj pozcję awatara na mapie" />
+	<button label="Kopiuj SLURL do schowka" name="copy_slurl"
+	     tool_tip="Kopie SLURL obecnego miejsca będę mogły zostać użyte na stronie internetowej." />
+	<slider label="Skala" name="zoom slider" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/menu_inventory.xml b/indra/newview/skins/default/xui/pl/menu_inventory.xml
new file mode 100755
index 0000000000..b89db2facd
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_inventory.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu name="Popup">
+	<menu_item_call label="Kupuj" name="Task Buy" />
+	<menu_item_call label="Otwórz" name="Task Open" />
+	<menu_item_call label="Odtwarzaj" name="Task Play" />
+	<menu_item_call label="Właściwości" name="Task Properties" />
+	<menu_item_call label="Zmień Nazwę" name="Task Rename" />
+	<menu_item_call label="Usuń" name="Task Remove" />
+	<menu_item_call label="Opróżnij Kosz" name="Empty Trash" />
+	<menu_item_call label="Opróżnij Folder Zgubione i Odnalezione" name="Empty Lost And Found" />
+	<menu_item_call label="Nowy Folder" name="New Folder" />
+	<menu_item_call label="Nowy Skrypt" name="New Script" />
+	<menu_item_call label="Nowa Nota" name="New Note" />
+	<menu_item_call label="Nowy Gest" name="New Gesture" />
+	<menu name="New Clothes">
+		<menu_item_call label="Nowa Koszulka" name="New Shirt" />
+		<menu_item_call label="Nowe Spodnie" name="New Pants" />
+		<menu_item_call label="Nowe Buty" name="New Shoes" />
+		<menu_item_call label="Nowe Skarpety" name="New Socks" />
+		<menu_item_call label="Nowa Kurtka" name="New Jacket" />
+		<menu_item_call label="Nowa Spódnica" name="New Skirt" />
+		<menu_item_call label="Nowe Rękawiczki" name="New Gloves" />
+		<menu_item_call label="Nowy Podkoszulek" name="New Undershirt" />
+		<menu_item_call label="Nowa Bielizna" name="New Underpants" />
+	</menu>
+	<menu name="New Body Parts">
+		<menu_item_call label="Nowy Kształt" name="New Shape" />
+		<menu_item_call label="Nowa Skórka" name="New Skin" />
+		<menu_item_call label="Nowe Włosy" name="New Hair" />
+		<menu_item_call label="Nowe Oczy" name="New Eyes" />
+	</menu>
+	<menu_item_call label="Teleportuj" name="Landmark Open" />
+	<menu_item_call label="Otwórz" name="Animation Open" />
+	<menu_item_call label="Otwórz" name="Sound Open" />
+	<menu_item_call label="Wyczyść Obiekt" name="Purge Item" />
+	<menu_item_call label="Przywróć Obiekt" name="Restore Item" />
+	<menu_item_call label="Otwórz" name="Open" />
+	<menu_item_call label="Właściwości" name="Properties" />
+	<menu_item_call label="Zmień Nazwę" name="Rename" />
+	<menu_item_call label="Kopiuj Dane UUID" name="Copy Asset UUID" />
+	<menu_item_call label="Kopiuj" name="Copy" />
+	<menu_item_call label="Wklej" name="Paste" />
+	<menu_item_call label="Usuń" name="Delete" />
+	<menu_item_call label="Zdejmij Obiekt" name="Take Off Items" />
+	<menu_item_call label="Dodaj do Stroju" name="Add To Outfit" />
+	<menu_item_call label="Zmień Strój" name="Replace Outfit" />
+	<menu_item_call label="Rozpocznij Konferencję Czatową" name="Conference Chat Folder" />
+	<menu_item_call label="Odtwarzaj" name="Sound Play" />
+	<menu_item_call label="O Miejscu" name="Teleport To Landmark" />
+	<menu_item_call label="Odtwarzaj w Świecie" name="Animation Play" />
+	<menu_item_call label="Odtwarzaj Lokalnie" name="Animation Audition" />
+	<menu_item_call label="Wyślij IM" name="Send Instant Message" />
+	<menu_item_call label="Zaoferuj Teleportację..." name="Offer Teleport..." />
+	<menu_item_call label="Rozpocznij Konferencję Czatową" name="Conference Chat" />
+	<menu_item_call label="Aktywuj" name="Activate" />
+	<menu_item_call label="Deaktywuj" name="Deactivate" />
+	<menu_item_call label="Odłącz od Siebie" name="Detach From Yourself" />
+	<menu_item_call label="Ubierz" name="Object Wear" />
+	<menu label="Dołącz do" name="Attach To" />
+	<menu label="Dołącz do Załączników HUD" name="Attach To HUD" />
+	<menu_item_call label="Edytuj" name="Wearable Edit" />
+	<menu_item_call label="Ubierz" name="Wearable Wear" />
+	<menu_item_call label="Zdejmij" name="Take Off" />
+	<menu_item_call label="--brak opcji--" name="--no options--" />
+</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_login.xml b/indra/newview/skins/default/xui/pl/menu_login.xml
new file mode 100755
index 0000000000..4d44af19fb
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_login.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu_bar name="Login Menu">
+	<menu label="Plik" name="File">
+		<menu_item_call label="Wyłącz Program" name="Quit" />
+	</menu>
+	<menu label="Edycja" name="Edit">
+		<menu_item_call label="Ustawienia..." name="Preferences..." />
+	</menu>
+	<menu label="Pomoc" name="Help">
+		<menu_item_call label="Second Life: Pomoc" name="Second Life Help" />
+		<menu_item_call label="O Second Life..." name="About Second Life..." />
+	</menu>
+</menu_bar>
diff --git a/indra/newview/skins/default/xui/pl/menu_slurl.xml b/indra/newview/skins/default/xui/pl/menu_slurl.xml
new file mode 100755
index 0000000000..ca5e2b0965
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_slurl.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu name="Popup">
+	<menu_item_call label="O Miejscu" name="about_url" />
+	<menu_item_call label="Teleportuj do Miejsca" name="teleport_to_url" />
+	<menu_item_call label="Pokaż Miejsce na Mapie" name="show_on_map" />
+</menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
new file mode 100755
index 0000000000..3a521df098
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu_bar name="Main Menu">
+	<menu label="Plik" name="File">
+		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+		<menu_item_call label="Załaduj Obraz (L$[COST])..." name="Upload Image"/>
+		<menu_item_call label="Załaduj Dźwięk (L$[COST])..." name="Upload Sound"/>
+		<menu_item_call label="Załaduj Animację (L$[COST])..." name="Upload Animation"/>
+		<menu_item_call label="Załaduj Zbiór Plików (L$[COST] za plik)..." name="Bulk Upload"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Zamknij Bieżące Okno" name="Close Window"/>
+		<menu_item_call label="Zamknij Wszystkie Okna" name="Close All Windows"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Zapisz Obraz Jako..." name="Save Texture As..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Zrób Zdjęcie" name="Take Snapshot"/>
+		<menu_item_call label="Zapisz Zdjęcie na Dysk" name="Snapshot to Disk"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Wyłącz Program" name="Quit"/>
+	</menu>
+	<menu label="Edycja" name="Edit">
+		<menu_item_call label="Cofnij" name="Undo"/>
+		<menu_item_call label="Powtórz" name="Redo"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Wytnij" name="Cut"/>
+		<menu_item_call label="Kopiuj" name="Copy"/>
+		<menu_item_call label="Wklej" name="Paste"/>
+		<menu_item_call label="Usuń" name="Delete"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Szukaj..." name="Search..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Zaznacz Wszystko" name="Select All"/>
+		<menu_item_call label="Cofnij Zaznaczenie" name="Deselect"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Zduplikuj" name="Duplicate"/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu label="Dołącz Obiekt" name="Attach Object"/>
+		<menu label="Odłącz Obiekt" name="Detach Object"/>
+		<menu label="Zdejmij Ubranie" name="Take Off Clothing">
+			<menu_item_call label="Koszulę" name="Shirt"/>
+			<menu_item_call label="Spodnie" name="Pants"/>
+			<menu_item_call label="Buty" name="Shoes"/>
+			<menu_item_call label="Skarpety" name="Socks"/>
+			<menu_item_call label="Kurtkę" name="Jacket"/>
+			<menu_item_call label="Rękawiczki" name="Gloves"/>
+			<menu_item_call label="Podkoszulek" name="Menu Undershirt"/>
+			<menu_item_call label="Bieliznę" name="Menu Underpants"/>
+			<menu_item_call label="Spódnicę" name="Skirt"/>
+			<menu_item_call label="Całe Ubranie" name="All Clothes"/>
+		</menu>
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call label="Gesty..." name="Gestures..."/>
+		<menu_item_call label="Profil..." name="Profile..."/>
+		<menu_item_call label="Wygląd..." name="Appearance..."/>
+		<menu_item_separator label="-----------" name="separator7"/>
+		<menu_item_check label="Znajomi..." name="Friends..."/>
+		<menu_item_call label="Grupy..." name="Groups..."/>
+		<menu_item_separator label="-----------" name="separator8"/>
+		<menu_item_call label="Ustawienia..." name="Preferences..."/>
+	</menu>
+	<menu label="Widok" name="View">
+		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+		<menu_item_call label="Widok Panoramiczny" name="Mouselook"/>
+		<menu_item_check label="Budowanie" name="Build"/>
+		<menu_item_check label="Wolna Kamera" name="Joystick Flycam"/>
+		<menu_item_call label="Normalny Widok" name="Reset View"/>
+		<menu_item_call label="Historia Czatu" name="Look at Last Chatter"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_check label="Narzędzia" name="Toolbar"/>
+		<menu_item_check label="Lokalny Dialog" name="Chat History"/>
+		<menu_item_check label="Komunikacja (IM)" name="Instant Message"/>
+		<menu_item_call label="Inwentarz" name="Inventory"/>
+		<menu_item_check label="Rozmawiające Osoby" name="Active Speakers"/>
+		<menu_item_check label="Wyciszone Osoby" name="Mute List"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_check label="Ustawienia Kamery" name="Camera Controls"/>
+		<menu_item_check label="Ustawienia Ruchu" name="Movement Controls"/>
+		<menu_item_check label="Mapa Świata" name="World Map"/>
+		<menu_item_check label="Mini-Mapa" name="Mini-Map"/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_check label="Statystyki" name="Statistics Bar"/>
+		<menu_item_check label="Granice Posiadłości" name="Property Lines"/>
+		<menu_item_check label="Właściciele Posiadłości" name="Land Owners"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu label="Podpowiedzi" name="Hover Tips">
+			<menu_item_check label="Tutorial" name="Show Tips"/>
+			<menu_item_separator label="-----------" name="separator"/>
+			<menu_item_check label="Posiadłość: wskazówki" name="Land Tips"/>
+			<menu_item_check label="Obiekty: wskazówki" name="Tips On All Objects"/>
+		</menu>
+		<menu_item_check label="Pokaż Transparentne Obiekty" name="Highlight Transparent"/>
+		<menu_item_check label="Emitery" name="beacons"/>
+		<menu_item_check label="Ukryj Cząsteczki" name="Hide Particles"/>
+		<menu_item_check label="Pokaż Załączniki HUD" name="Show HUD Attachments"/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu_item_call label="Zbliżenie" name="Zoom In"/>
+		<menu_item_call label="Domyślny Tryb Widoku" name="Zoom Default"/>
+		<menu_item_call label="Oddalenie" name="Zoom Out"/>
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call label="Tryb Widoku Pełnoekranowego" name="Toggle Fullscreen"/>
+		<menu_item_call label="Ustaw Domyślny Rozmiar Interfejsu Użytkownika" name="Set UI Size to Default"/>
+	</menu>
+	<menu label="Świat" name="World">
+		<menu_item_call label="Czat" name="Chat"/>
+		<menu_item_check label="Zacznij Biegać" name="Always Run"/>
+		<menu_item_check label="Zacznij Latać" name="Fly"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Zapamiętaj Miejsce (LM)" name="Create Landmark Here"/>
+		<menu_item_call label="Ustaw Miejsce Startu" name="Set Home to Here"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Teleportuj do Miejsca Startu" name="Teleport Home"/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Włącz Tryb Nieobecności" name="Set Away"/>
+		<menu_item_call label="Włącz Tryb Pracusia" name="Set Busy"/>
+		<menu_item_call label="Zatrzymaj Wszystkie Animacje" name="Stop All Animations"/>
+		<menu_item_call label="Release Keys" name="Release Keys"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Historia Konta..." name="Account History..."/>
+		<menu_item_call label="Zarządzaj Kontem..." name="Manage My Account..."/>
+		<menu_item_call label="Kup L$..." name="Buy and Sell L$..."/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu_item_call label="Moje Posiadłości..." name="My Land..."/>
+		<menu_item_call label="O Posiadłości..." name="About Land..."/>
+		<menu_item_call label="Kup Posiadłość..." name="Buy Land..."/>
+		<menu_item_call label="Region/Majątek..." name="Region/Estate..."/>
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu label="Ustawienia Środowiska" name="Environment Settings">
+			<menu_item_call label="Wschód Słońca" name="Sunrise"/>
+			<menu_item_call label="Popołudnie" name="Noon"/>
+			<menu_item_call label="Zachód Słońca" name="Sunset"/>
+			<menu_item_call label="Północ" name="Midnight"/>
+			<menu_item_call label="Przywróć Domyślne Ustawienia Regionu" name="Revert to Region Default"/>
+			<menu_item_separator label="-----------" name="separator"/>
+			<menu_item_call label="Edytor Środowiska" name="Environment Editor"/>
+		</menu>
+	</menu>
+	<menu label="Narzędzia" name="Tools">
+		<menu label="Wybierz Narzędzie " name="Select Tool">
+			<menu_item_call label="Przybliżenie" name="Focus"/>
+			<menu_item_call label="Przesuń" name="Move"/>
+			<menu_item_call label="Edytuj" name="Edit"/>
+			<menu_item_call label="Stwórz" name="Create"/>
+			<menu_item_call label="Posiadłość" name="Land"/>
+		</menu>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_check label="Wybierz Tylko Moje Obiekty" name="Select Only My Objects"/>
+		<menu_item_check label="Wybierz Tylko Obiekty Przesuwalne" name="Select Only Movable Objects"/>
+		<menu_item_check label="Wybierz Przez Zaznaczenie" name="Select By Surrounding"/>
+		<menu_item_check label="Pokaż Ukrytą Selekcję" name="Show Hidden Selection"/>
+		<menu_item_check label="Pokaż Zasięg Światła dla Selekcji" name="Show Light Radius for Selection"/>
+		<menu_item_check label="Pokaż Źródło Selekcji" name="Show Selection Beam"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_check label="Przeciągnij Obiekt" name="Snap to Grid"/>
+		<menu_item_call label="Przeciągnij Obiekt Do Siatki" name="Snap Object XY to Grid"/>
+		<menu_item_call label="Zastosuj Zaznaczenie Dla Siatki" name="Use Selection for Grid"/>
+		<menu_item_call label="Opcje Siatki..." name="Grid Options..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_check label="Edytuj Zgrupowane Części" name="Edit Linked Parts"/>
+		<menu_item_call label="Grupuj" name="Link"/>
+		<menu_item_call label="Rozgrupuj" name="Unlink"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Oglądaj Selekcję" name="Focus on Selection"/>
+		<menu_item_call label="Przybliż do Selekcji" name="Zoom to Selection"/>
+		<menu_item_call label="Kup Obiekt" name="Menu Object Take"/>
+		<menu_item_call label="Weź Kopię" name="Take Copy"/>
+		<menu_item_call label="Zapisz Obiekt w Inwentarzu" name="Save Object Back to My Inventory"/>
+		<menu_item_call label="Zapisz Obiekt do Zawartości" name="Save Object Back to Object Contents"/>
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call label="Pokaż Okno Ostrzeżenia/Błędu Skryptu" name="Show Script Warning/Error Window"/>
+		<menu label="Zrekompiluj Skrypt w Selekcji" name="Recompile Scripts in Selection">
+			<menu_item_call label="Mono" name="Mono"/>
+			<menu_item_call label="LSL" name="LSL"/>
+		</menu>
+		<menu_item_call label="Zresetuj Skrypt w Selekcji" name="Reset Scripts in Selection"/>
+		<menu_item_call label="Uruchom Działanie Skryptów w Selekcji" name="Set Scripts to Running in Selection"/>
+		<menu_item_call label="Wstrzymaj Działanie Skryptów w Selekcji" name="Set Scripts to Not Running in Selection"/>
+	</menu>
+	<menu label="Pomoc" name="Help">
+		<menu_item_call label="Second Life: Pomoc" name="Second Life Help"/>
+		<menu_item_call label="Tutorial" name="Tutorial"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Oficjalny Blog Second Life..." name="Official Linden Blog..."/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Portal dla Skrypterów..." name="Scripting Portal..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Złóż Raport o Nadużyciu..." name="Report Abuse..."/>
+		<menu_item_call label="Zderzenia, Popchnięcia, Uderzenia..." name="Bumps, Pushes &amp;amp; Hits..."/>
+		<menu_item_call label="Pomiar Lagów" name="Lag Meter"/>
+		<menu_item_separator label="-----------" name="separator7"/>
+		<menu label="Zgłoś Błędy Klienta" name="Bug Reporting">
+			<menu_item_call label="Publiczna Baza Błędów (JIRA)..." name="Public Issue Tracker..."/>
+			<menu_item_call label="Co to jest JIRA?..." name="Publc Issue Tracker Help..."/>
+			<menu_item_separator label="-----------" name="separator7"/>
+			<menu_item_call label="Instrukcje: Jak Zgłosić Błąd?..." name="Bug Reporing 101..."/>
+			<menu_item_call label="Zabezpieczenia..." name="Security Issues..."/>
+			<menu_item_call label="Pytania i Odpowiedzi: Wikipedia..." name="QA Wiki..."/>
+			<menu_item_separator label="-----------" name="separator9"/>
+			<menu_item_call label="Wyślij Raport Błędu..." name="Report Bug..."/>
+		</menu>
+		<menu_item_call label="About Second Life..." name="About Second Life..."/>
+	</menu>
+</menu_bar>
diff --git a/indra/newview/skins/default/xui/pl/mime_types.xml b/indra/newview/skins/default/xui/pl/mime_types.xml
new file mode 100755
index 0000000000..c90d5761e6
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/mime_types.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<mimetypes name="default">
+	<widgetset name="web">
+		<label name="web_label">
+			Zawartość Strony Internetowej
+		</label>
+		<tooltip name="web_tooltip">
+			To miejsce posiada zawartość strony internetowej
+		</tooltip>
+		<playtip name="web_playtip">
+			Pokaż zawartość strony internetowej
+		</playtip>
+	</widgetset>
+	<widgetset name="movie">
+		<label name="movie_label">
+			Film
+		</label>
+		<tooltip name="movie_tooltip">
+			To miejsce wyświetla filmy
+		</tooltip>
+		<playtip name="movie_playtip">
+			Zacznij odtwarzanie filmu
+		</playtip>
+	</widgetset>
+	<widgetset name="none">
+		<label name="none_label">
+			Brak zawartości
+		</label>
+		<tooltip name="none_tooltip">
+			Brak mediów tutaj
+		</tooltip>
+	</widgetset>
+	<widgetset name="image">
+		<label name="image_label">
+			Obraz
+		</label>
+		<tooltip name="image_tooltip">
+			Brak obrazów w tym miejscu
+		</tooltip>
+		<playtip name="image_playtip">
+			Zobacz obrazy tego miejsca
+		</playtip>
+	</widgetset>
+	<widgetset name="audio">
+		<label name="audio_label">
+			Audio
+		</label>
+		<tooltip name="audio_tooltip">
+			To miejsce odtwarza audio
+		</tooltip>
+		<playtip name="audio_playtip">
+			Zacznij odtwarzanie audio
+		</playtip>
+	</widgetset>
+	<scheme name="rtsp">
+		<label name="rtsp_label">
+			Strumieniowe w czasie rzeczywistym
+		</label>
+	</scheme>
+	<mimetype name="blank">
+		<label name="blank_label">
+			- Żadne -
+		</label>
+	</mimetype>
+	<mimetype name="none/none">
+		<label name="none/none_label">
+			- Żadne -
+		</label>
+	</mimetype>
+	<mimetype name="audio/*">
+		<label name="audio2_label">
+			Audio
+		</label>
+	</mimetype>
+	<mimetype name="video/*">
+		<label name="video2_label">
+			Video
+		</label>
+	</mimetype>
+	<mimetype name="image/*">
+		<label name="image2_label">
+			Obraz
+		</label>
+	</mimetype>
+	<mimetype name="video/vnd.secondlife.qt.legacy">
+		<label name="vnd.secondlife.qt.legacy_label">
+			Movie (QuickTime)
+		</label>
+	</mimetype>
+	<mimetype name="application/javascript">
+		<label name="application/javascript_label">
+			Javascript
+		</label>
+	</mimetype>
+	<mimetype name="application/ogg">
+		<label name="application/ogg_label">
+			Ogg Audio/Video
+		</label>
+	</mimetype>
+	<mimetype name="application/pdf">
+		<label name="application/pdf_label">
+			Dokument PDF
+		</label>
+	</mimetype>
+	<mimetype name="application/postscript">
+		<label name="application/postscript_label">
+			Dokument Postscript
+		</label>
+	</mimetype>
+	<mimetype name="application/rtf">
+		<label name="application/rtf_label">
+			Tekst (RTF)
+		</label>
+	</mimetype>
+	<mimetype name="application/smil">
+		<label name="application/smil_label">
+			Synchronized Multimedia Integration Language (SMIL)
+		</label>
+	</mimetype>
+	<mimetype name="application/xhtml+xml">
+		<label name="application/xhtml+xml_label">
+			Strona internetowa (XHTML)
+		</label>
+	</mimetype>
+	<mimetype name="application/x-director">
+		<label name="application/x-director_label">
+			Macromedia Director
+		</label>
+	</mimetype>
+	<mimetype name="application/x-shockwave-flash">
+		<label name="application/x-shockwave-flash_label">
+			Flash
+		</label>
+	</mimetype>
+	<mimetype name="audio/mid">
+		<label name="audio/mid_label">
+			Audio (MIDI)
+		</label>
+	</mimetype>
+	<mimetype name="audio/mpeg">
+		<label name="audio/mpeg_label">
+			Audio (MP3)
+		</label>
+	</mimetype>
+	<mimetype name="audio/x-aiff">
+		<label name="audio/x-aiff_label">
+			Audio (AIFF)
+		</label>
+	</mimetype>
+	<mimetype name="audio/x-wav">
+		<label name="audio/x-wav_label">
+			Audio (WAV)
+		</label>
+	</mimetype>
+	<mimetype name="image/bmp">
+		<label name="image/bmp_label">
+			Obraz (BMP)
+		</label>
+	</mimetype>
+	<mimetype name="image/gif">
+		<label name="image/gif_label">
+			Obraz (GIF)
+		</label>
+	</mimetype>
+	<mimetype name="image/jpeg">
+		<label name="image/jpeg_label">
+			Image (JPEG)
+		</label>
+	</mimetype>
+	<mimetype name="image/png">
+		<label name="image/png_label">
+			Image (PNG)
+		</label>
+	</mimetype>
+	<mimetype name="image/svg+xml">
+		<label name="image/svg+xml_label">
+			Obraz (SVG)
+		</label>
+	</mimetype>
+	<mimetype name="image/tiff">
+		<label name="image/tiff_label">
+			Obraz (TIFF)
+		</label>
+	</mimetype>
+	<mimetype name="text/html">
+		<label name="text/html_label">
+			Strona internetowa
+		</label>
+	</mimetype>
+	<mimetype name="text/plain">
+		<label name="text/plain_label">
+			Tekst
+		</label>
+	</mimetype>
+	<mimetype name="text/xml">
+		<label name="text/xml_label">
+			XML
+		</label>
+	</mimetype>
+	<mimetype name="video/mpeg">
+		<label name="video/mpeg_label">
+			Film (MPEG)
+		</label>
+	</mimetype>
+	<mimetype name="video/mp4">
+		<label name="video/mp4_label">
+			Film (MP4)
+		</label>
+	</mimetype>
+	<mimetype name="video/quicktime">
+		<label name="video/quicktime_label">
+			Film (QuickTime)
+		</label>
+	</mimetype>
+	<mimetype name="video/x-ms-asf">
+		<label name="video/x-ms-asf_label">
+			Film (Windows Media ASF)
+		</label>
+	</mimetype>
+	<mimetype name="video/x-ms-wmv">
+		<label name="video/x-ms-wmv_label">
+			Film (Windows Media WMV)
+		</label>
+	</mimetype>
+	<mimetype name="video/x-msvideo">
+		<label name="video/x-msvideo_label">
+			Film (AVI)
+		</label>
+	</mimetype>
+</mimetypes>
diff --git a/indra/newview/skins/default/xui/pl/panel_audio_device.xml b/indra/newview/skins/default/xui/pl/panel_audio_device.xml
new file mode 100755
index 0000000000..a2383404fc
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_audio_device.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="device_settings">
+	<text type="string" length="1" name="Audio Devices">
+		Urządzenia Audio
+	</text>
+	<text type="string" length="1" name="Input device (microphone):">
+		Urządzenia Wejściowe (mikrofon):
+	</text>
+	<text type="string" length="1" name="Output device (speakers):">
+		Urządzenia Wyjściowe (głośniki):
+	</text>
+	<text type="string" length="1" name="Input level:">
+		Poziom Wejścia
+	</text>
+	<text_editor type="string" length="1" name="voice_intro_text1">
+		Użyj suwaka by dostosować jak głosno Cię słychać dla innych Rezydentów. By przetestować poziom wejścia, zacznij mówić do mikrofonu.
+	</text_editor>
+	<volume_slider name="mic_volume_slider"
+	     tool_tip="By zmienić poziom głośności użyj suwaka" />
+	<text name="wait_text">
+		Proszę poczekać
+	</text>
+	<string name="default_text">
+		Domyślne
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_friends.xml b/indra/newview/skins/default/xui/pl/panel_friends.xml
new file mode 100755
index 0000000000..7f0fe82bc7
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_friends.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="friends">
+	<string name="Multiple">
+		Znajomi...
+	</string>
+	<scroll_list name="friend_list"
+	     tool_tip="By wybrać wielu znajomych za jednym razem przetrzymaj klawisz shift lub control">
+		<column name="icon_online_status" tool_tip="Status dostępności" />
+		<column label="Imię" name="friend_name" tool_tip="Imię" />
+		<column name="icon_visible_online"
+		     tool_tip="Znajoma osoba może widzieć czy jesteś w Second Life" />
+		<column name="icon_visible_map"
+		     tool_tip="Znajoma osoba może zlokalizować Cię na mapie" />
+		<column name="icon_edit_mine"
+		     tool_tip="Znajoma osoba może edytować, usunąć lub wziąść Twoje obiekty" />
+		<column name="icon_edit_theirs" tool_tip="Możesz edytować obiekty tej znajomej osoby" />
+	</scroll_list>
+	<button label="Czat/IM" name="im_btn" tool_tip="Rozpocznij sesję czatu/IM" />
+	<button label="Profil" name="profile_btn"
+	     tool_tip="Pokaż zdjęcia, grupy i inne informacje" />
+	<button label="Teleportuj..." name="offer_teleport_btn"
+	     tool_tip="Zaoferuj teleportację do Twojej obecnej lokalizacji" />
+	<button label="Zapłać..." name="pay_btn" tool_tip="Zapłać L$ tej osobie" />
+	<button label="Usuń..." name="remove_btn"
+	     tool_tip="Usuń tę osobę z listy znajomych" />
+	<button label="Dodaj..." name="add_btn" tool_tip="Zaoferuj przyjaźń" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_general.xml b/indra/newview/skins/default/xui/pl/panel_group_general.xml
new file mode 100755
index 0000000000..a43e93ae3b
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_group_general.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Ogólne" name="general_tab">
+	<string name="help_text">
+		Zakładka Ogólne zawiera informacje na temat tej grupy, 
+listę właścicieli, widocznych członków,
+ustawienia grupy oraz opcje członkostwa.
+	</string>
+	<string name="group_info_unchanged">
+		Ogólne informacje na temat grupy uległy zmianie.
+	</string>
+	<button label="?" label_selected="?" name="help_button" />
+	<line_editor label="Wpisz nazwę grupy tutaj" name="group_name_editor" />
+	<text name="group_name">
+		Wpisz nazwę grupy tutaj
+	</text>
+	<text name="prepend_founded_by">
+		Założyciel:
+	</text>
+	<text name="founder_name">
+		(proszę czekać)
+	</text>
+	<text name="group_charter_label">
+		Status Grupy
+	</text>
+	<texture_picker label="Insygnia Grupy" name="insignia" tool_tip="Kliknij by wybrać zdjęcie" />
+	<text_editor name="charter">
+		Status Grupy
+	</text_editor>
+	<button label="Dośącz (L$0)" label_selected="Dołącz (L$0)" name="join_button" />
+	<button label="Szczegóły" label_selected="Szczegóły" name="info_button" />
+	<text name="text_owners_and_visible_members">
+		Właściciele i widoczni członkowie
+	</text>
+	<text name="text_owners_are_shown_in_bold">
+		(Właściciele wyświetlają się pogrubioną czcionką)
+	</text>
+	<name_list name="visible_members">
+		<column label="Imię" name="name" />
+		<column label="Tytuł" name="title" />
+		<column label="Ostatnio w SL" name="online" />
+	</name_list>
+	<text name="text_group_preferences">
+		Ustawienia Grupy
+	</text>
+	<panel name="preferences_container">
+		<check_box label="Wyświetlaj w wyszukiwarce" name="show_in_group_list"
+		     tool_tip="Udostępnij info o grupie w wyszukiwarce" />
+		<check_box label="Wolny Wstęp" name="open_enrollement"
+		     tool_tip="Sprawdź czy grupa oferuje wolny wstęp i nie wymaga zaproszenia." />
+		<check_box label="Opłata Wstępu: L$" name="check_enrollment_fee"
+		     tool_tip="Ustaw opłatę za przyłączenie się do grupy." />
+		<spinner name="spin_enrollment_fee"
+		     tool_tip="Nowi członkowie grupy muszą zapłacić wymaganą opłatę by dołączyć do grupy." />
+		<combo_box name="group_mature_check"
+		     tool_tip="Ustaw jeżeli informacje dotyczące grupy są o treści dla osob 18+">
+			<combo_item name="select_mature">
+				- Określ treść -
+			</combo_item>
+			<combo_item name="mature">
+				Treść dla osób 18+
+			</combo_item>
+			<combo_item name="not_mature">
+				Treść dla wszystkich
+			</combo_item>
+		</combo_box>
+		<panel name="title_container">
+			<text name="active_title_label">
+				Mój Aktywny Tytuł
+			</text>
+			<combo_box length="150" name="active_title"
+			     tool_tip="Ustaw tytuł który wyświetla się kiedy grupa jest aktywna." />
+		</panel>
+		<check_box label="Otrzymuj grupowe ogłoszenia" name="receive_notices"
+		     tool_tip="Zaznacz jeżeli chcesz otrzymywać ogłoszenia z tej grupy.   Anuluj z zaznaczenia, jeżeli nie chcesz otrzymywać żadnych ogłoszeń z tej grupy." />
+		<check_box label="Wyświetl grupę w profilu" name="list_groups_in_profile"
+		     tool_tip="Zaznacz jeżeli chcesz by grupa wyświetlała się w Twoim profilu" />
+	</panel>
+	<string name="incomplete_member_data_str">
+		Wyszukiwanie informacji o członku
+	</string>
+	<string name="confirm_group_create_str">
+		Koszt utworzenia tej grupy wynosi L$100. 
+Czy napewno jesteś PEWNY,że chcesz zapłacić L$100 by utworzyć grupę?
+Pamiętaj, jeżeli w ciągu 48h od utworzenia grupy nikt do niej nie dołączy, informacje o grupie zostaną usunięte z bazy, a nazwa grupy zablokowana do użycia w przyszśości.
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_invite.xml b/indra/newview/skins/default/xui/pl/panel_group_invite.xml
new file mode 100755
index 0000000000..ef5628d8d3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_group_invite.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Zaproszenie do Grupy" name="invite_panel">
+	<text name="help_text">
+		Zaproś Rezydentów do Grupy
+	</text>
+	<button label="Otwórz Osobisty Katalog" name="add_button" tool_tip="" />
+	<name_list name="invitee_list" tool_tip="" />
+	<button label="Usuń z Listy" name="remove_button" tool_tip="" />
+	<text name="role_text">
+		Wybierz rolę dla nowego członka:
+	</text>
+	<combo_box name="role_name" tool_tip="" />
+	<button label="Wyślij Zaproszenia" name="ok_button" />
+	<button label="Anuluj" name="cancel_button" />
+	<string name="confirm_invite_owner_str">
+		Jesteś pewny, że chcesz wybrać nowych właśccieli grupy? Ta decyzja jest ostateczna!
+	</string>
+	<string name="loading">
+		(loading...)
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_land_money.xml b/indra/newview/skins/default/xui/pl/panel_group_land_money.xml
new file mode 100755
index 0000000000..8f767a7393
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_group_land_money.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Posiadłości i L$" name="land_money_tab">
+	<string name="help_text">
+		Posiadłości należące go Grupy są wymienione z danymi
+o kontrybucjach. Ostrzeżenie pojawia się w momencie
+kiedy używa się mniej Posiadłości od Kontrybucji.
+Zakładki Planowanie, Szczegóły i Sprzedaż zawierają
+informacje o finansach Grupy.
+	</string>
+	<button label="?" name="help_button" />
+	<string name="cant_view_group_land_text">
+		Nie masz pozwolenia na oglądanie Posiadłości Grupy.
+	</string>
+	<string name="cant_view_group_accounting_text">
+		Nie masz dostępu do konta, finansów Grupy.
+	</string>
+	<string name="loading_txt">
+		Ładowanie...
+	</string>
+	<text name="group_land_heading">
+		Posiadłości Grupy
+	</text>
+	<scroll_list name="group_parcel_list">
+		<column label="Nazwa Posiadłości" name="name" />
+		<column label="Region" name="location" />
+		<column label="Obszar" name="area" />
+		<column label="" name="hidden" />
+	</scroll_list>
+	<button label="Pokaż na Mapie" label_selected="Pokaż na Mapie" name="map_button" />
+	<text name="total_contributed_land_label">
+		Kontrybucje:
+	</text>
+	<text name="total_contributed_land_value">
+		[AREA] metrów
+	</text>
+	<text name="total_land_in_use_label">
+		Używane Posiadłości:
+	</text>
+	<text name="total_land_in_use_value">
+		[AREA] metrów
+	</text>
+	<text name="land_available_label">
+		Dostępne Posiadłości:
+	</text>
+	<text name="land_available_value">
+		[AREA] metrów
+	</text>
+	<text name="your_contribution_label">
+		Twoje Kontrybucje:
+	</text>
+	<string name="land_contrib_error">
+		Nie można ustalić Twoich kontrybucji.
+	</string>
+	<text name="your_contribution_max_value">
+		metrów ([AMOUNT] maksimum)
+	</text>
+	<text name="group_over_limit_text">
+		Członkowie Grupy muszą zwiększyć kredyt na używanie Posiadłości.
+	</text>
+	<text name="group_money_heading">
+		L$ Grupy
+	</text>
+	<tab_container name="group_money_tab_container">
+		<panel label="Planowanie" name="group_money_planning_tab">
+			<text_editor name="group_money_planning_text">
+				Obliczanie...
+			</text_editor>
+		</panel>
+		<panel label="Szczegóły" name="group_money_details_tab">
+			<text_editor name="group_money_details_text">
+				Obliczanie...
+			</text_editor>
+			<button label="&lt; Wcześniej" label_selected="&lt; Wcześniej"
+			     name="earlier_details_button" tool_tip="Do tyłu w czasie" />
+			<button label="Później &gt;" label_selected="Później &gt;"
+			     name="later_details_button" tool_tip="Do przodu w czasie" />
+		</panel>
+		<panel label="Sprzedaż" name="group_money_sales_tab">
+			<text_editor name="group_money_sales_text">
+				Obliczanie...
+			</text_editor>
+			<button label="&lt; Wcześniej" label_selected="&lt; Wcześniej"
+			     name="earlier_sales_button" tool_tip="Do tyłu w czasie" />
+			<button label="Później &gt;" label_selected="Później &gt;"
+			     name="later_sales_button" tool_tip="Do przodu w czasie" />
+		</panel>
+	</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_notices.xml b/indra/newview/skins/default/xui/pl/panel_group_notices.xml
new file mode 100755
index 0000000000..4d0d817d3e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_group_notices.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Ogłoszenia" name="notices_tab">
+	<string name="help_text">
+		Ogłoszenia to szybka droga do komunikowania się ze wszystkmi członkami grupy poprzez wysylanie ich na grupowym kanale. Dodatkowo, do ogłoszenia można dołańczać załączniki. Ogłoszenia docierają jedynie do członków grupy, którzy mają zdolność ich otrzymywania. By nie otrzymywać ogłoszeń, w zakładce Ogólne pozostaw niezaznaczonym &quot;Otrzymuj grupowe ogłoszenia&quot;.
+	</string>
+	<string name="no_notices_text">
+		Brak przeszłych ogłoszeń
+	</string>
+	<button label="?" label_selected="?" name="help_button" />
+	<text name="lbl">
+		Archiwum Grupowych Ogłoszeń
+	</text>
+	<text name="lbl2">
+		Ogłoszenia przechowywane są przez 14 dni. 
+Kliknij tutaj by zobaczyć ogłoszenie. 
+Użyj Odswież by zobaczyć czy nowe ogloszenia zostały wysłane. 
+Limit dzienny ogłoszeń dla grupy wynosi 200.
+	</text>
+	<scroll_list name="notice_list">
+		<column label="" name="icon" />
+		<column label="Temat" name="subject" />
+		<column label="Od" name="from" />
+		<column label="Data" name="date" />
+	</scroll_list>
+	<text name="notice_list_none_found">
+		Nie znalezione.
+	</text>
+	<button label="Stwórz Nowe Ogłoszenie" label_selected="Stwórz Nowe Ogłoszenie"
+	     name="create_new_notice" />
+	<button label="Odśwież" label_selected="Odśwież Listę" name="refresh_notices" />
+	<panel label="Stwórz Nowe Ogłoszenie" name="panel_create_new_notice">
+		<text name="lbl">
+			Stwórz Ogłoszenie
+		</text>
+		<text name="lbl2">
+			By wysłać ogłoszenie musisz nadać mu tytuł. 
+Możesz także dołączyć pojedynczy załącznik ze swojego 
+inwentarza. Załącznik musi mieć prawo modyfikacyjne 
+do kopiowania oraz transferu.
+		</text>
+		<text name="lbl3">
+			Temat:
+		</text>
+		<text name="lbl4">
+			Treść:
+		</text>
+		<text name="lbl5">
+			Załącz:
+		</text>
+		<button label="Usuń Załącznik" label_selected="Usuń Załącznik"
+		     name="remove_attachment" />
+		<button label="Wyślij" label_selected="Wyślij" name="send_notice" />
+		<panel name="drop_target" tool_tip="" />
+	</panel>
+	<panel label="Zobacz Przeszłe Ogłoszenia" name="panel_view_past_notice">
+		<text name="lbl">
+			Ogłoszenia Zachowane
+		</text>
+		<text name="lbl2">
+			By wysłać nowe ogłoszenie, kliknij Stwórz Nowe Ogłoszenie.
+		</text>
+		<text name="lbl3">
+			Temat:
+		</text>
+		<text name="lbl4">
+			Treść:
+		</text>
+		<button label="Otwórz Załącznik" label_selected="Otwórz Załącznik"
+		     name="open_attachment" />
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_roles.xml b/indra/newview/skins/default/xui/pl/panel_group_roles.xml
new file mode 100755
index 0000000000..e48ba0c1b0
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_group_roles.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Członkowie" name="roles_tab">
+	<string name="default_needs_apply_text">
+		Panel zawiera nie zapisane zmiany.
+	</string>
+	<string name="want_apply_text">
+		Chcesz zapisać zmiany?
+	</string>
+	<button label="?" name="help_button" />
+	<panel name="members_header">
+		<text name="static">
+			Funkcje Członków
+		</text>
+		<text name="static2">
+			Członkowie Grupy mają przydzielone Funkcje z Przywilejami. Te ustawienia
+można łatwo zmienić, pozwalając na lepszą organizację i zastosowanie.
+		</text>
+	</panel>
+	<panel name="roles_header">
+		<text name="static">
+			Funkcje
+		</text>
+		<text name="role_properties_modifiable">
+			Wybierz Funkcję. Możesz zmienić Nazwę, Opis i Tytuł Członka.
+		</text>
+		<text name="role_properties_not_modifiable">
+			Wybierz Funkcję żeby zobaczyć jej atrybuty, Członków i Przywileje.
+		</text>
+		<text name="role_actions_modifiable">
+			Możesz również przypisać Przywileje do Funkcji.
+		</text>
+		<text name="role_actions_not_modifiable">
+			Możesz zobaczyć ale nie możesz modyfikować Przywilejów.
+		</text>
+	</panel>
+	<panel name="actions_header">
+		<text name="static">
+			Przywileje
+		</text>
+		<text name="static2">
+			Możesz zobaczyć opis Przywileju oraz Funkcje i Członków z przypisanym
+Przywilejem.
+		</text>
+	</panel>
+	<tab_container name="roles_tab_container">
+		<panel label="Członkowie" name="members_sub_tab" tool_tip="Członkowie">
+			<button label="Szukaj" name="search_button" />
+			<button label="Wszystko" name="show_all_button" />
+			<name_list name="member_list">
+				<column label="Imię" name="name" />
+				<column label="Donacje" name="donated" />
+				<column label="Ostatnio w SL" name="online" />
+			</name_list>
+			<button label="Zaproś Nową Osobę..." name="member_invite" />
+			<button label="Usuń z Grupy" name="member_eject" />
+			<string name="help_text">
+				Możesz dodawać i usuwać Funkcje przypisane do Członków.
+Możesz wybrać wielu Członków naciskając Ctrl i klikając na ich imionach.
+			</string>
+		</panel>
+		<panel label="Funkcje" name="roles_sub_tab">
+			<button label="Szukaj" name="search_button" />
+			<button label="Wszystko" name="show_all_button" />
+			<scroll_list name="role_list">
+				<column label="Funkcja" name="name" />
+				<column label="Tytuł" name="title" />
+				<column label="Liczba" name="members" />
+			</scroll_list>
+			<button label="Dodaj Nową Funkcję..." name="role_create" />
+			<button label="Usuń Funkcję" name="role_delete" />
+			<string name="help_text">
+				Funkcje mają Tytuł i przypisane Przywileje. Członkowie mogą mieć jedną lub więcej Funkcji.
+				Grupa może zawierać maksymalnie 10 Funkcji uwzględniając Funkcje Każdy i Właściciel.
+			</string>
+			<string name="cant_delete_role">
+				Specjalne Funkcje Każdy i Właściciel nie mogą zostać usunięte.
+			</string>
+		</panel>
+		<panel label="Przywileje" name="actions_sub_tab">
+			<button label="Szukaj" name="search_button" />
+			<button label="Wszystko" name="show_all_button" />
+			<scroll_list name="action_list" tool_tip="Select an Ability to view more details.">
+				<column label="" name="icon" />
+				<column label="" name="action" />
+			</scroll_list>
+			<string name="help_text">
+				Przywileje pozwalają Członkom przypisanym do Funkcji na wykonywanie różnych zadań.
+Istnieje wiele Przywilei.
+			</string>
+		</panel>
+	</tab_container>
+	<panel name="members_footer">
+		<text name="static">
+			Funkcje
+		</text>
+		<text name="static2">
+			Przywileje
+		</text>
+		<scroll_list name="member_assigned_roles">
+			<column label="" name="checkbox" />
+			<column label="" name="role" />
+		</scroll_list>
+		<scroll_list name="member_allowed_actions"
+		     tool_tip="Opisy Przywilejów są dostępne w zakładce Przywileje.">
+			<column label="" name="icon" />
+			<column label="" name="action" />
+		</scroll_list>
+	</panel>
+	<panel name="roles_footer">
+		<text name="static">
+			Nazwa
+		</text>
+		<text name="static2">
+			Opis
+		</text>
+		<line_editor name="role_name">
+			Liczba
+		</line_editor>
+		<text name="static3">
+			Tytuł
+		</text>
+		<line_editor name="role_title">
+			(proszę czekać)
+		</line_editor>
+		<text_editor name="role_description">
+			(proszę czekać)
+		</text_editor>
+		<text name="static4">
+			Przypisani Członkowie
+		</text>
+		<text name="static5" tool_tip="Przywileje przypisane do wybranej Funkcji.">
+			Przypisane Przywileje
+		</text>
+		<check_box label="Członkowie są Widoczni" name="role_visible_in_list"
+		     tool_tip="Określa czy Członkowie w tej Funkcji są widoczni dla ludzi spoza Grupy." />
+		<scroll_list name="role_allowed_actions"
+		     tool_tip="Opisy Przywilejów są dostępne w zakładce Przywileje.">
+			<column label="" name="icon" />
+			<column label="" name="checkbox" />
+			<column label="" name="action" />
+		</scroll_list>
+	</panel>
+	<panel name="actions_footer">
+		<text name="static">
+			Opis
+		</text>
+		<text_editor name="action_description">
+			Przywilej &apos;Usuń Członka z Grupy&apos;. Tylko Właściciel może usunąć innego Właściciela.
+		</text_editor>
+		<text name="static2">
+			Funkcje z Przywilejem
+		</text>
+		<text name="static3">
+			Członkowie z Przywilejem
+		</text>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_groups.xml b/indra/newview/skins/default/xui/pl/panel_groups.xml
new file mode 100755
index 0000000000..377727feb7
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_groups.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="groups">
+	<scroll_list name="group list">
+		<column label="" name="name" />
+	</scroll_list>
+	<text type="string" length="1" name="groupdesc">
+		Twoja aktywna grupa jest pogrubiona.
+	</text>
+	<text type="string" length="1" name="groupcount">
+		Należysz do [COUNT] group (maksimum to [MAX]).
+	</text>
+	<button label="Czat/IM" name="IM" tool_tip="Rozpocznij sesję czatu (IM)" />
+	<button label="O Grupie" name="Info" />
+	<button label="Wybierz" name="Activate" />
+	<button label="Opuść" name="Leave" />
+	<button label="Stwórz..." name="Create" />
+	<button label="Szukaj..." name="Search..." />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_login.xml b/indra/newview/skins/default/xui/pl/panel_login.xml
new file mode 100755
index 0000000000..25efd9a5ed
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_login.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_login">
+	<string name="real_url">
+		http://secondlife.com/app/login/
+	</string>
+	<string name="forgot_password_url">
+		http://secondlife.com/account/request.php
+	</string>
+	<text name="first_name_text">
+		Imię:
+	</text>
+	<text name="last_name_text">
+		Nazwisko:
+	</text>
+	<text name="password_text">
+		Hasło:
+	</text>
+	<text name="start_location_text">
+		Miejsce Startu:
+	</text>
+	<combo_box name="start_location_combo">
+		<combo_item name="MyHome">
+			Miejsce Startu
+		</combo_item>
+		<combo_item name="MyLastLocation">
+			Ostatnie Miejsce
+		</combo_item>
+		<combo_item name="Typeregionname">
+			&lt;Wpisz Region&gt;
+		</combo_item>
+	</combo_box>
+	<check_box label="Zapamiętaj Hasło" name="remember_check" />
+	<button label="Połącz" label_selected="PołączWyłącz Program" name="connect_btn" />
+	<text name="create_new_account_text">
+		Otwórz konto
+	</text>
+	<text name="forgot_password_text">
+		Nie pamiętasz hasła?
+	</text>
+	<text name="channel_text">
+		[CHANNEL] [VERSION]
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
new file mode 100755
index 0000000000..68c0ed5ed5
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Czat/IM" name="chat">
+	<text type="string" length="1" name="text_box">
+		Rozmiar Czcionki Czatu:
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item type="string" length="1" name="radio">
+			Mały
+		</radio_item>
+		<radio_item type="string" length="1" name="radio2">
+			Średni
+		</radio_item>
+		<radio_item type="string" length="1" name="radio3">
+			Duży
+		</radio_item>
+	</radio_group>
+	<text type="string" length="1" name="text_box2">
+		Kolor Czatu:
+	</text>
+	<color_swatch label="Ty" name="user" />
+	<color_swatch label="Inni" name="agent" />
+	<color_swatch label="IM" name="im" />
+	<color_swatch label="System" name="system" />
+	<color_swatch label="Błędy" name="script_error" />
+	<color_swatch label="Obiekty" name="objects" />
+	<color_swatch label="Armator" name="owner" />
+	<color_swatch label="Chmurka" name="background" />
+	<color_swatch label="Linki" name="links" />
+	<text type="string" length="1" name="text_box8">
+		Błędy Skryptu:
+	</text>
+	<check_box label="Pokazuj ostrzeżenia i błędy skryptu w czacie"
+	     name="script_errors_as_chat" />
+	<text type="string" length="1" name="text_box3">
+		Konsola Czatu:
+	</text>
+	<spinner label="Zamykaj czat w" name="fade_chat_time" />
+	<text type="string" length="1" name="text_box4">
+		(sekund)
+	</text>
+	<text type="string" length="1" name="text_box5">
+		(linii)
+	</text>
+	<slider label="Przejrzystość" name="console_opacity" />
+	<check_box label="Używaj pełnej szerokość ekranu (restart wymagany)"
+	     name="chat_full_width_check" />
+	<text type="string" length="1" name="text_box6">
+		Ustawienia Czatu:
+	</text>
+	<check_box label="Zamknij panel czatu po naciśnięciu Return"
+	     name="close_chat_on_return_check" />
+	<check_box label="Strzałki sterują awatarem podczas czatu"
+	     name="arrow_keys_move_avatar_check" />
+	<check_box label="Pokazuj czas w czacie" name="show_timestamps_check" />
+	<check_box label="Używaj animacji pisania podczas czatu" name="play_typing_animation" />
+	<text type="string" length="1" name="text_box7">
+		Czat z Chmurkami:
+	</text>
+	<check_box label="Pokazuj chmurki w czacie" name="bubble_text_chat" />
+	<slider label="Przejrzystość" name="bubble_chat_opacity" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
new file mode 100755
index 0000000000..47b7165f01
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Ogólne" name="general_panel">
+	<radio_group name="default_start_location">
+		<radio_item name="MyHome" tool_tip="Domyślnie loguj mnie do mojego miejsca startu.">
+			Miejsce Startu
+		</radio_item>
+		<radio_item name="MyLastLocation" tool_tip="Domyślnie loguj mnie do ostatnio odwiedzonego miejsca.">
+			Ostatnie Miejsce
+		</radio_item>
+	</radio_group>
+	<check_box label="Pokaż Miejsce Startu na Ekranie Logowania" name="show_location_checkbox"/>
+	<combo_box name="fade_out_combobox">
+		<combo_item name="Never">
+			Nigdy
+		</combo_item>
+		<combo_item name="Show Temporarily">
+			Tymczasowo
+		</combo_item>
+		<combo_item name="Always">
+			Zawsze
+		</combo_item>
+	</combo_box>
+	<check_box label="Używaj Małych Imion Awatarów" name="small_avatar_names_checkbox"/>
+	<check_box label="Nie Wyświetlaj Mojego Imienia" name="show_my_name_checkbox"/>
+	<text length="1" name="group_titles_textbox" type="string">
+		Tytuły Grupowe:
+	</text>
+	<check_box label="Nie Wyświetlaj Żadnych Tytułów Grupowych" name="show_all_title_checkbox"/>
+	<check_box label="Nie Wyświetlaj Mojego Tytułu Grupowego" name="show_my_title_checkbox"/>
+	<color_swatch label="" name="effect_color_swatch" tool_tip="Selekcja koloru"/>
+	<text length="1" name="UI Size:" type="string">
+		Wymiar Interfejsu (UI):
+	</text>
+	<slider name="ui_scale_slider"/>
+	<check_box label="Używaj Skali Nizależnej od Rozdzielczości" name="ui_auto_scale"/>
+	<spinner label="Tryb Nieobecności:" name="afk_timeout_spinner"/>
+	<check_box label="Obracaj Mini-Mapę" name="rotate_mini_map_checkbox"/>
+	<check_box label="Powiadamiaj o Wydatkach i Zarobkach (L$)" name="notify_money_change_checkbox"/>
+	<check_box label="Używaj Domyślnej Selekcji Koloru" name="use_system_color_picker_checkbox" tool_tip="Używaj domyślnej / systemowej selekcji koloru"/>
+	<check_box label="Pokaż Wyszukiwarkę" name="show_search_panel" tool_tip="Pokaż wbudowaną wyszukiwarkę"/>
+	<text length="1" name="start_location_textbox" type="string">
+		Miejsce Startu:
+	</text>
+	<text length="1" name="show_names_textbox" type="string">
+		Imiona:
+	</text>
+	<text length="1" name="effects_color_textbox" type="string">
+		Kolor dla Moich Efektów:
+	</text>
+	<text length="1" name="seconds_textbox" type="string">
+		sekund
+	</text>
+	<text length="1" name="crash_report_textbox" type="string">
+		Zgłaszanie Błędów:
+	</text>
+	<text length="1" name="language_textbox" type="string">
+		Język:
+	</text>
+	<text length="1" name="language_textbox2" type="string">
+		(Restart wymagany)
+	</text>
+	<string name="region_name_prompt">
+		&lt;Wpisz Region&gt;
+	</string>
+	<combo_box name="crash_behavior_combobox">
+		<combo_item length="1" name="Askbeforesending" type="string">
+			Pytaj przed wysłaniem
+		</combo_item>
+		<combo_item length="1" name="Alwayssend" type="string">
+			Zawsze wysyłaj
+		</combo_item>
+		<combo_item length="1" name="Neversend" type="string">
+			Nigdy nie wysyłaj
+		</combo_item>
+	</combo_box>
+	<combo_box name="language_combobox">
+		<combo_item length="1" name="System Default Language" type="string">
+			Domyślny
+		</combo_item>
+		<combo_item length="1" name="English" type="string">
+			English (Angielski)
+		</combo_item>
+		<combo_item length="1" name="Chinese" type="string">
+			汉语/漢語 (Chiński) - Beta
+		</combo_item>
+		<combo_item length="1" name="Deutsch(German)" type="string">
+			Deutsch (Niemiecki) - Beta
+		</combo_item>
+		<combo_item length="1" name="French" type="string">
+			Français (Francuski) - Beta
+		</combo_item>
+		<combo_item length="1" name="(Japanese)" type="string">
+			日本語 (Japoński) - Beta
+		</combo_item>
+		<combo_item length="1" name="(Korean)" type="string">
+			한국어 (Koreański) - Beta
+		</combo_item>
+		<combo_item length="1" name="Polish" type="string">
+			Polski - Beta
+		</combo_item>
+		<combo_item length="1" name="Portugese" type="string">
+			Portugués (Portugalski) - Beta
+		</combo_item>
+		<combo_item length="1" name="Spanish" type="string">
+			Español (Hiszpański) - Beta
+		</combo_item>
+	</combo_box>
+	<check_box label="Język znany publicznie" name="language_is_public" tool_tip="Pozwala obiektom w świecie poznać Twój wybór język."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
new file mode 100755
index 0000000000..406fede4a9
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Grafika" name="Display panel">
+	<button label="?" name="GraphicsPreferencesHelpButton" />
+	<check_box label="Uruchom Second Life w oknie" name="windowed mode" />
+	<text_editor type="string" length="1" name="FullScreenInfo">
+		Wyłączone = klient uruchamiany w trybie pełnoekranowym.
+	</text_editor>
+	<text type="string" length="1" name="WindowSizeLabel">
+		Wymiary Okna:
+	</text>
+	<combo_box name="windowsize combo">
+		<combo_item type="string" length="1" name="640x480">
+			640x480
+		</combo_item>
+		<combo_item type="string" length="1" name="800x600">
+			800x600
+		</combo_item>
+		<combo_item type="string" length="1" name="720x480">
+			720x480 (NTSC)
+		</combo_item>
+		<combo_item type="string" length="1" name="768x576">
+			768x576 (PAL)
+		</combo_item>
+		<combo_item type="string" length="1" name="1024x768">
+			1024x768
+		</combo_item>
+	</combo_box>
+	<text type="string" length="1" name="DisplayResLabel">
+		Rozdzielczość:
+	</text>
+	<text type="string" length="1" name="AspectRatioLabel1" tool_tip="width / height">
+		Proporcje:
+	</text>
+	<combo_box name="aspect_ratio" tool_tip="width / height">
+		<combo_item type="string" length="1" name="4:3(StandardCRT)">
+			4:3 (Standardowy CRT)
+		</combo_item>
+		<combo_item type="string" length="1" name="5:4(1280x1024LCD)">
+			5:4 (1280x1024 LCD)
+		</combo_item>
+		<combo_item type="string" length="1" name="8:5(Widescreen)">
+			8:5 (Panoramiczny)
+		</combo_item>
+		<combo_item type="string" length="1" name="16:9(Widescreen)">
+			16:9 (Panoramiczny)
+		</combo_item>
+	</combo_box>
+	<check_box label="Detekcja proporcji" name="aspect_auto_detect" />
+	<text type="string" length="1" name="HigherText">
+		Jakość i
+	</text>
+	<text type="string" length="1" name="QualityText">
+		Prędkość:
+	</text>
+	<text type="string" length="1" name="FasterText">
+		Prędkość
+	</text>
+	<text type="string" length="1" name="ShadersPrefText">
+		Niska
+	</text>
+	<text type="string" length="1" name="ShadersPrefText2">
+		Średnia
+	</text>
+	<text type="string" length="1" name="ShadersPrefText3">
+		Wysoka
+	</text>
+	<text type="string" length="1" name="ShadersPrefText4">
+		Super
+	</text>
+	<text type="string" length="1" name="HigherText2">
+		Wyższa
+	</text>
+	<text type="string" length="1" name="QualityText2">
+		Jakość
+	</text>
+	<slider label="" name="QualityPerformanceSelection" />
+	<check_box label="Zaawansowane" name="CustomSettings" />
+	<text type="string" length="1" name="ShadersText">
+		Shadery:
+	</text>
+	<check_box label="Mapowanie Wypukłości i Połysk" name="BumpShiny" />
+	<check_box label="Podstawowe Shadery" name="BasicShaders"
+	     tool_tip="Wyłączenie tej opcji może naprawić błędy niektórych sterowników graficznych." />
+	<check_box label="Shadery Atmosfery" name="WindLightUseAtmosShaders" />
+	<check_box label="Odbicia w Wodzie" name="Reflections" />
+	<text type="string" length="1" name="ReflectionDetailText">
+		Ustawienia Odbić:
+	</text>
+	<radio_group name="ReflectionDetailRadio">
+		<radio_item type="string" length="1" name="0">
+			Teren i Drzewa
+		</radio_item>
+		<radio_item type="string" length="1" name="1">
+			Obiekty Statyczne
+		</radio_item>
+		<radio_item type="string" length="1" name="2">
+			Awatary i Obiekty
+		</radio_item>
+		<radio_item type="string" length="1" name="3">
+			Wszystko
+		</radio_item>
+	</radio_group>
+	<text type="string" length="1" name="AvatarRenderingText">
+		Prezentacja Awatarów:
+	</text>
+	<check_box label="Fałszywe Awatary" name="AvatarImpostors" />
+	<check_box label="Skinning" name="AvatarVertexProgram" />
+	<check_box label="Ubranie Awatarów" name="AvatarCloth" />
+	<text type="string" length="1" name="DrawDistanceMeterText1">
+		m
+	</text>
+	<text type="string" length="1" name="DrawDistanceMeterText2">
+		m
+	</text>
+	<slider label="Głębia Rysowania:" name="DrawDistance" />
+	<slider label="Liczba Cząsteczek:" name="MaxParticleCount" />
+	<slider label="Jakość Post-Procesu:" name="RenderPostProcess" />
+	<text type="string" length="1" name="MeshDetailText">
+		Szczegóły Meszu:
+	</text>
+	<slider label="  Obiekty:" name="ObjectMeshDetail" />
+	<slider label="  Elastyczne:" name="FlexibleMeshDetail" />
+	<slider label="  Drzewa:" name="TreeMeshDetail" />
+	<slider label="  Awatary:" name="AvatarMeshDetail" />
+	<slider label="  Teren:" name="TerrainMeshDetail" />
+	<slider label="  Niebo:" name="SkyMeshDetail" />
+	<text type="string" length="1" name="PostProcessText">
+		Mało
+	</text>
+	<text type="string" length="1" name="ObjectMeshDetailText">
+		Mało
+	</text>
+	<text type="string" length="1" name="FlexibleMeshDetailText">
+		Mało
+	</text>
+	<text type="string" length="1" name="TreeMeshDetailText">
+		Mało
+	</text>
+	<text type="string" length="1" name="AvatarMeshDetailText">
+		Mało
+	</text>
+	<text type="string" length="1" name="TerrainMeshDetailText">
+		Mało
+	</text>
+	<text type="string" length="1" name="SkyMeshDetailText">
+		Mało
+	</text>
+	<text type="string" length="1" name="LightingDetailText">
+		Ustawienia Światła:
+	</text>
+	<radio_group name="LightingDetailRadio">
+		<radio_item type="string" length="1" name="SunMoon">
+			Tylko Słońce i Księżyc
+		</radio_item>
+		<radio_item type="string" length="1" name="LocalLights">
+			Tylko Bliskie Światła
+		</radio_item>
+	</radio_group>
+	<text type="string" length="1" name="TerrainDetailText">
+		Szczgóły Terenu:
+	</text>
+	<radio_group name="TerrainDetailRadio">
+		<radio_item type="string" length="1" name="0">
+			Mało
+		</radio_item>
+		<radio_item type="string" length="1" name="2">
+			Dużo
+		</radio_item>
+	</radio_group>
+	<button label="Ustawienia Domyślne" name="Defaults" />
+	<button label="Ustawnia Sprzętowe" label_selected="Ustawienia Sprzętowe"
+	     name="GraphicsHardwareButton" />
+	<string name="resolution_format">
+		[RES_X] x [RES_Y]
+	</string>
+	<string name="aspect_ratio_text">
+		[NUM]:[DEN]
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml
new file mode 100755
index 0000000000..21611ed6c0
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Umowa" name="Covenant">
+	<text name="covenant_help_text">
+		Zmiany w Umowie odnoszą się do wszystkich Posiadłości w Majątku.
+	</text>
+	<text name="region_name_lbl">
+		Region:
+	</text>
+	<text name="region_name_text">
+		(bark danych)
+	</text>
+	<text name="estate_name_lbl">
+		Majątek:
+	</text>
+	<text name="estate_name_text">
+		(brak danych)
+	</text>
+	<text name="estate_owner_lbl">
+		Właściciel Majątku:
+	</text>
+	<text name="estate_owner_text">
+		(brak danych)
+	</text>
+	<text name="resellable_clause">
+		Posiadłości kupione w tym Regionie mogą lub nie być odsprzedawane.
+	</text>
+	<text name="changeable_clause">
+		Posiadłości kupione w tym Regionie mogą lub nie być łączone lub dzielone.
+	</text>
+	<text name="covenent_instructions">
+		Przeciągnij i upuść notkę żeby zmienić Umowę dla tego Majątku.
+	</text>
+	<text_editor name="covenant_editor">
+		Ładowanie...
+	</text_editor>
+	<button label="Wyresetuj" name="reset_covenant" />
+	<string name="can_resell">
+		Posiadłości kupione w tym Regionie mogą być odsprzedane.
+	</string>
+	<string name="can_not_resell">
+		Posiadłości kupione w tym Regionie nie mogą być odsprzedane.
+	</string>
+	<string name="can_change">
+		Posiadłości kupione w tym Regionie mogą być łączone i dzielone.
+	</string>
+	<string name="can_not_change">
+		Posiadłości kupione w tym Regionie nie mogą być łączone i dzielone.
+	</string>
+	<button label="?" name="covenant_help" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_debug.xml b/indra/newview/skins/default/xui/pl/panel_region_debug.xml
new file mode 100755
index 0000000000..0dabd2a00c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_region_debug.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Analizy" name="Debug">
+	<text name="region_text_lbl">
+		Region:
+	</text>
+	<text name="region_text">
+		brak danych
+	</text>
+	<check_box label="Zablokuj Skrypty" name="disable_scripts_check" tool_tip="Zablokuj wszystkie skrypty w tym Regionie"/>
+	<button label="?" name="disable_scripts_help"/>
+	<check_box label="Zablokuj Kolizje" name="disable_collisions_check" tool_tip="Zablokuj kolizje obiektów (nie Awatarów) w tym Regionie"/>
+	<button label="?" name="disable_collisions_help"/>
+	<check_box label="Zablokuj Fizykę" name="disable_physics_check" tool_tip="Zablokuj wpływ fizyki w tym Regionie"/>
+	<button label="?" name="disable_physics_help"/>
+	<button label="Zastosuj" name="apply_btn"/>
+	<text name="objret_text_lbl">
+		Zwrot Obiektu
+	</text>
+	<text name="resident_text_lbl">
+		Rezydent:
+	</text>
+	<line_editor name="target_avatar_name">
+		(brak)
+	</line_editor>
+	<button label="Wybierz..." name="choose_avatar_btn"/>
+	<text name="options_text_lbl">
+		Opcje:
+	</text>
+	<check_box label="Odeślij wyłącznie obiekty ze skryptami" name="return_scripts" tool_tip="Odeślij wyłącznie obiekty ze skryptami."/>
+	<check_box label="Odeślij wyłącznie obiekty które są na posiadłościach innych osób" name="return_other_land" tool_tip="Odeślij wyłącznie obiekty które są na posiadłościach innych osób"/>
+	<check_box label="Odeślij obiekty z wszystkich regionów w tym majątku" name="return_estate_wide" tool_tip="Odeślij obiekty z wszystkich regionów w tym majątku"/>
+	<button label="Odeślij" name="return_btn"/>
+	<button label="Znajdź Glówne Kolizje..." name="top_colliders_btn" tool_tip="Lista obiektów doświadczających najwięcej potencjalnych kolizji"/>
+	<button label="?" name="top_colliders_help"/>
+	<button label="Główne Skrypty..." name="top_scripts_btn" tool_tip="Lista obiektów najdłużej wykonujących skrypty"/>
+	<button label="?" name="top_scripts_help"/>
+	<button label="Restart Regionu" name="restart_btn" tool_tip="Odliczanie i restart Regionu za dwie minuty"/>
+	<button label="?" name="restart_help"/>
+	<button label="Opóźnij Restart" name="cancel_restart_btn" tool_tip="Opóźnij restart Regionu o godzinę"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_estate.xml b/indra/newview/skins/default/xui/pl/panel_region_estate.xml
new file mode 100755
index 0000000000..5ef94baaa5
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_region_estate.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Majątek" name="Estate">
+	<text name="estate_help_text">
+		Zmiany ustawień na tej zakładce odnoszą się
+do wszystkich Regionów w tym Majątku.
+	</text>
+	<text name="estate_text">
+		Majątek:
+	</text>
+	<text name="estate_name">
+		(brak danych)
+	</text>
+	<text name="owner_text">
+		Właściciel:
+	</text>
+	<text name="estate_owner">
+		(brak danych)
+	</text>
+	<check_box label="Używaj Czasu Światowego" name="use_global_time_check"/>
+	<button label="?" name="use_global_time_help"/>
+	<check_box label="Stałe Słońce" name="fixed_sun_check"/>
+	<button label="?" name="fixed_sun_help"/>
+	<slider label="Pora Doby" name="sun_hour_slider"/>
+	<check_box label="Dostęp Publiczny" name="externally_visible_check"/>
+	<button label="?" name="externally_visible_help"/>
+	<text length="1" name="Only Allow" type="string">
+		Dostęp Ograniczony do:
+	</text>
+	<check_box label="Rezydenci z danymi o koncie" name="limit_payment" tool_tip="Zablokuj niepożądanych Rezydentów."/>
+	<check_box label="Dorośli ze sprawdzonym wiekiem" name="limit_age_verified" tool_tip="Zablokuj Rezydentów którzy nie zweryfikowali swojego wieku. Dodatkowe informacje pod support.secondlife.com."/>
+	<check_box label="Rozmowy Dozwolone" name="voice_chat_check"/>
+	<button label="?" name="voice_chat_help"/>
+	<check_box label="Teleportacja Dozwolona" name="allow_direct_teleport"/>
+	<button label="?" name="allow_direct_teleport_help"/>
+	<text name="abuse_email_text">
+		Email reporty o nadużyciach do:
+	</text>
+	<line_editor name="abuse_email_address"/>
+	<string name="email_unsupported">
+		Opcja niedostępna
+	</string>
+	<button label="?" name="abuse_email_address_help"/>
+	<button label="Zastosuj" name="apply_btn"/>
+	<button label="Wyrzuć Awatara z Majątku..." name="kick_user_from_estate_btn"/>
+	<button label="Wyślij Wiadomość do Majątku..." name="message_estate_btn"/>
+	<text name="estate_manager_label">
+		Zarządcy Majątku:
+	</text>
+	<button label="?" name="estate_manager_help"/>
+	<name_list name="estate_manager_name_list"/>
+	<button label="Usuń..." name="remove_estate_manager_btn"/>
+	<button label="Dodaj..." name="add_estate_manager_btn"/>
+	<text name="allow_resident_label">
+		Dozwoleni Rezydenci:
+	</text>
+	<button label="?" name="allow_resident_help"/>
+	<name_list name="allowed_avatar_name_list"/>
+	<button label="Usuń..." name="remove_allowed_avatar_btn"/>
+	<button label="Dodaj..." name="add_allowed_avatar_btn"/>
+	<text name="allow_group_label">
+		Dozwolone Grupy:
+	</text>
+	<button label="?" name="allow_group_help"/>
+	<name_list name="allowed_group_name_list"/>
+	<button label="Usuń..." name="remove_allowed_group_btn"/>
+	<button label="Dodaj..." name="add_allowed_group_btn"/>
+	<text name="ban_resident_label">
+		Zablokowani Rezydenci (bany):
+	</text>
+	<button label="?" name="ban_resident_help"/>
+	<name_list name="banned_avatar_name_list"/>
+	<button label="Usuń..." name="remove_banned_avatar_btn"/>
+	<button label="Dodaj..." name="add_banned_avatar_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_general.xml b/indra/newview/skins/default/xui/pl/panel_region_general.xml
new file mode 100755
index 0000000000..5aee067f0b
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_region_general.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Region" name="General">
+	<text name="region_text_lbl">
+		Region:
+	</text>
+	<text name="region_text">
+		brak danych
+	</text>
+	<text name="version_channel_text_lbl">
+		Wersja:
+	</text>
+	<text name="version_channel_text">
+		brak danych
+	</text>
+	<check_box label="Zablokuj Zmiany Terenu" name="block_terraform_check" />
+	<button label="?" name="terraform_help" />
+	<check_box label="Zablokuj Latanie" name="block_fly_check" />
+	<button label="?" name="fly_help" />
+	<check_box label="Uszkodzenia Dozwolone" name="allow_damage_check" />
+	<button label="?" name="damage_help" />
+	<check_box label="Zablokuj Popychanie" name="restrict_pushobject" />
+	<button label="?" name="restrict_pushobject_help" />
+	<check_box label="Odsprzedaż Dozwolona" name="allow_land_resell_check" />
+	<button label="?" name="land_resell_help" />
+	<check_box label="Łączenie/Dzielenie Dozwolone" name="allow_parcel_changes_check" />
+	<button label="?" name="parcel_changes_help" />
+	<check_box label="Zablokuj Wyszukiwanie" name="block_parcel_search_check"
+	     tool_tip="Pozwól na wyświetlanie nazwy regionu i posiadłości w wynikach wyszukiwania" />
+	<button label="?" name="parcel_search_help" />
+	<spinner label="Limit Gości" name="agent_limit_spin" />
+	<button label="?" name="agent_limit_help" />
+	<spinner label="Ekstra Obiekty" name="object_bonus_spin" />
+	<button label="?" name="object_bonus_help" />
+	<text label="Ograniczenia Wieku" name="access_text">
+		Dozwolony:
+	</text>
+	<combo_box label="Wiek" name="access_combo">
+		<combo_item name="PG">
+			BO
+		</combo_item>
+		<combo_item name="Mature">
+			18+
+		</combo_item>
+	</combo_box>
+	<button label="?" name="access_help" />
+	<button label="Zastosuj" name="apply_btn" />
+	<button label="Wyrzuć Awatara..." name="kick_btn" />
+	<button label="Wyrzuć Wszystkich..." name="kick_all_btn" />
+	<button label="Wyślij Wiadomość do Regionu..." name="im_btn" />
+	<button label="Obsługa Teleportera..." name="manage_telehub_btn" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml
new file mode 100755
index 0000000000..400d703670
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Teren" name="Terrain">
+	<text name="region_text_lbl">
+		Region:
+	</text>
+	<text name="region_text">
+		brak danych
+	</text>
+	<spinner label="Poziom Wody" name="water_height_spin" />
+	<button label="?" name="water_height_help" />
+	<spinner label="Górny Limit Terenu" name="terrain_raise_spin" />
+	<button label="?" name="terrain_raise_help" />
+	<spinner label="Dolny Limit Terenu" name="terrain_lower_spin" />
+	<button label="?" name="terrain_lower_help" />
+	<check_box label="Używaj Słońca Majątku" name="use_estate_sun_check" />
+	<button label="?" name="use_estate_sun_help" />
+	<check_box label="Stałe Słońce" name="fixed_sun_check" />
+	<button label="?" name="fixed_sun_help" />
+	<slider label="Pora Doby" name="sun_hour_slider" />
+	<button label="Zastosuj" name="apply_btn" />
+	<button label="Załaduj Surowy Teren..." name="download_raw_btn"
+	     tool_tip="Dostępne tylko dla Właścicieli Majątku, nie dla Zarządców" />
+	<button label="?" name="download_raw_help" />
+	<button label="Zapisz Surowy Teren..." name="upload_raw_btn"
+	     tool_tip="Dostępne tylko dla Właścicieli Majątku, nie dla Zarządców" />
+	<button label="?" name="upload_raw_help" />
+	<button label="Ustal Teren" name="bake_terrain_btn"
+	     tool_tip="Zapamiętaj obecny teren jako punkt odniesienia dla limitów podnoszenia i opuszczania" />
+	<button label="?" name="bake_terrain_help" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_texture.xml b/indra/newview/skins/default/xui/pl/panel_region_texture.xml
new file mode 100755
index 0000000000..d24579fc75
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_region_texture.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Tekstury Gruntu" name="Textures">
+	<text name="region_text_lbl">
+		Region:
+	</text>
+	<text name="region_text">
+		brak danych
+	</text>
+	<text name="detail_texture_text">
+		Tekstury Terenu (24-bitowe 512x512 pliki .tga wymagane)
+	</text>
+	<text name="height_text_lbl">
+		1 (Dół)
+	</text>
+	<text name="height_text_lbl2">
+		2
+	</text>
+	<text name="height_text_lbl3">
+		3
+	</text>
+	<text name="height_text_lbl4">
+		4 (Góra)
+	</text>
+	<text name="height_text_lbl5">
+		Zakres Poziomów dla Tekstury
+	</text>
+	<text name="height_text_lbl6">
+		Południe-Zachód
+	</text>
+	<text name="height_text_lbl7">
+		Północ-Zachód
+	</text>
+	<text name="height_text_lbl8">
+		Południe-Wschód
+	</text>
+	<text name="height_text_lbl9">
+		Północ-Wschód
+	</text>
+	<spinner label="Dół" name="height_start_spin_0" />
+	<spinner label="Dół" name="height_start_spin_1" />
+	<spinner label="Dół" name="height_start_spin_2" />
+	<spinner label="Dół" name="height_start_spin_3" />
+	<spinner label="Góra" name="height_range_spin_0" />
+	<spinner label="Góra" name="height_range_spin_1" />
+	<spinner label="Góra" name="height_range_spin_2" />
+	<spinner label="Góra" name="height_range_spin_3" />
+	<text name="height_text_lbl10">
+		Wartości reprezentują zakresy zlewania powyższych tekstur.
+	</text>
+	<text name="height_text_lbl11">
+		Wartość DÓŁ, wyrażona w metrach, to MAKSYMALNY poziom dla tekstury #1,
+	</text>
+	<text name="height_text_lbl12">
+		a wartość GÓRA to MINIMALNY poziom dla tekstury #4.
+	</text>
+	<button label="Zastosuj" name="apply_btn" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml b/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml
new file mode 100755
index 0000000000..f057c824ac
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="LLScrollingPanelParam">
+	<text type="string" length="1" name="Loading...">
+		Ładowanie...
+	</text>
+	<text type="string" length="1" name="Loading...2">
+		Ładowanie...
+	</text>
+	<button label="" label_selected="" name="less" />
+	<button label="" label_selected="" name="more" />
+	<slider label="[DESC]" name="param slider" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_status_bar.xml b/indra/newview/skins/default/xui/pl/panel_status_bar.xml
new file mode 100755
index 0000000000..7c6c7ab90f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_status_bar.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="status">
+	<text type="string" length="1" name="ParcelNameText"
+	     tool_tip="Nazwa posiadłości w której się znajdujesz. Po więcej informacji kliknij O Posiadłości.">
+		nazwa posiadłości
+	</text>
+	<text type="string" length="1" name="BalanceText" tool_tip="Stan Konta">
+		Ładowanie...
+	</text>
+	<button label="" label_selected="" name="buycurrency" tool_tip="Kup $L" />
+	<text type="string" length="12" name="TimeText" tool_tip="Obecny Czas (Pacyficzny)">
+		12:00 AM
+	</text>
+	<string name="StatBarDaysOfWeek">
+		Niedziela:Poniedziałek:Wtorek:Środa:Czwartek:Piątek:Sobota
+	</string>
+	<string name="StatBarMonthsOfYear">
+		Styczeń:Luty:Marzec:Kwiecień:Maj:Czerwiec:Lipiec:Serpień:Wrzesień:Październik:Listopad:Grudzień
+	</string>
+	<button label="" label_selected="" name="scriptout"
+	     tool_tip="Ostrzeżenia i Błędy Skryptów" />
+	<button label="" label_selected="" name="health" tool_tip="Zdrowie" />
+	<text type="string" length="1" name="HealthText" tool_tip="Health">
+		100%
+	</text>
+	<button label="" label_selected="" name="no_fly" tool_tip="Latanie niedozwolone" />
+	<button label="" label_selected="" name="no_build" tool_tip="Budowanie niedozwolone" />
+	<button label="" label_selected="" name="no_scripts" tool_tip="Scripts not allowed" />
+	<button label="" label_selected="" name="restrictpush"
+	     tool_tip="Popychanie niedozwolone" />
+	<button label="" label_selected="" name="status_no_voice"
+	     tool_tip="Rozmowy niedowolone" />
+	<button label="" label_selected="" name="buyland" tool_tip="Kup tą posiadłość" />
+	<button label="" name="menubar_search_bevel_bg" />
+	<line_editor label="Szukaj" name="search_editor" tool_tip="Przeszukaj Second Life" />
+	<button label="" label_selected="" name="search_btn" tool_tip="Przeszukaj Second Life" />
+	<string name="packet_loss_tooltip">
+		Utracone Pakiety
+	</string>
+	<string name="bandwidth_tooltip">
+		Przepustowość
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/role_actions.xml b/indra/newview/skins/default/xui/pl/role_actions.xml
new file mode 100755
index 0000000000..259119ba25
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/role_actions.xml
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<role_actions>
+	<action_set
+	     description="Przywileje pozwajające na dodawanie i usuwanie Członków oraz pozwalają nowym Członkom na dodawanie się bez zaproszenia."
+	     name="Membership">
+		<action description="Zapraszanie do Grupy"
+		     longdescription="Zapraszanie nowych Ludzi do Grupy używając &apos;Zaproś Nową Osobę...&apos; pod Członkowie &gt; Członkowie."
+		     name="member invite" />
+		<action description="Usuwanie z Grupy"
+		     longdescription="Usuwanie Członków z Grupy używając &apos;Usuń z Grupy&apos; pod Członkowie &gt; Członkowie. Właściciel może usunąć każdego za wyjątkiem innego Właściciela. Jeżeli nie jesteś Właścicielem możesz tylko usuwać Członków w Funkcji Każdy i tylko wtedy kiedy nie mają żadnej innej Funkcji. Aby odebrać Członkowi Funkcję musisz mieć Przywilej &apos;Odbieranie Funkcji&apos;."
+		     name="member eject" />
+		<action
+		     description="Selekcja opcji &apos;Wolne Zapisy&apos; i wybór &apos;Opłaty Wstępnej&apos;"
+		     longdescription="Selekcja opcji &apos;Wolne Zapisy&apos; (pozwola nowym Członkom na dodawanie sie bez zaproszenia) i wybiór &apos;Opłaty Wstępnej&apos; w Ustawieniach Grupy w sekcji Ogólne."
+		     name="member options" />
+	</action_set>
+	<action_set
+	     description="Przywileje pozwalające na dodawanie, usuwanie i edycję Funkcji w Grupie, oraz na nadawanie i odbieranie Funkcji, oraz na przypisywanie Przywilejów do Funkcji."
+	     name="Roles">
+		<action description="Dodawanie Funkcji"
+		     longdescription="Dodawanie nowych Funkcji pod Członkowie &gt; Funkcje."
+		     name="role create" />
+		<action description="Usuwanie Funkcji"
+		     longdescription="Usuwanie Funkcji pod Członkowie &gt; Funkcje."
+		     name="role delete" />
+		<action description="Zmiany nazw Funkcji, Tytułów i Opisów"
+		     longdescription="Zmiany nazw Funkcji, Tytułów i Opisów w dolnej części Członkowie &gt; Funkcje po wybraniu Funkcje."
+		     name="role properties" />
+		<action description="Przypisywanie Członków do posiadanych Funkcji"
+		     longdescription="Przypisywanie Członków do Funkcji w sekcji Przypisane Funkcje pod Członkowie &gt; Członkowie. Członek z tym Przywilejem może dodawać Członków do Funkcji które sam już posiada."
+		     name="role assign member limited" />
+		<action description="Przypisywanie Członków do wszystkich Funkcji"
+		     longdescription="Przypisywanie Członków do wszystkich Funkcji w sekcji Przypisane Funkcje pod Członkowie &gt; Członkowie. *UWAGA* Członek w Funkcji z tym Przywilejem może przypisać siebie i innych Członków nie będących Właścicielami do Funkcji dających więcej Przywilejów niż posiadane obecnie potencjalnie dające możliwości zbliżone do możliwości Właściciela. Udzielaj tego Przywileju z rozwagą."
+		     name="role assign member" />
+		<action description="Odbieranie Funkcji"
+		     longdescription="Odbieranie Funkcji w sekcji Przypisane Funkcje pod Członkowie &gt; Członkowie. Funkcja Właściciela nie może być odebrana."
+		     name="role remove member" />
+		<action description="Dodawanie i Usuwanie Przywilejów z Funkcji"
+		     longdescription="Dodawanie i Usuwanie Przywilejów z Funkcji w sekcji Przwileje pod Członkowie &gt; Funkcje. *UWAGA* Członek w Funkcji z tym Przywilejem może przypisać sobie i innychm Członkom nie będącym Właścicielami wszystkie Przywileje potencjalnie dające możliwości zbliżone do możliwości Właściciela. Udzielaj tego Przywileju z rozwagą."
+		     name="role change actions" />
+	</action_set>
+	<action_set
+	     description="Przywileje pozwalające na edycję atrybutów Grupy takich jak widoczność w wyszukiwarce, status i insygnia."
+	     name="Group Identity">
+		<action
+		     description="Zmiany Statusu Grupy, Insygniów, &apos;Widoczność w Wyszukiwarce&apos; i widoczność Członków w Informacjach o Grupie."
+		     longdescription="Zmiany Statusu Grupy, Insygniów, &apos;Widoczność w Wyszukiwarce&apos; i widoczność Członków w Informacjach o Grupie. Dostęp poprzez ustawienia Ogólne."
+		     name="group change identity" />
+	</action_set>
+	<action_set
+	     description="Przywileje pozwalające na przypisywanie, modyfikacje i sprzedaż Posiadłości Grupy. Aby zobaczyć okno O Posiadlości wybierz grunt prawym klawiszem myszki i wybierz &apos;O Posiadlości&apos; albo wybierz O Posiadłości w głównym menu."
+	     name="Parcel Management">
+		<action description="Przypisywanie i kupowanie Posiadłości dla Grupy"
+		     longdescription="Przypisywanie i kupowanie Posiadłości dla Grupy. Dostęp poprzez O Posiadlości &gt; ustawienia Ogólne."
+		     name="land deed" />
+		<action description="Oddawanie Posiadłości do Linden Labs"
+		     longdescription="Oddawanie Posiadłości do Linden Labs. *UWAGA* Członek w Funcji z tym Przywilejem może porzucać Posiadlości Grupy poprzez O Posiadlości &gt; ustawienia Ogólne oddając Posiadłości za darmo do Linden Labs! Udzielaj tego Przywileju z rozwagą."
+		     name="land release" />
+		<action description="Sprzedaż Posiadłości"
+		     longdescription="Sprzedaż Posiadłości. *UWAGA* Członek w Funcji z tym Przywilejem może sprzedawać Posiadlości Grupy poprzez O Posiadlości &gt; ustawienia Ogólne! Udzielaj tego Przywileju z rozwagą."
+		     name="land set sale info" />
+		<action description="Podział i Łączenie Posiadłości"
+		     longdescription="Podział i Łączenie Posiadłości. Dostęp poprzez wybranie gruntu prawym klawiszem myszki, &apos;Edycja Terenu&apos;, i przesuwanie myszką po gruncie wybierając obszar. Aby podzielić wybierz obszar i naciśnij &apos;Podziel...&apos;. Aby połączyć wybierz dwie albo więcej sąsiadujące Posiadłości i naciśnij &apos;Połącz...&apos;."
+		     name="land divide join" />
+	</action_set>
+	<action_set
+	     description="Przywileje pozwalające na zmianę nazwy Posiadłości, widoczność w wyszukiwarce, widoczność w wyszukiwarce, wybór miejsce lądowania i zmianę ustawień teleportacji (TP)."
+	     name="Parcel Identity">
+		<action
+		     description="Selekcja opcji &apos;Pokazuj w szukaniu miejsc&apos; i wybór kategorii"
+		     longdescription="Selekcja opcji &apos;Pokazuj w szukaniu miejsc&apos; i wybór kategorii Posiadłości pod O Posiadłości &gt; Opcje."
+		     name="land find places" />
+		<action
+		     description="Zmiany nazwy Posiadłości, opisu i selekcja &apos;Widoczność w Wyszukiwarce&apos;"
+		     longdescription="Zmiany nazwy Posiadłości, opisu i selekcja &apos;Widoczność w Wyszukiwarce&apos;. Dostęp poprzez O Posiadłości &gt; Opcje."
+		     name="land change identity" />
+		<action description="Wybór miejsca lądowania i ustawienia teleportacji (TP)"
+		     longdescription="Na Posiadłości Grupy Członek w Funcji z tym Przywilejem może wybrać miejsce gdzie teleportujące się osoby będą ladować oraz może ustalić dodatkowe parametry teleportacji (TP).  Dostęp poprzez O Posiadłości &gt; Opcje."
+		     name="land set landing point" />
+	</action_set>
+	<action_set
+	     description="Przywileje pozwalające na zmianę opcji Posiadłości takich jak &apos;Tworzenie Obiektów&apos;, &apos;Edycja Terenu&apos; i zmianę ustawień muzyki &amp; mediów."
+	     name="Parcel Settings">
+		<action description="Zmiany ustawień muzyki &amp; mediów"
+		     longdescription="Zmiany ustawień muzyki &amp; mediów pod O Posiadłości &gt; Media."
+		     name="land change media" />
+		<action description="Selekcja opcji &apos;Edycja Terenu&apos;"
+		     longdescription="Selekcja opcji &apos;Edycja Terenu&apos;. *UWAGA* O Posiadłości &gt; Opcje &gt; Edycja Terenu pozwala każdemu na formowanie gruntów Twojej Posiadłości oraz na przemieszczanie roślin z Linden Labs. Udzielaj tego Przywileju z rozwagą. Selekcja opcji Edycji Terenu jest dostępna poprzez O Posiadłości &gt; Opcje."
+		     name="land edit" />
+		<action description="Dodatkowe ustawienia O Posiadłości &gt; Opcje"
+		     longdescription="Selekcja opcji &apos;Bezpieczeństwo (brak uszkodzeń)&apos;, &apos;Latanie&apos;, opcje dla innych Rezydentów: &apos;Tworzenie Obiektów&apos;, &apos;Edycja Terenu&apos;, &apos;Zapamiętywanie Miejsca (LM)&apos;, &apos;Skrypty&apos; na Posiadłościach Grupy pod O Posiadłości &gt; Opcje."
+		     name="land options" />
+	</action_set>
+	<action_set
+	     description="Przywileje pozwalające Członkom na omijanie ograniczeń na Posiadłościach Grupy."
+	     name="Parcel Powers">
+		<action description="Pozwól na Edycję Terenu"
+		     longdescription="Członkowie w Funcji z tym Przywilejem mogą zawsze edytować teren na Posiadłościach Grupy."
+		     name="land allow edit land" />
+		<action description="Pozwól na Latanie"
+		     longdescription="Członkowie w Funcji z tym Przywilejem mogą zawsze latać na Posiadłościach Grupy."
+		     name="land allow fly" />
+		<action description="Pozwól na Tworzenie Obiektów"
+		     longdescription="Członkowie w Funcji z tym Przywilejem mogą zawsze tworzyć obiekty na Posiadłościach Grupy."
+		     name="land allow create" />
+		<action description="Pozwól na Zapamiętywanie Miejsc (LM)"
+		     longdescription="Członkowie w Funcji z tym Przywilejem mogą zawsze zapamiętywać miejsca (LM) na Posiadłościach Grupy."
+		     name="land allow landmark" />
+		<action description="Pozwól na wybór Mijsca Startu na Posiadłościach Grupy"
+		     longdescription="Członkowie w Funcji z tym Przywilejem mogą zawsze wybrać Miejsce Startu na Posiadłościach Grupy.."
+		     name="land allow set home" />
+	</action_set>
+	<action_set
+	     description="Przywileje pozwalające na dawanie i odbieranie dostępu do Posiadłości Grupy zawierające możliwości unieruchomiania i wyrzucania Rezydentów."
+	     name="Parcel Access">
+		<action description="Zarządzanie Listą Dostępu do Posiadłości"
+		     longdescription="Zarządzanie Listą Dostępu do Posiadłości pod O Posiadłości &gt; Dostęp."
+		     name="land manage allowed" />
+		<action description="Zarządzanie Listą Usuniętych z Posiadłości (Bany)"
+		     longdescription="Zarządzanie Listą Usuniętych z Posiadłości (Bany) pod O Posiadlości &gt; Usuwanie."
+		     name="land manage banned" />
+		<action description="Selekcja opcji &apos;Wstęp Płatny...&apos;"
+		     longdescription="Selekcja opcji &apos;Wstęp Płatny...&apos; pod O Posiadłości &gt; Dostęp."
+		     name="land manage passes" />
+		<action description="Wyrzucanie i unieruchamianie Rezydentów na Posiadłościach"
+		     longdescription="Członkowie w Funcji z tym Przywilejem mogą wpływać na niepożadanych na Posiadłościach Grupy Rezydentów wybierając ich prawym klawiszem myszki i wybierając Więcej &gt; &apos;Wyrzuć...&apos; albo &apos;Unieruchom...&apos;."
+		     name="land admin" />
+	</action_set>
+	<action_set
+	     description="Przywileje pozwalające na odsyłanie obiektów i przemiszczanie roślin z Linden Labs. Użyteczne przy porządkowaniu i przemieszczaniu roślinności. *UWAGA* Odsyłanie obiektów jest nieodwracalne."
+	     name="Parcel Content">
+		<action description="Odsyłanie obiektów należących do Grupy"
+		     longdescription="Odsyłanie obiektów należących do Grupy pod O Posiadłości &gt; Obiekty."
+		     name="land return group owned" />
+		<action description="Odsyłanie obiektów przypisanych do Grupy"
+		     longdescription="Odsyłanie obiektów przypisanych do Grupy pod O Posiadłości &gt; Obiekty."
+		     name="land return group set" />
+		<action description="Odsyłanie obiektów nie przypisanych do Grupy"
+		     longdescription="Odsyłanie obiektów nie przypisanych do Grupy pod O Posiadłości &gt; Obiekty."
+		     name="land return non group" />
+		<action description="Ogrodnictwo używając roślin z Linden Labs"
+		     longdescription="Ogrodnictwo pozwala na umiszczanie i przemiszczanie drzew, roślin i trawy z Linden Labs. Te obiekty znajdują się w Twoim Inwentarzu pod Zbiór &gt; Obiekty, mogą też być stworzone używając przycisku Buduj."
+		     name="land gardening" />
+	</action_set>
+	<action_set
+	     description="Przywileje pozwalające na przypisywanie, modyfikacje i sprzedaż obiektów należących do Grupy. Dostęp poprzez Narzędzia Edycji &gt; Ogólne. Wybierz obiekt prawym klawiszem myszki i wybierz Edycja żeby zobaczyć ustawienia."
+	     name="Object Management">
+		<action description="Przypisywanie obiektów do Grupy"
+		     longdescription="Przypisywanie obiektów do Grupy pod Narzędzia Edycji &gt; Ogólne."
+		     name="object deed" />
+		<action
+		     description="Manipulowanie (wklejanie, kopiowanie, modyfikacja) obiektami należącymi do Grupy"
+		     longdescription="Manipulowanie (wklejanie, kopiowanie, modyfikacja) obiektami należącymi do Grupy pod Narzędzia Edycji &gt; Ogólne."
+		     name="object manipulate" />
+		<action description="Sprzedaż obiektów należących do Grupy"
+		     longdescription="Sprzedaż obiektów należących do Grupy pod Narzędzia Edycji &gt; Ogólne."
+		     name="object set sale" />
+	</action_set>
+	<action_set
+	     description="Przywileje pozwalające na wybór opłat grupowych, otrzymywanie dochodu i ograniczanie dostępu do historii konta grupy."
+	     name="Accounting">
+		<action description="Opłaty grupowe i dochód grupowy"
+		     longdescription="Członkowie w Funcji z tym Przywilejem będą automatycznie wnosić opłaty grupowe i będą otrzymywać dochód grupowy. Tzn. będą codziennie otrzymywać część dochodu ze sprzedaży Posiadłości Grupy oraz będą partycypować w kosztach ogłoszeń itp."
+		     name="accounting accountable" />
+	</action_set>
+	<action_set
+	     description="Przywileje pozwalające na wysyłanie, odbieranie i czytanie Notek Grupy."
+	     name="Notices">
+		<action description="Wysyłanie Notek"
+		     longdescription="Członkowie w Funcji z tym Przywilejem mogą wysyłać Notki pod O Grupie &gt; Notki."
+		     name="notices send" />
+		<action description="Odbieranie Notek i dostęp do dawniejszych Notek"
+		     longdescription="Członkowie w Funcji z tym Przywilejem mogą odbierać nowe i czytać dawniejsze Notki pod O Grupie &gt; Notki."
+		     name="notices receive" />
+	</action_set>
+	<action_set
+	     description="Przywileje pozwalające na zgłaszanie Propozycji, głosowanie nad Propozycjami i śledzenie historii głosowania."
+	     name="Proposals">
+		<action description="Zgłaszanie Propozycji"
+		     longdescription="Członkowie w Funcji z tym Przywilejem mogą zgłaszać Propozycje pod głosowanie pod O Grupie &gt; Propozycje."
+		     name="proposal start" />
+		<action description="Głosowanie nad Propozycjami"
+		     longdescription="Członkowie w Funcji z tym Przywilejem mogą głosować nad Propozycjami pod O Grupie &gt; Propozycje."
+		     name="proposal vote" />
+	</action_set>
+	<action_set description="Przywileje kontrolujące czat i rozmowy grupowe." name="Chat">
+		<action description="Dostęp do Czatu Grupowego"
+		     longdescription="Członkowie w Funcji z tym Przywilejem mogą uczestniczyć w czcie i rozmowach grupowych."
+		     name="join group chat" />
+		<action description="Dostęp do Rozmów Grupowych"
+		     longdescription="Członkowie w Funcji z tym Przywilejem mogą uczestniczyć w rozmowach grupowych. UWAGA: Dostęp do Czatu Grupowego jest wymagany dla rozmów grupowych."
+		     name="join voice chat" />
+		<action description="Moderator Czatu Grupowego"
+		     longdescription="Członkowie w Funcji z tym Przywilejem mogą kontrolować dostęp do czatu i rozmów grupowych."
+		     name="moderate group chat" />
+	</action_set>
+</role_actions>
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
new file mode 100755
index 0000000000..1fd7db384c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+	<!-- Login -->
+	<string name="LoginInProgress">
+		Trwa logowanie. [APP_NAME] Proszę czekać.
+	</string>
+	<string name="LoginAuthenticating">
+		Autoryzacja
+	</string>
+	<string name="LoginMaintenance">
+		W trakcie obslugi konta...
+	</string>
+	<string name="LoginAttempt">
+		Poprzednie logowanie nie udalo się. Logowanie, próba numer [NUMBER]
+	</string>
+	<string name="LoginPrecaching">
+		Ładowanie świata...
+	</string>
+	<string name="LoginInitializingBrowser">
+		Inicjalizacja Przeglądarki Internetu...
+	</string>
+	<string name="LoginInitializingMultimedia">
+		Inicjalizacja multimediów...
+	</string>
+	<string name="LoginVerifyingCache">
+		Weryfikacja plików z bazy danych (może zająć 60-90 sekund)...
+	</string>
+	<string name="LoginProcessingResponse">
+		Przetwarzanie Odpowiedzi...
+	</string>
+	<string name="LoginInitializingWorld">
+		Inicjalizacja świata...
+	</string>
+	<string name="LoginDecodingImages">
+		Przetwarzanie obrazów...
+	</string>
+	<string name="LoginInitializingQuicktime">
+		Inicjalizacja QuickTime...
+	</string>
+	<string name="LoginQuicktimeNotFound">
+		QuickTime nie znaleźony - inicjalizacja przerwana.
+	</string>
+	<string name="LoginQuicktimeOK">
+		QuickTime zainicjalizowany.
+	</string>
+	<string name="LoginWaitingForRegionHandshake">
+		Oczekiwanie na połączenie z regionem...
+	</string>
+	<string name="LoginConnectingToRegion">
+		Łączenie z regionem...
+	</string>
+	<string name="LoginDownloadingClothing">
+		Ładowanie ubrania...
+	</string>
+	<string name="LoginFailedNoNetwork">
+		Błąd sieci: Problemy z połączeniem, sprawdź podłączenie do sieci.
+	</string>
+	<!-- Disconnection -->
+	<string name="AgentLostConnection">
+		Ten region może mieć problemy. Sprawdź podłączenie do Internetu.
+	</string>
+	<!-- Tooltip, llhoverview.cpp -->
+	<string name="TooltipPerson">
+		Osoba
+	</string>
+	<!-- Object under mouse pointer is an avatar -->
+	<string name="TooltipNoName">
+		(brak nazwy)
+	</string>
+	<!-- No name on an object -->
+	<string name="TooltipOwner">
+		Właściciel:
+	</string>
+	<!-- Owner name follows -->
+	<string name="TooltipPublic">
+		Publiczny
+	</string>
+	<!-- Public permissions on an object -->
+	<string name="TooltipIsGroup">
+		(Grupa)
+	</string>
+	<!-- The name before this text is that of a group -->
+	<string name="TooltipFlagScript">
+		Skrypt
+	</string>
+	<string name="TooltipFlagPhysics">
+		Fizyka
+	</string>
+	<string name="TooltipFlagTouch">
+		Dotyk
+	</string>
+	<string name="TooltipFlagL$">
+		L$
+	</string>
+	<string name="TooltipFlagDropInventory">
+		Usuń z Inwentarza
+	</string>
+	<string name="TooltipFlagPhantom">
+		Fantom
+	</string>
+	<string name="TooltipFlagTemporary">
+		Tymczasowy
+	</string>
+	<string name="TooltipFlagRightClickMenu">
+		(Menu - wciśnij prawy klawisz)
+	</string>
+	<string name="TooltipFreeToCopy">
+		Za darmo
+	</string>
+	<string name="TooltipForSaleL$">
+		Na Sprzedaż: L$[AMOUNT]
+	</string>
+	<!-- L$ version -->
+	<string name="TooltipForSaleMsg">
+		Na Sprzedaż: [MESSAGE]
+	</string>
+	<!-- Message (RetrievingData) -->
+	<string name="TooltipFlagGroupBuild">
+		Budowanie Grupowe
+	</string>
+	<string name="TooltipFlagNoBuild">
+		Budowanie Zabronione
+	</string>
+	<string name="TooltipFlagNoEdit">
+		Edycja Zabroniona
+	</string>
+	<string name="TooltipFlagNotSafe">
+		Niebezpieczny Obszar
+	</string>
+	<!-- damage area -->
+	<string name="TooltipFlagNoFly">
+		Latanie Zabronione
+	</string>
+	<string name="TooltipFlagGroupScripts">
+		Skrypty Grupowe
+	</string>
+	<string name="TooltipFlagNoScripts">
+		Skrypty Zabronione
+	</string>
+	<string name="TooltipLand">
+		Posiadłość:
+	</string>
+	<string name="TooltipMustSingleDrop">
+		Tylko pojedynczy obiekt może być tutaj przeciągnięty
+	</string>
+	<!-- Indicates that an avatar&apos;s name or other similar datum is being retrieved. General usage. -->
+	<string name="RetrievingData">
+		Odzyskiwanie danych...
+	</string>
+	<string name="ReleaseNotes">
+		O Tej Wersji
+	</string>
+	<!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
+	<string name="LoadingData">
+		Ładowanie danych...
+	</string>
+	<!-- namecache -->
+	<!-- Avatar name: text shown for LLUUID::null -->
+	<string name="AvatarNameNobody">
+		(brak danych)
+	</string>
+	<!-- Avatar name: text shown while fetching name -->
+	<string name="AvatarNameWaiting">
+		(ładowanie)
+	</string>
+	<!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. -->
+	<string name="AvatarNameHippos">
+		(Twój avatar ulegnie samozniszczeniu za 5 sec. Pożegnaj się z SL!)
+	</string>
+	<!-- Group name: text shown for LLUUID::null -->
+	<string name="GroupNameNone">
+		(brak danych)
+	</string>
+	<!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
+	<string name="AssetErrorNone">
+		OK
+	</string>
+	<string name="AssetErrorRequestFailed">
+		Pobieranie danych: błąd
+	</string>
+	<string name="AssetErrorNonexistentFile">
+		Pobieranie danych: brak pliku
+	</string>
+	<string name="AssetErrorNotInDatabase">
+		Pobieranie danych: dane nie znalezione w bazie danych
+	</string>
+	<string name="AssetErrorEOF">
+		Koniec pliku
+	</string>
+	<string name="AssetErrorCannotOpenFile">
+		Nie można otworzyć pliku
+	</string>
+	<string name="AssetErrorFileNotFound">
+		Brak pliku
+	</string>
+	<string name="AssetErrorTCPTimeout">
+		Transfer pliku - przekroczony limit czasu
+	</string>
+	<string name="AssetErrorCircuitGone">
+		Połączenie przerwane
+	</string>
+	<string name="AssetErrorUnknownStatus">
+		Status nieznany
+	</string>
+	<!-- llvoavatar. Displayed in the avatar&apos;s chat bubble -->
+	<string name="AvatarEditingApparance">
+		(Edycja Wyglądu)
+	</string>
+	<string name="AvatarAway">
+		Tryb Nieobecności
+	</string>
+	<string name="AvatarBusy">
+		Tryb Pracusia
+	</string>
+	<string name="AvatarMuted">
+		Tryb Wyciszony
+	</string>
+	<!-- animations -->
+	<string name="anim_express_afraid">
+		Strach
+	</string>
+	<string name="anim_express_anger">
+		Złość
+	</string>
+	<string name="anim_away">
+		Nieobecność
+	</string>
+	<string name="anim_backflip">
+		Salto
+	</string>
+	<string name="anim_express_laugh">
+		Śmiech do Rozpuku
+	</string>
+	<string name="anim_express_toothsmile">
+		Wielki Uśmiech
+	</string>
+	<string name="anim_blowkiss">
+		Całusek
+	</string>
+	<string name="anim_express_bored">
+		Ale Nudy!
+	</string>
+	<string name="anim_bow">
+		Ukłon
+	</string>
+	<string name="anim_clap">
+		Oklaski
+	</string>
+	<string name="anim_courtbow">
+		Dworski Ukłon
+	</string>
+	<string name="anim_express_cry">
+		Płacz
+	</string>
+	<string name="anim_dance1">
+		Taniec 1
+	</string>
+	<string name="anim_dance2">
+		Taniec 2
+	</string>
+	<string name="anim_dance3">
+		Taniec 3
+	</string>
+	<string name="anim_dance4">
+		Taniec 4
+	</string>
+	<string name="anim_dance5">
+		Taniec 5
+	</string>
+	<string name="anim_dance6">
+		Taniec 6
+	</string>
+	<string name="anim_dance7">
+		Taniec 7
+	</string>
+	<string name="anim_dance8">
+		Taniec 8
+	</string>
+	<string name="anim_express_disdain">
+		Pogarda
+	</string>
+	<string name="anim_drink">
+		Picie
+	</string>
+	<string name="anim_express_embarrased">
+		Zakłopotanie
+	</string>
+	<string name="anim_angry_fingerwag">
+		Grożenie Paluszkiem
+	</string>
+	<string name="anim_fist_pump">
+		Udało sie!
+	</string>
+	<string name="anim_yoga_float">
+		Yoga
+	</string>
+	<string name="anim_express_frown">
+		Grymas
+	</string>
+	<string name="anim_impatient">
+		Niecierpliwość
+	</string>
+	<string name="anim_jumpforjoy">
+		Radocha
+	</string>
+	<string name="anim_kissmybutt">
+		Pocałuj Mnie Gdzieś
+	</string>
+	<string name="anim_express_kiss">
+		Pocałunek
+	</string>
+	<string name="anim_laugh_short">
+		Śmiech
+	</string>
+	<string name="anim_musclebeach">
+		Szpan
+	</string>
+	<string name="anim_no_unhappy">
+		Nie (Smutno)
+	</string>
+	<string name="anim_no_head">
+		Nie
+	</string>
+	<string name="anim_nyanya">
+		Nie-nie-nie
+	</string>
+	<string name="anim_punch_onetwo">
+		Za Ciosem Cios
+	</string>
+	<string name="anim_express_open_mouth">
+		Szczęka Opada
+	</string>
+	<string name="anim_peace">
+		Pokój
+	</string>
+	<string name="anim_point_you">
+		Wskazuj na Innych
+	</string>
+	<string name="anim_point_me">
+		Wskazuj na Siebie
+	</string>
+	<string name="anim_punch_l">
+		Uderz z Lewej
+	</string>
+	<string name="anim_punch_r">
+		Uderz z Prawej
+	</string>
+	<string name="anim_rps_countdown">
+		KPN Licz
+	</string>
+	<string name="anim_rps_paper">
+		KPN Papier
+	</string>
+	<string name="anim_rps_rock">
+		KPN Kamień
+	</string>
+	<string name="anim_rps_scissors">
+		KPN Nożyce
+	</string>
+	<string name="anim_express_repulsed">
+		Odrzuca Mnie
+	</string>
+	<string name="anim_kick_roundhouse_r">
+		Kopniak
+	</string>
+	<string name="anim_express_sad">
+		Smutek
+	</string>
+	<string name="anim_salute">
+		Pozdrów
+	</string>
+	<string name="anim_shout">
+		Krzycz
+	</string>
+	<string name="anim_express_shrug">
+		Wzrusz Ramionami
+	</string>
+	<string name="anim_express_smile">
+		Uśmiechaj się
+	</string>
+	<string name="anim_smoke_idle">
+		Pal
+	</string>
+	<string name="anim_smoke_inhale">
+		Pal i Zaciągaj się
+	</string>
+	<string name="anim_smoke_throw_down">
+		Rzuć Papierosa
+	</string>
+	<string name="anim_express_surprise">
+		Zaskoczenie
+	</string>
+	<string name="anim_sword_strike_r">
+		Uderz Mieczem
+	</string>
+	<string name="anim_angry_tantrum">
+		Wściekłość
+	</string>
+	<string name="anim_express_tongue_out">
+		Pokaż Język
+	</string>
+	<string name="anim_hello">
+		Pomachaj
+	</string>
+	<string name="anim_whisper">
+		Zaszeptaj
+	</string>
+	<string name="anim_whistle">
+		Zagwiżdż
+	</string>
+	<string name="anim_express_wink">
+		Puść Oko
+	</string>
+	<string name="anim_wink_hollywood">
+		Puść Oko (Hollywood)
+	</string>
+	<string name="anim_express_worry">
+		Zmartwienie
+	</string>
+	<string name="anim_yes_happy">
+		Tak (Szczęście)
+	</string>
+	<string name="anim_yes_head">
+		Tak
+	</string>
+	<string name="texture_loading">
+		Ładowanie...
+	</string>
+	<string name="worldmap_offline">
+		Niedostępna
+	</string>
+	<!-- Chat -->
+	<string name="whisper">
+		szepcze:
+	</string>
+	<string name="shout">
+		krzyczy:
+	</string>
+</strings>
diff --git a/indra/newview/skins/default/xui/pl/teleport_strings.xml b/indra/newview/skins/default/xui/pl/teleport_strings.xml
new file mode 100755
index 0000000000..55b8167a76
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/teleport_strings.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<teleport_messages>
+	<message_set name="errors">
+		<message name="invalid_tport">
+			Huston / LL - Mamy problem z teleportacją. Może relog by pomógl?
+Jeżeli cały czas nie możesz się telportować sprawdź Pomoc Techniczną na:
+www.secondlife.com/support
+		</message>
+		<message name="invalid_region_handoff">
+			Huston / LL - Mamy problem ze zmianą regionu. Może relog by pomógl?
+Jeżeli cały czas nie możesz zmienić regionu sprawdź Pomoc Techniczną na:
+www.secondlife.com/support
+		</message>
+		<message name="blocked_tport">
+			Przepraszamy, ale teleportacja jest chwilowo niedostępna - problemy z nową technologią. 
+Spróbuj jeszcze raz. Hmm - cały czas nie działa - może relog by pomógl?
+		</message>
+		<message name="nolandmark_tport">
+			Przepraszamy, ale nie możemy znaleźć miejsca docelowego.
+		</message>
+		<message name="timeout_tport">
+			Przepraszamy, ale nie udało się przeprowadzić teleportacji. Spróbuj jeszcze raz.
+		</message>
+		<message name="noaccess_tport">
+			Przepraszamy, ale nie masz dostępu do miejsca docelowego.
+		</message>
+		<message name="missing_attach_tport">
+			Czekamy na Twoje akcesoria. Możesz poczekać kilka minut lub zrobić relog przed następną próbą teleportacji.
+		</message>
+		<message name="too_many_uploads_tport">
+			Obecnie ten region ma problemy z ładowaniem obiektów w związku z czym teleportacja bardzo sie opóznia.
+Spróbuj jeszcze raz za kilka minut albo teleportuj się do mniej zatłoczonego miejsca.
+		</message>
+		<message name="expired_tport">
+			Przepraszamy, ale nie udało się przeprowadzić teleportacji wystarczająco szybko. Spróbuj jeszcze raz za kilka minut.
+		</message>
+		<message name="expired_region_handoff">
+			Przepraszamy, ale nie udało się przeprowadzić zmiany regionu wystarczająco szybko. Spróbuj jeszcze raz za kilka minut.
+		</message>
+		<message name="no_host">
+			Nie możemy znaleść miejsca docelowego. Miejsce te może być chwilowo nieosiągalne albo przestało istnieć.
+Spróbuj jeszcze raz za kilka minut.
+		</message>
+		<message name="no_inventory_host">
+			System inwentarza chwilowo nie działa.
+		</message>
+	</message_set>
+	<message_set name="progress">
+		<message name="sending_dest">
+			Wysyłanie do celu.
+		</message>
+		<message name="redirecting">
+			Wysyłanie do innego miejsca.
+		</message>
+		<message name="relaying">
+			Przenoszenie do celu.
+		</message>
+		<message name="sending_home">
+			Wysyłanie do miejsca startu.
+		</message>
+		<message name="sending_landmark">
+			Lokalizowanie zapamiętanego miejsca (LM).
+		</message>
+		<message name="completing">
+			Finalizowanie teleportacji.
+		</message>
+		<message name="resolving">
+			Namierzanie celu.
+		</message>
+		<message name="contacting">
+			Łączenie z nowym regionem.
+		</message>
+		<message name="arriving">
+			Docieranie do celu...
+		</message>
+		<message name="requesting">
+			Start teleportacji...
+		</message>
+	</message_set>
+</teleport_messages>
diff --git a/indra/newview/skins/default/xui/pl/xui_version.xml b/indra/newview/skins/default/xui/pl/xui_version.xml
new file mode 100755
index 0000000000..0e777751d3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/xui_version.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xui_version>
+	1.0
+</xui_version>
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
index e78a5a508e..10cce81115 100644
--- a/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_about" title="Sobre o Second Life">
-
+	<string name="you_are_at">
+		Você está em [POSITION]
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml
index 3e88b27e90..679868f33f 100644
--- a/indra/newview/skins/default/xui/pt/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml
@@ -1,227 +1,258 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floaterland" title="Sobre o Terreno">
 	<tab_container name="landtab">
 		<panel label="Geral" name="land_general_panel">
-			<text type="string" length="1" name="Name:">
+			<text length="1" name="Name:" type="string">
 				Nome:
 			</text>
-			<text type="string" length="1" name="Description:">
+			<text length="1" name="Description:" type="string">
 				Descrição:
 			</text>
-			<text type="string" length="1" name="Owner:">
+			<text length="1" name="Owner:" type="string">
 				Proprietário:
 			</text>
-			<text type="string" length="1" name="OwnerText">
+			<text length="1" name="OwnerText" type="string">
 				Leyla Linden
 			</text>
-			<button label="Perfil..." label_selected="Perfil..." name="Profile..." />
-			<text type="string" length="1" name="Group:">
+			<button label="Perfil..." label_selected="Perfil..." name="Profile..."/>
+			<text length="1" name="Group:" type="string">
 				Grupo:
 			</text>
-			<button label="Ajustar..." label_selected="Ajustar..." name="Set..." />
-			<check_box label="Permitir posse para o grupo" name="check deed"
-			     tool_tip="O gerente do grupo pode acionar essa terra ao grupo, então esta será mantida pelo gestor da ilha" />
-			<button label="Passar..." label_selected="Deed..." name="Deed..."
-			     tool_tip="Você só pode acionar esta terra se você for um gerente selecionado pelo grupo.." />
-			<check_box label="Proprietário faz contribuição com acionamento" name="check contrib"
-			     tool_tip="Quando a terra é acionada ao grupo, o proprietário anterior contribui alocando terra suficiente para mantê-la." />
-			<text type="string" length="1" name="For Sale:">
+			<button label="Ajustar..." label_selected="Ajustar..." name="Set..."/>
+			<check_box label="Permitir posse para o grupo" name="check deed" tool_tip="O gerente do grupo pode acionar essa terra ao grupo, então esta será mantida pelo gestor da ilha"/>
+			<button label="Passar..." label_selected="Deed..." name="Deed..." tool_tip="Você só pode acionar esta terra se você for um gerente selecionado pelo grupo.."/>
+			<check_box label="Proprietário faz contribuição com acionamento" name="check contrib" tool_tip="Quando a terra é acionada ao grupo, o proprietário anterior contribui alocando terra suficiente para mantê-la."/>
+			<text length="1" name="For Sale:" type="string">
 				A Venda:
 			</text>
-			<text type="string" length="1" name="Not for sale.">
+			<text length="1" name="Not for sale." type="string">
 				Não Está a Venda.
 			</text>
-			<text type="string" length="1" name="For Sale: Price L$[PRICE].">
+			<text length="1" name="For Sale: Price L$[PRICE]." type="string">
 				Preço: L$[PRICE].
 			</text>
-			<button label="Vender Terra..." label_selected="Vender Terra..." name="Sell Land..." />
-			<text type="string" length="1" name="For sale to">
+			<button label="Vender Terra..." label_selected="Vender Terra..." name="Sell Land..."/>
+			<text length="1" name="For sale to" type="string">
 				A venda para: [BUYER]
 			</text>
-			<text type="string" length="1" name="Sell with landowners objects in parcel.">
+			<text length="1" name="Sell with landowners objects in parcel." type="string">
 				A venda (Objetos incluídos).
 			</text>
-			<text type="string" length="1" name="Selling with no objects in parcel.">
+			<text length="1" name="Selling with no objects in parcel." type="string">
 				A Venda (Objetos não Incluídos).
 			</text>
-			<button label="Cancelar venda do terreno" label_selected="Cancelar venda do terreno"
-			     name="Cancel Land Sale" />
-			<text type="string" length="1" name="Claimed:">
+			<button label="Cancelar venda do terreno" label_selected="Cancelar venda do terreno" name="Cancel Land Sale"/>
+			<text length="1" name="Claimed:" type="string">
 				Solicitado
 			</text>
-			<text type="string" length="1" name="DateClaimText">
+			<text length="1" name="DateClaimText" type="string">
 				Ter Ago 15 13:47:25 2006
 			</text>
-			<text type="string" length="1" name="PriceLabel">
+			<text length="1" name="PriceLabel" type="string">
 				Área:
 			</text>
-			<text type="string" length="1" name="PriceText">
+			<text length="1" name="PriceText" type="string">
 				4048 m2.
 			</text>
-			<text type="string" length="1" name="Traffic:">
+			<text length="1" name="Traffic:" type="string">
 				Tráfego:
 			</text>
-			<text type="string" length="1" name="DwellText">
+			<text length="1" name="DwellText" type="string">
 				0
 			</text>
-			<button label="Comprar Terra..." label_selected="Comprar Terra..." name="Buy Land..." />
-			<button label="Comprar para o Grupo..." label_selected="Comprar para o Grupo..."
-			     name="Buy For Group..." />
-			<button label="Comprar Passe..." label_selected="Comprar Passe..." name="Buy Pass..."
-			     tool_tip="Uma passagem concede a você acesso temporário a esta terra." />
-			<button label="Abandonar Terra.." label_selected="Abandonar Terra.."
-			     name="Abandon Land..." />
-			<button label="Reclamar Terra..." label_selected="Reclamar Terra..."
-			     name="Reclaim Land..." />
-			<button label="Linden Sale..." label_selected="Linden Sale..." name="Linden Sale..."
-			     tool_tip="A terra precisa ser proprietária, estar com o conteúdo configurado e não estar pronta para leilão." />
-			<text name="new users only">
+			<button label="Comprar Terra..." label_selected="Comprar Terra..." name="Buy Land..."/>
+			<button label="Comprar para o Grupo..." label_selected="Comprar para o Grupo..." name="Buy For Group..."/>
+			<button label="Comprar Passe..." label_selected="Comprar Passe..." name="Buy Pass..." tool_tip="Uma passagem concede a você acesso temporário a esta terra."/>
+			<button label="Abandonar Terra.." label_selected="Abandonar Terra.." name="Abandon Land..."/>
+			<button label="Reclamar Terra..." label_selected="Reclamar Terra..." name="Reclaim Land..."/>
+			<button label="Linden Sale..." label_selected="Linden Sale..." name="Linden Sale..." tool_tip="A terra precisa ser proprietária, estar com o conteúdo configurado e não estar pronta para leilão."/>
+			<string name="new users only">
 				Somente novos usuários
-			</text>
-			<text name="anyone">
+			</string>
+			<string name="anyone">
 				Qualquer um
-			</text>
+			</string>
+			<string name="area_text">
+				Área
+			</string>
+			<string name="area_size_text">
+				[AREA] m2.
+			</string>
+			<string name="auction_id_text">
+				ID do Leilão: [ID]
+			</string>
+			<string name="need_tier_to_modify">
+				Você deve ter sua compra aprovada para modificar este terreno.
+			</string>
+			<string name="group_owned_text">
+				(Possuído pelo Grupo)
+			</string>
+			<string name="profile_text">
+				Perfil...
+			</string>
+			<string name="info_text">
+				Informação...
+			</string>
+			<string name="public_text">
+				(público)
+			</string>
+			<string name="none_text">
+				(nenhum)
+			</string>
+			<string name="sale_pending_text">
+				(Venda Pendente)
+			</string>
+			<string name="no_selection_text">
+				Nenhum terreno selecionado.
+Vá para o menu Mundo &gt; Sobre a Terra ou selecione outro terreno para mostrar seus detalhes.
+			</string>
 		</panel>
 		<panel label="Corretor" name="land_covenant_panel">
-			<text type="string" length="1" name="covenant_timestamp_text">
+			<text length="1" name="covenant_timestamp_text" type="string">
 				Última Alteração: Qua, Dez 31 16:00:00 1969
 			</text>
-			<text type="string" length="1" name="region_name_lbl">
+			<text length="1" name="region_name_lbl" type="string">
 				Região:
 			</text>
-			<text type="string" length="1" name="region_name_text">
+			<text length="1" name="region_name_text" type="string">
 				leyla
 			</text>
-			<text type="string" length="1" name="estate_name_lbl">
+			<text length="1" name="estate_name_lbl" type="string">
 				Estado:
 			</text>
-			<text type="string" length="1" name="estate_name_text">
+			<text length="1" name="estate_name_text" type="string">
 				mainland
 			</text>
-			<text type="string" length="1" name="estate_owner_lbl">
+			<text length="1" name="estate_owner_lbl" type="string">
 				Proprietário do Estado:
 			</text>
-			<text type="string" length="1" name="estate_owner_text">
+			<text length="1" name="estate_owner_text" type="string">
 				(nenhum)
 			</text>
-			<text type="string" length="1" name="resellable_clause">
+			<text length="1" name="resellable_clause" type="string">
 				Terra comprada nesta região não pode ser revendida.
 			</text>
-			<text type="string" length="1" name="changeable_clause">
+			<text length="1" name="changeable_clause" type="string">
 				Terra comrpada nesta região não poderá ser compartilhada ou sub-dividida.
 			</text>
-			<text_editor type="string" length="1" name="covenant_editor">
+			<text_editor length="1" name="covenant_editor" type="string">
 				Não há corretor para este Estado.
 			</text_editor>
-			<text name="can_resell">
+			<string name="can_resell">
 				Terra comprada nesta região pode ser revendida.
-			</text>
-			<text name="can_not_resell">
+			</string>
+			<string name="can_not_resell">
 				Terra comprada nesta região não pode ser revendida.
-			</text>
-			<text name="can_change">
-				Terra comprada nesta região pode ser compartilhada ou 
-sub-dividida.
-			</text>
-			<text name="can_not_change">
-				Terra comprada nesta região não pode ser 
-compartilhada ou sub-dividida..
-			</text>
+			</string>
+			<string name="can_change">
+				Terra comprada nesta região pode ser compartilhada ou sub-dividida.
+			</string>
+			<string name="can_not_change">
+				Terra comprada nesta região não pode ser compartilhada ou sub-dividida..
+			</string>
 		</panel>
 		<panel label="Objetos" name="land_objects_panel">
-			<text type="string" length="1" name="Simulator primitive usage:">
+			<text name="parcel_object_bonus">
+				Fator de Bonus para Objetos na Região: [BONUS]
+			</text>
+			<text length="1" name="Simulator primitive usage:" type="string">
 				Uso do simulador de primitivas:
 			</text>
-			<text type="string" length="1" name="Primitives parcel supports:">
+			<text name="objects_available" left="214" width="230">
+				[COUNT] de [MAX] ([AVAILABLE] disponíveis)
+			</text>
+			<string name="objects_available_text">
+				[COUNT] de [MAX] ([AVAILABLE] disponíveis)
+			</string>
+			<string name="objects_deleted_text">
+				[COUNT] de [MAX] ([DELETED] serão deletados)
+			</string>
+			<text length="1" name="Primitives parcel supports:" type="string" width="200">
 				Primitivas suportadas pelo terreno:
 			</text>
-			<text type="string" length="1" name="object_contrib_text">
+			<text length="1" name="object_contrib_text" type="string" left="214" width="152">
 				[COUNT]
 			</text>
-			<text type="string" length="1" name="Primitives on parcel:">
+			<text length="1" name="Primitives on parcel:" type="string">
 				Primitivas no Lote:
 			</text>
-			<text type="string" length="1" name="total_objects_text">
+			<text length="1" name="total_objects_text" type="string" left="214" width="48">
 				[COUNT]
 			</text>
-			<text type="string" length="1" name="Owned by parcel owner:">
+			<text length="1" name="Owned by parcel owner:" type="string" left="14" width="180">
 				Pertencentes ao dono:
 			</text>
-			<text type="string" length="1" name="owner_objects_text">
+			<text length="1" name="owner_objects_text" type="string" left="214" width="48">
 				[COUNT]
 			</text>
-			<button label="Mostrar" label_selected="Mostrar" name="ShowOwner" />
-			<button label="Retornar..." label_selected="Retornar..." name="ReturnOwner..."
-			     tool_tip="Retorno os objetos aos seus proprietários." />
-			<text type="string" length="1" name="Set to group:">
+			<button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-135" width="60"/>
+			<button label="Retornar..." label_selected="Retornar..." name="ReturnOwner..." tool_tip="Retorno os objetos aos seus proprietários." right="-10" width="119"/>
+			<text length="1" name="Set to group:" type="string" left="14" width="180">
 				Configurados ao grupo:
 			</text>
-			<text type="string" length="1" name="group_objects_text">
+			<text length="1" name="group_objects_text" type="string" left="214" width="48">
 				[COUNT]
 			</text>
-			<button label="Mostrar" label_selected="Mostrar" name="ShowGroup" />
-			<button label="Retornar..." label_selected="Retornar..." name="ReturnGroup..."
-			     tool_tip="Retornar os objetos para seus proprietários." />
-			<text type="string" length="1" name="Owned by others:">
+			<button label="Mostrar" label_selected="Mostrar" name="ShowGroup" width="60" right="-135"/>
+			<button label="Retornar..." label_selected="Retornar..." name="ReturnGroup..." tool_tip="Retornar os objetos para seus proprietários." right="-10" width="119"/>
+			<text length="1" name="Owned by others:" type="string" left="14" width="128">
 				Propriedade de Outros:
 			</text>
-			<text type="string" length="1" name="other_objects_text">
+			<text length="1" name="other_objects_text" type="string" left="214" width="48">
 				[COUNT]
 			</text>
-			<button label="Mostrar" label_selected="Mostrar" name="ShowOther" />
-			<button label="Retornar..." label_selected="Retornar..." name="ReturnOther..."
-			     tool_tip="Retornar os objetos aos seus proprietários." />
-			<text type="string" length="1" name="Selected / sat upon:">
+			<button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-135" width="60"/>
+			<button label="Retornar..." label_selected="Retornar..." name="ReturnOther..." tool_tip="Retornar os objetos aos seus proprietários."  right="-10" width="119"/>
+			<text length="1" name="Selected / sat upon:" type="string" left="14" width="193">
 				Selecionado/Sentado:
 			</text>
-			<text type="string" length="1" name="selected_objects_text">
+			<text length="1" name="selected_objects_text" type="string" left="214" width="48">
 				[COUNT]
 			</text>
-			<text type="string" length="1" name="Autoreturn">
+			<text length="1" name="Autoreturn" type="string" width="412" left="4">
 				Auto-retornar objetos dos outros residentes (minutos):
 			</text>
-			<text type="string" length="1" name="Object Owners:">
-				Proprietários dos Objetos:
-			</text>
-			<button label="Atualizar Lista" label_selected="Atualizar Lista" name="Refresh List" />
-			<button label="Objetos Retornados..." label_selected="Objetos Retornados..."
-			     name="Return objects..." />
-			<button label="" label_selected="" name="Type" tool_tip="Organizar por Tipo" />
-			<button label="Nome" label_selected="Nome" name="Name" tool_tip="Organizar por Nome" />
-			<button label="Quantidade" label_selected="Quantidade" name="Count"
-			     tool_tip="Organizar por Quantidade" />
+			<line_editor name="clean other time" right="-6" width="36" />
+			<text length="1" name="Object Owners:" type="string">
+				Proprietários:
+			</text>
+			<button label="Atualizar Lista" label_selected="Atualizar Lista" name="Refresh List"/>
+			<button label="Objetos Retornados..." label_selected="Objetos Retornados..." name="Return objects..."/>
+			<name_list name="owner list">
+				<column label="Tipo" name="type"/>
+				<column label="Nome" name="name"/>
+				<column label="Contar" name="count"/>
+			</name_list>
 		</panel>
 		<panel label="Opções" name="land_options_panel">
-			<text type="string" length="1" name="allow_label">
+			<text length="1" name="allow_label" type="string">
 				Permitir outros residentes a:
 			</text>
-			<check_box label="Editar Terreno" name="edit land check" />
-			<check_box label="Criar Landmarks" name="check landmark" />
-			<check_box label="Voar" name="check fly" />
-			<text type="string" length="1" name="allow_label2">
+			<check_box label="Editar Terreno" name="edit land check" tool_tip="Se ativado, qualquer um pode modificar a forma da sua terra. É melhor deixar esta opção desativada, uma vez que você sempre pode editar seu próprio terreno."/>
+			<check_box label="Criar Landmarks" name="check landmark"/>
+			<check_box label="Voar" name="check fly" tool_tip="Se ativado, os Residentes podem voar na sua terra. Se desativado, eles podem voar apenas para dentro e por cima de sua terra."/>
+			<text length="1" name="allow_label2" type="string">
 				Criar Objetos:
 			</text>
-			<check_box label="Residentes" name="edit objects check" />
-			<check_box label="Grupo" name="edit group objects check" />
-			<text type="string" length="1" name="allow_label3">
+			<check_box label="Residentes" name="edit objects check"/>
+			<check_box label="Grupo" name="edit group objects check"/>
+			<text length="1" name="allow_label3" type="string">
 				Entrada do Objeto:
 			</text>
-			<check_box label="Residentes" name="all object entry check" />
-			<check_box label="Grupo" name="group object entry check" />
-			<text type="string" length="1" name="allow_label4">
+			<check_box label="Residentes" name="all object entry check"/>
+			<check_box label="Grupo" name="group object entry check"/>
+			<text length="1" name="allow_label4" type="string">
 				Executar Scripts:
 			</text>
-			<check_box label="Residentes" name="check other scripts" />
-			<check_box label="Grupo" name="check group scripts" />
-			<text type="string" length="1" name="land_options_label">
+			<check_box label="Residentes" name="check other scripts"/>
+			<check_box label="Grupo" name="check group scripts"/>
+			<text length="1" name="land_options_label" type="string">
 				Opções de Terra:
 			</text>
-			<check_box label="Salvo (sem dano)" name="check safe" />
-			<check_box label="Restrict Pushing" name="PushRestrictCheck"
-			     tool_tip="llPushObject só funcionará nos scripts do proprietário do lote ou nos scripts de quem empurra." />
-			<check_box label="Mostrar nos locais de Busca (L$30/semana) sobre"
-			     name="ShowDirectoryCheck" />
-			<combo_box name="land category">
+			<check_box label="Salvo (sem dano)" name="check safe" tool_tip="Se ativado, ajusta o terreno para Seguro, desabilitando combate com danos. Se não ativado, o combate com danos é habilitado."/>
+			<check_box label="Sem Empurrar" name="PushRestrictCheck" tool_tip="Evita scripts que empurram. A ativação dessa opção pode ser útil para prevenir comportamentos desordeiros na sua terra."/>
+			<check_box label="Mostra o Lugar na Busca (L$30/semana) sob" name="ShowDirectoryCheck" tool_tip="Permitir que as pessoas vejam este terreno nos resultados de busca"/>
+			<combo_box name="land category" left="286" width="146" >
 				<combo_item name="AnyCategory">
 					Qualquer Categoria
 				</combo_item>
@@ -262,68 +293,140 @@ compartilhada ou sub-dividida..
 					Outros
 				</combo_item>
 			</combo_box>
-			<check_box label="Publicar lista na web" name="PublishCheck"
-			     tool_tip="Publicar informações do seu lote na web." />
-			<check_box label="Mature content" name="MatureCheck"
-			     tool_tip="As informações do seu lote são consideradas para Adultos." />
-			<button label="?" label_selected="?" name="?" />
-			<text type="string" length="1" name="Snapshot:">
+			<button label="?" label_selected="?" name="?"/>
+			<check_box label="Mature content" name="MatureCheck" tool_tip="As informações do seu lote são consideradas para Adultos."/>
+			<text length="1" name="Snapshot:" type="string">
 				Foto:
 			</text>
-			<texture_picker label="" name="snapshot_ctrl" tool_tip="Clique para escolher uma imagem" />
-			<text type="string" length="1" name="Landing Point: (none)">
-				Landing Point: (nenhum)
+			<texture_picker label="" name="snapshot_ctrl" tool_tip="Clique para escolher uma imagem"/>
+			<text name="landing_point">
+				Ponto de Aterrissagem: [LANDING]
 			</text>
-			<button label="Set" label_selected="Ajustar" name="Set"
-			     tool_tip="Ajuste o landing point para a posição do seu avatr. Ele precisa ser dentro deste lote." />
-			<button label="Limpar" label_selected="Limpar" name="Clear"
-			     tool_tip="Limpar o landing point." />
-			<text type="string" length="1" name="Teleport Routing: ">
+			<string name="landing_point_none">
+				(nenhum)
+			</string>
+			<button label="Set" label_selected="Ajustar" name="Set" tool_tip="Define o ponto de aterrissagem aonde o visitante chega. Define a localidade para seu avatar dentro deste terreno."/>
+			<button label="Limpar" label_selected="Limpar" name="Clear" tool_tip="Limpar o landing point."/>
+			<text length="1" name="Teleport Routing: " type="string">
 				Rota de Tele-transporte:
 			</text>
-			<combo_box name="landing type"
-			     tool_tip="Rota de Teletransporte -- Selecione como tratar os tele-transportes no seu lote.">
-				<combo_item type="string" length="1" name="Blocked">
+			<combo_box name="landing type" tool_tip="Rota de Teletransporte -- Selecione como tratar os tele-transportes no seu lote." left="140" width="140" >
+				<combo_item length="1" name="Blocked" type="string">
 					Bloqueado
 				</combo_item>
-				<combo_item type="string" length="1" name="LandingPoint">
+				<combo_item length="1" name="LandingPoint" type="string">
 					Landing Point
 				</combo_item>
-				<combo_item type="string" length="1" name="Anywhere">
+				<combo_item length="1" name="Anywhere" type="string">
 					Qualquer lugar
 				</combo_item>
 			</combo_box>
+			<string name="push_restrict_text">
+				Sem Empurrar
+			</string>
+			<string name="push_restrict_region_text">
+				Sem Empurrar (Imposição na Região)
+			</string>
 		</panel>
 		<panel label="Mídia" name="land_media_panel">
-			<check_box label="Restringir som espacial a este lote" name="check sound local" />
-			<text type="string" length="1" name="Music URL:">
-				URL Música:
-			</text>
-			<text type="string" length="1" name="Media texture:">
-				Textura de Mídia:
+			<text name="with media:" width="85">
+				Tipo de Mídia:
 			</text>
-			<text type="string" length="1" name="Replace this texture:">
-				Substituir esta Textura:
+			<combo_box name="media type" tool_tip="Especificar se a URL é um filme, uma página web ou outra mídia" left="97"/>
+			<text name="at URL:" width="85">
+				URL da Mídia:
 			</text>
-			<texture_picker label="" name="media texture" tool_tip="Clique para escolher uma imagem" />
-			<text type="string" length="1" name="with content from this URL:">
-				com conteúdo desta URL:
+			<line_editor name="media_url" left="97"/>
+			<button label="Definir..." label_selected="Ajustar..." name="set_media_url"/>
+			<text name="Description:">
+				Descrição:
 			</text>
-			<check_box label="Conteudo Auto-Ajustavel (lento e reduz a qualidade visual)"
-			     name="media_auto_scale"
-			     tool_tip="Marcando esta opção o conteúdo se ajustará ao lote automaticamente. O lote pode se tornar lento e com baixa qualidade visual nenhum outro ajuste de textura ou alinhamento será necessário." />
+			<line_editor name="url_description" tool_tip="Texto mostrado ao lado do botão reproduzir/carregar" left="97"/>
+			<text length="1" name="Media texture:" type="string">
+				Substituir
+Texture:
+			</text>
+			<texture_picker label="" name="media texture" tool_tip="Clique para escolher uma imagem" left="97"/>
+			<text name="replace_texture_help">
+				(Objetos usando esta textura, mostrarão o filme ou
+a página web depois que você clicar na seta de reproduzir.)
+			</text>
+			<text name="Options:">
+				Mídia
+Options:
+			</text>
+			<check_box left="97" label="Escala automática" name="media_auto_scale" tool_tip="Marcando esta opção o conteúdo se ajustará ao lote automaticamente. O lote pode se tornar lento e com baixa qualidade visual nenhum outro ajuste de textura ou alinhamento será necessário."/>
+			<check_box label="Mídia em Repetição" name="media_loop" tool_tip="Executar a mídia repetidamente. Quando a mídia terminar a execução, ela reiniciará do começo."/>
+			<check_box left="97" label="Esconder a URL da Mídia" name="hide_media_url" tool_tip="Ativando esta opção, a URL da mídia se ocultará para quaisquer visualizadores não autorizados a ver esta informação do terreno. Notar que isto não está disponível para tipos HTML."/>
+			<check_box label="Esconder a URL de Música" name="hide_music_url" tool_tip="Ativando esta opção, a URL de música se esconderá para visualizadores não autorizados a ver esta informação do terreno"/>
+			<text name="media_size" tool_tip="Tamanho para desenhar a mídia Web, deixar 0 como padrão." width="105" left="102">
+				Tamanho da mídia:
+			</text>
+			<spinner name="media_size_width" tool_tip="Tamanho para desenhar a mídia Web, deixar 0 como padrão." left_delta="89"/>
+			<spinner name="media_size_height" tool_tip="Tamanho para desenhar a mídia Web, deixar 0 como padrão."/>
+			<text name="pixels">
+				pixels
+			</text>
+			<text name="MusicURL:">
+				URL da Música:
+			</text>
+			<line_editor name="music_url" left="97"/>
+			<text name="Sound:">
+				Som:
+			</text>
+			<check_box label="Restringir som espacial a este lote" name="check sound local" left="97"/>
+			<text name="Voice settings:">
+				Voz:
+			</text>
+			<radio_group name="parcel_voice_channel" left="97" width="310">
+				<radio_item name="Estate">
+					Usar o canal espacial da Propriedade
+				</radio_item>
+				<radio_item name="Private">
+					Usar um canal especial privado
+				</radio_item>
+				<radio_item name="Disabled">
+					Desabilitar audio espacial neste terreno
+				</radio_item>
+			</radio_group>
 		</panel>
 		<panel label="Acesso" name="land_access_panel">
-			<text type="string" length="1" name="Limit access to this parcel to:">
-				Limitar acesso a este lote a:
-			</text>
-			<check_box label="Grupo: (nenhum)" name="GroupCheck" />
-			<text name="BanCheck">Banir estes Avatares:</text>
-			<button label="Incluir..." label_selected="Incluir..." name="add_banned" />
-			<button label="Remover" label_selected="Remover" name="remove_banned" />
-			<check_box label="Vender passes permitindo acesso temporário:" name="PassCheck" />
-			<spinner label="Preço em L$:" name="PriceSpin" />
-			<spinner label="Horas de Acesso:" name="HoursSpin" />
+			<text length="1" name="Limit access to this parcel to:" type="string">
+				Acesso a Este Terreno
+			</text>
+			<check_box label="Permitir Acesso Público" name="public_access"/>
+			<text name="Only Allow">
+				Bloquear Acesso por:
+			</text>
+			<check_box label="Residentes que não forneceram informações de pagamento para a Linden Lab" name="limit_payment" tool_tip="Banir residentes não identificados."/>
+			<check_box label="Residentes que não tiveram a idade de adulto confirmada" name="limit_age_verified" tool_tip="Banir residentes que não tiveram sua idade verificada. Veja support.secondlife.com para maiores informações."/>
+			<string name="estate_override">
+				Uma ou mais destas opções está definida no nível de propriedade.
+			</string>
+			<check_box label="Permitir Acesso do Grupo: [GROUP]" name="GroupCheck" tool_tip="Definir grupo na aba Geral."/>
+			<check_box label="Vender passes para:" name="PassCheck" tool_tip="Permite acesso temporário a este terreno"/>
+			<combo_box name="pass_combo">
+				<combo_item name="Anyone">
+					Qualquer um
+				</combo_item>
+				<combo_item name="Group">
+					Grupo
+				</combo_item>
+			</combo_box>
+			<spinner label="Preço em L$:" name="PriceSpin"/>
+			<spinner label="Horas de Acesso:" name="HoursSpin"/>
+			<text label="Permitir Sempre" name="AllowedText">
+				Residentes Permitidos
+			</text>
+			<name_list name="AccessList" tool_tip="([LISTED] listados, [MAX] máximo)"/>
+			<button label="Adicionar..." label_selected="Adicionar..." name="add_allowed"/>
+			<button label="Remover" label_selected="Remover" name="remove_allowed"/>
+			<text label="Banir" name="BanCheck">
+				Residentes Banidos
+			</text>
+			<name_list name="BannedList" tool_tip="([LISTED] listados, [MAX] máximo)"/>
+			<button label="Adicionar..." label_selected="Adicionar..." name="add_banned"/>
+			<button label="Remover" label_selected="Remover" name="remove_banned"/>
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_animation_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
index de8d637ed1..b55879b36d 100644
--- a/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Animation Preview" title="">
 	<text name="name_label">
 		Nome:
@@ -6,36 +6,14 @@
 	<text name="description_label">
 		Descrição:
 	</text>
-	<spinner label="Prioridade" name="priority"
-	     tool_tip="Controle com o qual umas animações podem ser sobrepostas por outras." />
-	<text name="preview_label">
-		Prever enquanto
-	</text>
-	<combo_box label="" name="preview_base_anim"
-	     tool_tip="Use isso para testar o comportamento de sua animação enquanto seu avatar executa ações comuns.">
-		<combo_item name="Standing">
-			Parado
-		</combo_item>
-		<combo_item name="Walking">
-			Andando
-		</combo_item>
-		<combo_item name="Sitting">
-			Sentando
-		</combo_item>
-		<combo_item name="Flying">
-			Voando
-		</combo_item>
-	</combo_box>
-	<check_box label="Loop" name="loop_check" tool_tip="Executa a animação repetidamente." />
-	<spinner label="Dentro(%)" name="loop_in_point"
-	     tool_tip="Ajusta o ponto onde a repetição começa." />
-	<spinner label="Fora(%)" name="loop_out_point"
-	     tool_tip="Ajusta o ponto onde a repetição termina." />
+	<spinner label="Prioridade" name="priority" tool_tip="Controle com o qual umas animações podem ser sobrepostas por outras."/>
+	<check_box label="Loop" name="loop_check" tool_tip="Executa a animação repetidamente."/>
+	<spinner label="Dentro(%)" name="loop_in_point" tool_tip="Ajusta o ponto onde a repetição começa."/>
+	<spinner label="Fora(%)" name="loop_out_point" tool_tip="Ajusta o ponto onde a repetição termina."/>
 	<text name="hand_label">
 		Posição Manual
 	</text>
-	<combo_box label="" name="hand_pose_combo"
-	     tool_tip="Controla o que as mãos fazem durante a animação">
+	<combo_box label="" name="hand_pose_combo" tool_tip="Controla o que as mãos fazem durante a animação">
 		<combo_item name="Spread">
 			Espreguiçar
 		</combo_item>
@@ -79,8 +57,7 @@
 	<text name="emote_label">
 		Expressão
 	</text>
-	<combo_box label="" name="emote_combo"
-	     tool_tip="Controla o que a face faz durante a animação.">
+	<combo_box label="" name="emote_combo" tool_tip="Controla o que a face faz durante a animação.">
 		<combo_item name="[None]">
 			[None]
 		</combo_item>
@@ -142,16 +119,44 @@
 			Preocupado
 		</combo_item>
 	</combo_box>
-	<spinner label="Ease In (sec)" name="ease_in_time"
-	     tool_tip="Quantidade de tempo (em segundos) para que as animações se mesclem." />
-	<spinner label="Ease Out (sec)" name="ease_out_time"
-	     tool_tip="Quantidade de tempo (em segundos) para que a animações se mesclem." />
-	<button label="" name="play_btn" tool_tip="Executa/pausa sua animação." />
-	<button label="" name="stop_btn" tool_tip="Interrompe a execução da animação." />
-	<slider label="" name="playback_slider" />
+	<text name="preview_label">
+		Prever enquanto
+	</text>
+	<combo_box label="" name="preview_base_anim" tool_tip="Use isso para testar o comportamento de sua animação enquanto seu avatar executa ações comuns.">
+		<combo_item name="Standing">
+			Parado
+		</combo_item>
+		<combo_item name="Walking">
+			Andando
+		</combo_item>
+		<combo_item name="Sitting">
+			Sentando
+		</combo_item>
+		<combo_item name="Flying">
+			Voando
+		</combo_item>
+	</combo_box>
+	<spinner label="Ease In (sec)" name="ease_in_time" tool_tip="Quantidade de tempo (em segundos) para que as animações se mesclem."/>
+	<spinner label="Ease Out (sec)" name="ease_out_time" tool_tip="Quantidade de tempo (em segundos) para que a animações se mesclem."/>
+	<button label="" name="play_btn" tool_tip="Executa/pausa sua animação."/>
+	<button label="" name="stop_btn" tool_tip="Interrompe a execução da animação."/>
+	<slider label="" name="playback_slider"/>
 	<text name="bad_animation_text">
 		Incapaz de ler o arquivo de animação. Nós recomendamos exportar arquivos BVH do Poser 4.
 	</text>
-	<button label="Cancelar" name="cancel_btn" />
-	<button label="Carregar (L$[AMOUNT])" name="ok_btn" />
+	<button label="Cancelar" name="cancel_btn"/>
+	<button label="Carregar (L$[AMOUNT])" name="ok_btn"/>
+	<string name="failed_to_initialize">
+		Não foi possível iniciar o movimento
+	</string>
+	<string name="anim_too_long">
+		O arquivo de animação tem [LENGTH] segundos de duração. 
+
+Duração maxima de animação permitida é de [MAX_LENGTH] segundos.
+	</string>
+	<string name="failed_file_read">
+		Não foi possível ler o arquivo de animação.
+
+[STATUS]
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml b/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
index a4c6c376e0..cc00584b02 100644
--- a/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="avatarpicker" title="Escolha de pessoa">
-	<text name="Type part of the resident&apos;s name:">
-		Digite o nome da pessoa:
+	<text name="instruct_search_resident_name">
+		Digitar parte do nome do residente:
 	</text>
-	<button label="Encontrar" label_selected="Encontrar" name="Find" />
+	<button label="Encontrar" label_selected="Encontrar" name="Find"/>
 	<text name="Or select their calling card:">
 		Ou selecione um cartão:
 	</text>
-	<button label="Selecionar" label_selected="Selecionar" name="Select" />
-	<button label="Fechar" label_selected="Fechar" name="Close" />
-	<text name="NotFound">
+	<button label="Fechar" label_selected="Fechar" name="Close"/>
+	<button label="Selecionar" label_selected="Selecionar" name="Select"/>
+	<string name="NotFound">
 		&apos;[TEXT]&apos; não encontrado
-	</text>
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
index 7533298323..8528f677a7 100644
--- a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="avatar_texture_debug" title="Textura do Avatar">
-	<text name="">
-		Texturas prontas
+	<text name="baked_label">
+		Texturas sobrepostas
 	</text>
-	<text name="">
-		Texturas Compostas
+	<text name="composite_label">
+		Texturas compostas
 	</text>
-	<texture_picker label="Cabeça" name="baked_head" />
-	<texture_picker label="Maquiagem" name="head_bodypaint" />
-	<texture_picker label="Cabelo" name="hair" />
-	<button label="Tombar" label_selected="Tombar" name="Dump" />
-	<texture_picker label="Olhos" name="baked_eyes" />
-	<texture_picker label="Olho" name="eye_texture" />
-	<texture_picker label="Parte de cima" name="baked_upper_body" />
-	<texture_picker label="Tatuagem para partes de cima" name="upper_bodypaint" />
-	<texture_picker label="Camiseta" name="undershirt" />
-	<texture_picker label="Luvas" name="gloves" />
-	<texture_picker label="Camisa" name="shirt" />
-	<texture_picker label="Jaqueta" name="upper_jacket" />
-	<texture_picker label="Parte de baixo" name="baked_lower_body" />
-	<texture_picker label="Tatuagem para partes de baixo" name="lower_bodypaint" />
-	<texture_picker label="Roupas de baixo" name="underpants" />
-	<texture_picker label="Meias" name="socks" />
-	<texture_picker label="Calçados" name="shoes" />
-	<texture_picker label="Calças" name="pants" />
-	<texture_picker label="Jaqueta" name="jacket" />
-	<texture_picker label="Saia" name="baked_skirt" />
-	<texture_picker label="Saia" name="skirt_texture" />
+	<texture_picker label="Cabeça" name="baked_head"/>
+	<texture_picker label="Maquiagem" name="head_bodypaint"/>
+	<texture_picker label="Cabelo" name="hair"/>
+	<button label="Tombar" label_selected="Tombar" name="Dump"/>
+	<texture_picker label="Olhos" name="baked_eyes"/>
+	<texture_picker label="Olho" name="eye_texture"/>
+	<texture_picker label="Parte de cima" name="baked_upper_body"/>
+	<texture_picker label="Tatuagem para partes de cima" name="upper_bodypaint"/>
+	<texture_picker label="Camiseta" name="undershirt"/>
+	<texture_picker label="Luvas" name="gloves"/>
+	<texture_picker label="Camisa" name="shirt"/>
+	<texture_picker label="Jaqueta" name="upper_jacket"/>
+	<texture_picker label="Parte de baixo" name="baked_lower_body"/>
+	<texture_picker label="Tatuagem para partes de baixo" name="lower_bodypaint"/>
+	<texture_picker label="Roupas de baixo" name="underpants"/>
+	<texture_picker label="Meias" name="socks"/>
+	<texture_picker label="Calçados" name="shoes"/>
+	<texture_picker label="Calças" name="pants"/>
+	<texture_picker label="Jaqueta" name="jacket"/>
+	<texture_picker label="Saia" name="baked_skirt"/>
+	<texture_picker label="Saia" name="skirt_texture"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_build_options.xml b/indra/newview/skins/default/xui/pt/floater_build_options.xml
index 8f23a06721..c52ccad450 100644
--- a/indra/newview/skins/default/xui/pt/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/pt/floater_build_options.xml
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="Opções de grade">
-	<spinner label="Uni. Grade (metros)" name="GridResolution" />
-	<spinner label="Ext. da Grade (metros)" name="GridDrawSize" />
-	<check_box label="Habilitar ajuste de sub-grade" name="GridSubUnit" />
-	<slider label="Opacidade da grade" name="GridOpacity" />
+	<spinner label="Uni. Grade (metros)" name="GridResolution"/>
+	<spinner label="Ext. da Grade (metros)" name="GridDrawSize"/>
+	<check_box label="Habilitar ajuste de sub-grade" name="GridSubUnit"/>
+	<check_box label="Mostrar as seções de cruzamento" name="GridCrossSection"/>
+	<slider label="Opacidade da grade" name="GridOpacity"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_contents.xml b/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
index f68311e186..78b098b1f6 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_buy_contents" title="Comprar conteúdo">
 	<text name="contains_text">
 		[NAME] contém:
@@ -6,7 +6,16 @@
 	<text name="buy_text">
 		Comprar por L$[AMOUNT] de(a) [NAME]?
 	</text>
-	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn" />
-	<button label="Comprar" label_selected="Comprar" name="buy_btn" />
-	<check_box label="Vestir roupa agora" name="wear_check" />
+	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	<button label="Comprar" label_selected="Comprar" name="buy_btn"/>
+	<check_box label="Vestir roupa agora" name="wear_check"/>
+	<string name="no_copy_text">
+		(sem copiar)
+	</string>
+	<string name="no_modify_text">
+		(sem modificar)
+	</string>
+	<string name="no_transfer_text">
+		(sem transferir)
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
index ccc61c1233..e28fcc30b4 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
@@ -1,10 +1,66 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="buy currency" title="Adquira Lindens (L$)">
-	<text name="cp">
-		A partir de agora você já pode comprar seus Lindens. 
-
-Para isso, siga até o menu superior e clique no item 
-Seviços e em seguida selecione &quot;Compra de Lindens&quot;.
+	<text name="info_buying">
+		Comprando Moeda:
 	</text>
-	<button label="Fechar" name="cancel_btn" />
+	<text name="info_cannot_buy">
+		Não pode comprar agora:
+	</text>
+	<text name="info_need_more">
+		Você precisa de mais moeda:
+	</text>
+	<text name="error_message">
+		Algo não está certo.
+	</text>
+	<button label="Ir para website" name="error_web"/>
+	<text name="contacting">
+		Contatando LindeX...
+	</text>
+	<text name="buy_action_unknown">
+		Comprar L$ sobre o câmbio corrente da LindeX
+	</text>
+	<text name="buy_action">
+		[NAME] L$ [PRICE]
+	</text>
+	<text name="currency_action">
+		Comprar L$
+	</text>
+	<line_editor name="currency_amt">
+		1234
+	</line_editor>
+	<text name="currency_est">
+		Por aproximadamente. US$ [dólares americanos]
+	</text>
+	<text name="getting_data">
+		Primeiros dados...
+	</text>
+	<text name="balance_label">
+		Você tem atualmente
+	</text>
+	<text name="balance_amount">
+		L$ [AMT]
+	</text>
+	<text name="buying_label">
+		Você está comprando
+	</text>
+	<text name="buying_amount">
+		L$ [AMT]
+	</text>
+	<text name="total_label">
+		Seu saldo será
+	</text>
+	<text name="total_amount">
+		L$ [AMT]
+	</text>
+	<text name="purchase_warning_repurchase">
+		Confirmando esta compra só compra a moeda.  Você precisará tentar novamente a operação.
+	</text>
+	<text name="purchase_warning_notenough">
+		Você não está comprando moeda suficiente  Aumente a quantidade de compra.
+	</text>
+	<button label="Fechar" name="cancel_btn"/>
+	<button label="Adquirir" name="buy_btn"/>
+	<string name="buy_currency">
+		Comprar L$ [LINDENS] por aproximadamente US$ [dólares americanos]
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_land.xml b/indra/newview/skins/default/xui/pt/floater_buy_land.xml
index 30d7193dde..e9f4d175fd 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_land.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="buy land" title="Comprar terreno">
 	<text name="region_name_label">
 		Região:
@@ -33,8 +33,7 @@
 	<text_editor name="covenant_editor">
 		Carregando...
 	</text_editor>
-	<check_box label="Eu concordo com as definições do Corretor feitas acima."
-	     name="agree_covenant" />
+	<check_box label="Eu concordo com as definições do Corretor feitas acima." name="agree_covenant"/>
 	<text name="info_parcel_label">
 		Lote:
 	</text>
@@ -59,7 +58,7 @@
 	<text name="error_message">
 		Algo ainda não está correto.
 	</text>
-	<button label="Ir para a página" name="error_web" />
+	<button label="Ir para a página" name="error_web"/>
 	<text name="account_action">
 		Evoluir sua conta para membro Premium
 	</text>
@@ -81,8 +80,8 @@
 		Aumente sua taxa de locação de lote para US$ 40/mês.
 	</text>
 	<text name="land_use_reason">
-		Você possui 1,309 metros quadrados de terra.
-Este lote tem 512 metros quadrados.
+		Você possui 1.309 metros quadrados de terra. 
+Este terreno tem 512 metros quadrados de terra.
 	</text>
 	<text name="purchase_action">
 		Pagar ao Residente Joe L$4000 pelo lote
@@ -102,125 +101,125 @@ Este lote tem 512 metros quadrados.
 	<text name="currency_balance">
 		Você tem L$2,100.
 	</text>
-	<check_box label="Remover Contribuição do Grupo nas Aquisições"
-	     name="remove_contribution" />
-	<button label="Adquirir" name="buy_btn" />
-	<button label="Cancelar" name="cancel_btn" />
-	<text name="can_resell">
+	<check_box label="Remover Contribuição do Grupo nas Aquisições" name="remove_contribution"/>
+	<button label="Adquirir" name="buy_btn"/>
+	<button label="Cancelar" name="cancel_btn"/>
+	<string name="can_resell">
 		Pode ser revendida.
-	</text>
-	<text name="can_not_resell">
+	</string>
+	<string name="can_not_resell">
 		Não pode ser revendida.
-	</text>
-	<text name="can_change">
+	</string>
+	<string name="can_change">
 		Pode ser unida ou subdivida.
-	</text>
-	<text name="can_not_change">
+	</string>
+	<string name="can_not_change">
 		Não pode ser unida ou subdividida.
-	</text>
-	<text name="cant_buy_for_group">
+	</string>
+	<string name="cant_buy_for_group">
 		Você não tem permissão para comprar um lote para seu grupo ativo.
-	</text>
-	<text name="no_land_selected">
+	</string>
+	<string name="no_land_selected">
 		Nenhum lote selecionado.
-	</text>
-	<text name="multiple_parcels_selected">
-		Vários lotes diferentes selecionados. 
-Tente selecionar uma área menor.
-	</text>
-	<text name="no_permission">
+	</string>
+	<string name="multiple_parcels_selected">
+		Múltiplos e diferentes terrenos selecionados. Tente selecionar uma área menor.
+	</string>
+	<string name="no_permission">
 		Você não tem permissão para comprar um lote para seu grupo ativo.
-	</text>
-	<text name="parcel_not_for_sale">
+	</string>
+	<string name="parcel_not_for_sale">
 		O lote selecionado não está a venda.
-	</text>
-	<text name="group_already_owns">
+	</string>
+	<string name="group_already_owns">
 		O grupo já possui o lote.
-	</text>
-	<text name="you_already_own">
+	</string>
+	<string name="you_already_own">
 		Você já possui o lote.
-	</text>
-	<text name="set_to_sell_to_other">
+	</string>
+	<string name="set_to_sell_to_other">
 		O lote selecionado está configurado para ser vendido para outro grupo.
-	</text>
-	<text name="no_public_land">
+	</string>
+	<string name="no_public_land">
 		A área selecionada não é um lote público.
-	</text>
-	<text name="not_owned_by_you">
-		O lote possuído por outro proprietário está selecionado.
-Tente uma área menor.
-	</text>
-	<text name="processing">
+	</string>
+	<string name="not_owned_by_you">
+		Está selecionada uma terra pertencente a outro usuário. Tente selecionar uma área menor.
+	</string>
+	<string name="processing">
 		Processando sua compra...
  
 (Isso pode levar um minuto.)
-	</text>
-	<text name="fetching_error">
+	</string>
+	<string name="fetching_error">
 		Houve um erro ao buscar informações sobre compra de lotes.
-	</text>
-	<text name="buying_will">
+	</string>
+	<string name="buying_will">
 		Comprar este lote irá:
-	</text>
-	<text name="buying_for_group">
+	</string>
+	<string name="buying_for_group">
 		Comprar terra para o grupo:
-	</text>
-	<text name="cannot_buy_now">
+	</string>
+	<string name="cannot_buy_now">
 		Não foi possível comprar agora:
-	</text>
-	<text name="not_for_sale">
+	</string>
+	<string name="not_for_sale">
 		Não disponível para venda:
-	</text>
-	<text name="none_needed">
+	</string>
+	<string name="none_needed">
 		não necessário
-	</text>
-	<text name="must_upgrade">
+	</string>
+	<string name="must_upgrade">
 		Sua conta deve ser evoluída para adquirir um lote.
-	</text>
-	<text name="cant_own_land">
+	</string>
+	<string name="cant_own_land">
 		Sua conta pode possuir um lote.
-	</text>
-	<text name="first_purchase">
-		Esta será sua primeira compra de lote. Será a única vez que você poderá adquirir um lote reservado para &quot;Primeira Compra&quot;.
-	</text>
-	<text name="land_holdings">
+	</string>
+	<string name="land_holdings">
 		Você possui [BUYER] metros quadrados de terra.
-	</text>
-	<text name="pay_to_for_land">
+	</string>
+	<string name="pay_to_for_land">
 		Pagar L$ [AMOUNT] para [SELLER] por este lote
-	</text>
-	<text name="buy_for_US">
+	</string>
+	<string name="buy_for_US">
 		Comprar L$ [AMOUNT] por aproximadamente US$ [AMOUNT2] ,
-	</text>
-	<text name="parcel_meters">
+	</string>
+	<string name="parcel_meters">
 		Este lote está a [AMOUNT] metros quadrados.
-	</text>
-	<text name="premium_land">
+	</string>
+	<string name="premium_land">
 		Este lote é Premium, e irá cobrar como [AMOUNT] metros quadrados.
-	</text>
-	<text name="discounted_land">
+	</string>
+	<string name="discounted_land">
 		Este lote é promocional, e será cobrado como [AMOUNT] metros quadrados.
-	</text>
-	<text name="meters_supports_object">
+	</string>
+	<string name="meters_supports_object">
 		[AMOUNT] metros quadrados
 suporta [AMOUNT2] objetos
-	</text>
-	<text name="sold_with_objects">
+	</string>
+	<string name="sold_with_objects">
 		vendido com objetos
-	</text>
-	<text name="insufficient_land_credits">
+	</string>
+	<string name="insufficient_land_credits">
 		O grupo [GROUP] precisará de fundos suficientes de terras
 contribuídas para cobrir este lote antes da aquisição se completar.
-	</text>
-	<text name="have_enough_lindens">
+	</string>
+	<string name="have_enough_lindens">
 		Você tem L$ [AMOUNT], o qual é suficiente para comprar este lote.
-	</text>
-	<text name="not_enough_lindens">
+	</string>
+	<string name="not_enough_lindens">
 		Você tem somente L$ [AMOUNT], e precisa de mais L$ [AMOUNT2].
-	</text>
-	<text name="balance_left">
+	</string>
+	<string name="balance_left">
 		Após a compra, restará L$ [AMOUNT].
-	</text>
-	<text name="balance_needed">
+	</string>
+	<string name="balance_needed">
 		Você precisa comprar pelo menos L$ [AMOUNT] para ter recursos para este lote.
-	</text>
+	</string>
+	<string name="no_parcel_selected">
+		(nenhum terreno selecionado)
+	</string>
+	<string name="buy_currency">
+		Comprar L$ [LINDENS] por aproxim. US$ [USD]
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_object.xml b/indra/newview/skins/default/xui/pt/floater_buy_object.xml
index b8f2ba7c19..ccf86472de 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_object.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="contents" title="Comprar cópia do objeto">
 	<text name="contents_text">
 		e isso contém:
@@ -6,6 +6,21 @@
 	<text name="buy_text">
 		Comprar por L$[AMOUNT] de(a) [NAME]?
 	</text>
-	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn" />
-	<button label="Comprar" label_selected="Comprar" name="buy_btn" />
+	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	<button label="Comprar" label_selected="Comprar" name="buy_btn"/>
+	<string name="title_buy_text">
+		Comprar
+	</string>
+	<string name="title_buy_copy_text">
+		Comprar uma cópia de
+	</string>
+	<string name="no_copy_text">
+		(sem copiar)
+	</string>
+	<string name="no_modify_text">
+		(sem modificar)
+	</string>
+	<string name="no_transfer_text">
+		(sem transferir)
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_customize.xml b/indra/newview/skins/default/xui/pt/floater_customize.xml
index 417aec95ef..13c92a9f96 100644
--- a/indra/newview/skins/default/xui/pt/floater_customize.xml
+++ b/indra/newview/skins/default/xui/pt/floater_customize.xml
@@ -1,437 +1,427 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater customize" title="Aparência">
 	<tab_container name="customize tab container">
-		<panel label="Partes de Corpo" />
+		<panel label="Partes de corpo" name="body_parts_placeholder"/>
 		<panel label="Forma" name="Shape">
-			<button label="Reverter" label_selected="Reverter" name="Revert" />
-			<button label="Corpo" label_selected="Corpo" name="Body" />
-			<button label="Cabeça" label_selected="Cabeça" name="Head" />
-			<button label="Olhos" label_selected="Olhos" name="Eyes" />
-			<button label="Orelhas" label_selected="Orelhas" name="Ears" />
-			<button label="Nariz" label_selected="Nariz" name="Nose" />
-			<button label="Boca" label_selected="Boca" name="Mouth" />
-			<button label="Queixo" label_selected="Queixo" name="Chin" />
-			<button label="Tórax" label_selected="Tórax" name="Torso" />
-			<button label="Pernas" label_selected="Pernas" name="Legs" />
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
+			<button label="Corpo" label_selected="Corpo" name="Body"/>
+			<button label="Cabeça" label_selected="Cabeça" name="Head"/>
+			<button label="Olhos" label_selected="Olhos" name="Eyes"/>
+			<button label="Orelhas" label_selected="Orelhas" name="Ears"/>
+			<button label="Nariz" label_selected="Nariz" name="Nose"/>
+			<button label="Boca" label_selected="Boca" name="Mouth"/>
+			<button label="Queixo" label_selected="Queixo" name="Chin"/>
+			<button label="Tórax" label_selected="Tórax" name="Torso"/>
+			<button label="Pernas" label_selected="Pernas" name="Legs"/>
 			<radio_group name="sex radio">
-				<radio_item type="string" length="1" name="radio">
+				<radio_item length="1" name="radio" type="string">
 					Feminino
 				</radio_item>
-				<radio_item type="string" length="1" name="radio2">
+				<radio_item length="1" name="radio2" type="string">
 					Masculino
 				</radio_item>
 			</radio_group>
-			<button label="Aleatório" label_selected="Aleatório" name="Randomize" />
-			<text type="string" length="1" name="title">
+			<button label="Aleatório" label_selected="Aleatório" name="Randomize"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: não foi possível modificar
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: carregando...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: não vestido
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Localizado em [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Coloque um novo formato arrastando um dos seus de seu  inventário para seu avatar. Alternativamente, você pode criar um novo a partir deste e usá-lo.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Você não tem permissão para modificar esta vestimenta.
 			</text>
-			<button label="Criar Nova Forma" label_selected="Criar Nova Forma" name="Create New" />
-			<button label="Remover" label_selected="Remover" name="Take Off" />
-			<button label="Salvar" label_selected="Salvar" name="Save" />
-			<button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
+			<button label="Criar Nova Forma" label_selected="Criar Nova Forma" name="Create New"/>
+			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
 		</panel>
 		<panel label="Pele" name="Skin">
-			<button label="Cor de Pele" label_selected="Cor de Pele" name="Skin Color" />
-			<button label="Detalhes Faciais" label_selected="Detalhes Faciais" name="Face Detail" />
-			<button label="Maquiagem" label_selected="Maquiagem" name="Makeup" />
-			<button label="Detalhes do Corpo" label_selected="Detalhes do Corpo" name="Body Detail" />
-			<text type="string" length="1" name="title">
+			<button label="Cor de Pele" label_selected="Cor de Pele" name="Skin Color"/>
+			<button label="Detalhes Faciais" label_selected="Detalhes Faciais" name="Face Detail"/>
+			<button label="Maquiagem" label_selected="Maquiagem" name="Makeup"/>
+			<button label="Detalhes do Corpo" label_selected="Detalhes do Corpo" name="Body Detail"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: não foi possível modificar
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: carregando..
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: não vestido
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Localizada em [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Coloque uma nova pele arrastando uma de seu inventário para seu avatar. Alternativamente, você pode criar uma nova forma a partir deste e usá-lo.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Você não tem permissão para modificar esta vestimenta.
 			</text>
-			<texture_picker label="Tatuagens para cabeça" name="Head Tattoos"
-			     tool_tip="Clique para escolher um desenho" />
-			<texture_picker label="Tattoos Superiores" name="Upper Tattoos"
-			     tool_tip="Clique para escolher um desenho" />
-			<texture_picker label="Tattoos Inferiores" name="Lower Tattoos"
-			     tool_tip="Clique para escolher um desenho" />
-			<button label="Aleatório" label_selected="Aleatório" name="Randomize" />
-			<button label="Criar Nova Pele" label_selected="Criar Nova Pele" name="Create New" />
-			<button label="Remover" label_selected="Remover" name="Take Off" />
-			<button label="Salvar" label_selected="Salvar" name="Save" />
-			<button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-			<button label="Reverter" label_selected="Reverter" name="Revert" />
+			<texture_picker label="Tatuagens para cabeça" name="Head Tattoos" tool_tip="Clique para escolher um desenho"/>
+			<texture_picker label="Tattoos Superiores" name="Upper Tattoos" tool_tip="Clique para escolher um desenho"/>
+			<texture_picker label="Tattoos Inferiores" name="Lower Tattoos" tool_tip="Clique para escolher um desenho"/>
+			<button label="Aleatório" label_selected="Aleatório" name="Randomize"/>
+			<button label="Criar Nova Pele" label_selected="Criar Nova Pele" name="Create New"/>
+			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
 		</panel>
 		<panel label="Cabelo" name="Hair">
-			<button label="Cor" label_selected="Cor" name="Color" />
-			<button label="Estilo" label_selected="Estilo" name="Style" />
-			<button label="Sombrancelhas" label_selected="Sombrancelhas" name="Eyebrows" />
-			<button label="Rosto" label_selected="Rosto" name="Facial" />
-			<text type="string" length="1" name="title">
+			<button label="Cor" label_selected="Cor" name="Color"/>
+			<button label="Estilo" label_selected="Estilo" name="Style"/>
+			<button label="Sombrancelhas" label_selected="Sombrancelhas" name="Eyebrows"/>
+			<button label="Rosto" label_selected="Rosto" name="Facial"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: não foi possível modificar
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: carregando...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: não vestido
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Localizado em [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Ponha um novo cabelo em seu avatar arrastando um do seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Você não ter permissão para modificar essa vestimenta.
 			</text>
-			<texture_picker label="Texture" name="Texture" tool_tip="Clique para escolher uma imagem" />
-			<button label="Aleatório" label_selected="Aleatório" name="Randomize" />
-			<button label="Criar Novo Cabelo" label_selected="Criar Novo Cabelo" name="Create New" />
-			<button label="Remover" label_selected="Remover" name="Take Off" />
-			<button label="Salvar" label_selected="Salvar" name="Save" />
-			<button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-			<button label="Reverter" label_selected="Reverter" name="Revert" />
+			<texture_picker label="Texture" name="Texture" tool_tip="Clique para escolher uma imagem"/>
+			<button label="Aleatório" label_selected="Aleatório" name="Randomize"/>
+			<button label="Criar Novo Cabelo" label_selected="Criar Novo Cabelo" name="Create New"/>
+			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
 		</panel>
 		<panel label="Olhos" name="Eyes">
-			<text type="string" length="1" name="title">
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: não foi possível modificar
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: carregando...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: não vestido
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Localizado em [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Para colocar novos olhos, arraste um do seu inventário para seu avatar. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Você não tem permissão para alterar esta vestimenta.
 			</text>
-			<texture_picker label="Iris" name="Iris" tool_tip="Clique para escolher uma imagem" />
-			<button label="Aleatório" label_selected="Aleatório" name="Randomize" />
-			<button label="Criar Novos Olhos" label_selected="Criar Novos Olhos" name="Create New" />
-			<button label="Remover" label_selected="Remover" name="Take Off" />
-			<button label="Salvar" label_selected="Salvar" name="Save" />
-			<button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-			<button label="Reverter" label_selected="Reverter" name="Revert" />
+			<texture_picker label="Iris" name="Iris" tool_tip="Clique para escolher uma imagem"/>
+			<button label="Aleatório" label_selected="Aleatório" name="Randomize"/>
+			<button label="Criar Novos Olhos" label_selected="Criar Novos Olhos" name="Create New"/>
+			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
 		</panel>
-		<panel label="Roupas" />
+		<panel label="Roupas" name="clothes_placeholder"/>
 		<panel label="Camisa" name="Shirt">
-			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
-			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas" />
-			<button label="Criar Nova Camisa" label_selected="Criar Nova Camisa" name="Create New" />
-			<button label="Remover" label_selected="Remover" name="Take Off" />
-			<button label="Salvar" label_selected="Salvar" name="Save" />
-			<button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-			<button label="Reverter" label_selected="Reverter" name="Revert" />
-			<text type="string" length="1" name="title">
+			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+			<button label="Criar Nova Camisa" label_selected="Criar Nova Camisa" name="Create New"/>
+			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: não foi possível modificar
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: carregando...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: não vestido
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Localizado em [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Para por uma nova camisa em seu avatar, arraste uma nova do seu inventário para seu avatar. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Você não ter permissão para modificar esta vestimenta.
 			</text>
 		</panel>
 		<panel label="Calças" name="Pants">
-			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
-			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas." />
-			<button label="Criar Novas Calças" label_selected="Criar Novas Calças"
-			     name="Create New" />
-			<button label="Remover" label_selected="Remover" name="Take Off" />
-			<button label="Salvar" label_selected="Salvar" name="Save" />
-			<button label="Salvar como" label_selected="Salvar Como" name="Save As" />
-			<button label="Reverter" label_selected="Reverter" name="Revert" />
-			<text type="string" length="1" name="title">
+			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas."/>
+			<button label="Criar Novas Calças" label_selected="Criar Novas Calças" name="Create New"/>
+			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar como" label_selected="Salvar Como" name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: não foi possível modificar
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: carregando...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: não vestindo
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Localizado em [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Para por uma nova calça em seu avatar, basta arrastar uma outra do seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Você não tem permissão para modificar esta vestimenta.
 			</text>
 		</panel>
 		<panel label="Calçados" name="Shoes">
-			<text type="string" length="1" name="title">
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: não foi possível modificar
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: carregando...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: não vestido
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Localizado em [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Para por novos calçados em seu avatar, basta arrastar um novo do seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Você não tem permissão para modificar esta vestimenta.
 			</text>
-			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
-			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas" />
-			<button label="Criar Novos Sapatos" label_selected="Criar Novos Sapatos"
-			     name="Create New" />
-			<button label="Despir" label_selected="Despir" name="Take Off" />
-			<button label="Salvar" label_selected="Salvar" name="Save" />
-			<button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-			<button label="Reverter" label_selected="Reverter" name="Revert" />
+			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+			<button label="Criar Novos Sapatos" label_selected="Criar Novos Sapatos" name="Create New"/>
+			<button label="Despir" label_selected="Despir" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
 		</panel>
 		<panel label="Meias" name="Socks">
-			<text type="string" length="1" name="title">
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: não foi possível modificar
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: carregando...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: não vestido.
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Localizado em [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Para por uma nova meia em seu avatar, basta arrastar uma nova do seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Você não tem permissão para modificar essa vestimenta.
 			</text>
-			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
-			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas" />
-			<button label="Criar Novas Meias" label_selected="Criar Novas Meias" name="Create New" />
-			<button label="Remover" label_selected="Remover" name="Take Off" />
-			<button label="Salvar" label_selected="Salvar" name="Save" />
-			<button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-			<button label="Reverter" label_selected="Reverter" name="Revert" />
+			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+			<button label="Criar Novas Meias" label_selected="Criar Novas Meias" name="Create New"/>
+			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
 		</panel>
 		<panel label="Jaqueta" name="Jacket">
-			<text type="string" length="1" name="title">
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: Não foi possível modificar
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: carregando...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: não vestido
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Localizado em [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Para por uma nova jaqueta em seu avatar, basta arrastar um novo modelo do seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Você não tem permissão para modificar esta vestimenta.
 			</text>
-			<texture_picker label="Tecido Superior" name="Upper Fabric"
-			     tool_tip="Clique para escolher uma imagem." />
-			<texture_picker label="Tecido Inferior" name="Lower Fabric"
-			     tool_tip="Clique para escolher uma imagem." />
-			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas" />
-			<button label="Criar Nova Jaqueta" label_selected="Criar Nova Jaqueta"
-			     name="Create New" />
-			<button label="Remover" label_selected="Remover" name="Take Off" />
-			<button label="Salvar" label_selected="Salvar" name="Save" />
-			<button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-			<button label="Reverter" label_selected="Reverter" name="Revert" />
+			<texture_picker label="Tecido Superior" name="Upper Fabric" tool_tip="Clique para escolher uma imagem."/>
+			<texture_picker label="Tecido Inferior" name="Lower Fabric" tool_tip="Clique para escolher uma imagem."/>
+			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+			<button label="Criar Nova Jaqueta" label_selected="Criar Nova Jaqueta" name="Create New"/>
+			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
 		</panel>
 		<panel label="Luvas" name="Gloves">
-			<text type="string" length="1" name="title">
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: não foi possível modificar
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: carregando....
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: não vestido
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Localizado em [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Pra por uma nova jaqueta em seu avatar, basta arastar um novo modelo do seu inventário. Alternativamente, você pode criar uma novo modlo a partir deste e usá-lo.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Você não tem permissão para modificar essa vestimenta.
 			</text>
-			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
-			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas" />
-			<button label="Criar Novas Luvas" label_selected="Criar Novas Luvas" name="Create New" />
-			<button label="Remover" label_selected="Remover" name="Take Off" />
-			<button label="Salvar" label_selected="Salvar" name="Save" />
-			<button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-			<button label="Reverter" label_selected="Reverter" name="Revert" />
+			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas"/>
+			<button label="Criar Novas Luvas" label_selected="Criar Novas Luvas" name="Create New"/>
+			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
 		</panel>
 		<panel label="Camiseta" name="Undershirt">
-			<text type="string" length="1" name="title">
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: não foi possível modificar
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: carregando...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: não vestido
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Localizado em [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Para por uma nova Camiseta em seu avatar, basta arrastar um novo modelo de seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Você não ter permissão para modificar essa vestimenta.
 			</text>
-			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
-			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas" />
-			<button label="Criar Nova Roupa de Baixo" label_selected="Criar Nova Roupa de Baixo"
-			     name="Create New" />
-			<button label="Remover" label_selected="Remover" name="Take Off" />
-			<button label="Salvar" label_selected="Salvar" name="Save" />
-			<button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-			<button label="Reverter" label_selected="Reverter" name="Revert" />
+			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas"/>
+			<button label="Criar Nova Roupa de Baixo" label_selected="Criar Nova Roupa de Baixo" name="Create New"/>
+			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
 		</panel>
 		<panel label="Roupas de Baixo" name="Underpants">
-			<text type="string" length="1" name="title">
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: não foi possível modificar
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: carregando...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: não vestido
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Localizado em [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Para por novas roupas de baixo em seu avatar, basta arrastar um novo modelo do seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Você não tem permissão para modificar essa vestimenta.
 			</text>
-			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
-			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas" />
-			<button label="Criar Novas Roupas de Baixo"
-			     label_selected="Criar Novas Roupas de Baixo" name="Create New" />
-			<button label="Remover" label_selected="Remover" name="Take Off" />
-			<button label="Salvar" label_selected="Salvar" name="Save" />
-			<button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-			<button label="Reverter" label_selected="Reverter" name="Revert" />
+			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+			<button label="Criar Novas Roupas de Baixo" label_selected="Criar Novas Roupas de Baixo" name="Create New"/>
+			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
 		</panel>
 		<panel label="Saia" name="Skirt">
-			<text type="string" length="1" name="title">
+			<text length="1" name="title" type="string">
 				[DESC]
 			</text>
-			<text type="string" length="1" name="title_no_modify">
+			<text length="1" name="title_no_modify" type="string">
 				[DESC]: não foi possível modificar
 			</text>
-			<text type="string" length="1" name="title_loading">
+			<text length="1" name="title_loading" type="string">
 				[DESC]: carregando...
 			</text>
-			<text type="string" length="1" name="title_not_worn">
+			<text length="1" name="title_not_worn" type="string">
 				[DESC]: não vestido
 			</text>
-			<text type="string" length="1" name="path">
+			<text length="1" name="path" type="string">
 				Localizado em [PATH]
 			</text>
-			<text type="string" length="1" name="not worn instructions">
+			<text length="1" name="not worn instructions" type="string">
 				Para por uma nova saia em seu avatar, basta arrastar um novo modelo do seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
 			</text>
-			<text type="string" length="1" name="no modify instructions">
+			<text length="1" name="no modify instructions" type="string">
 				Você não tem permissão para modificar essa vestimenta.
 			</text>
-			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
-			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Click to open Color Picker" />
-			<button label="Criar Nova Saia" label_selected="Criar Nova Saia" name="Create New" />
-			<button label="Remover" label_selected="Remover" name="Take Off" />
-			<button label="Salvar" label_selected="Salvar" name="Save" />
-			<button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-			<button label="Reverter" label_selected="Reverter" name="Revert" />
+			<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+			<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Click to open Color Picker"/>
+			<button label="Criar Nova Saia" label_selected="Criar Nova Saia" name="Create New"/>
+			<button label="Remover" label_selected="Remover" name="Take Off"/>
+			<button label="Salvar" label_selected="Salvar" name="Save"/>
+			<button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+			<button label="Reverter" label_selected="Reverter" name="Revert"/>
 		</panel>
 	</tab_container>
-	<button label="Criar Visual" label_selected="Criar Visual" name="Make Outfit" />
-	<button label="Salvar Tudo" label_selected="Salvar Tudo" name="Save All" />
-	<button label="Fechar" label_selected="Fechar" name="Close" />
+	<button label="Fechar" label_selected="Fechar" name="Close"/>
+	<button label="Salvar Tudo" label_selected="Salvar Tudo" name="Save All"/>
+	<button label="Criar Visual" label_selected="Criar Visual" name="Make Outfit"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_gesture.xml b/indra/newview/skins/default/xui/pt/floater_gesture.xml
index 7fd928bb57..ae104c6b51 100644
--- a/indra/newview/skins/default/xui/pt/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/pt/floater_gesture.xml
@@ -1,17 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="gestures" title="Ativar gestos">
 	<text name="help_label">
-		Digite uma palavra-chave ou pressione uma tecla para executar um som ou animação.
+		Clicar duas vezes no gesto para executar animações e sons.
 	</text>
-	<scroll_list name="gesture_list">
-		<column label="Gatilho" name="trigger" />
-		<column label="Tecla" name="shortcut" />
-		<column label="" name="key" />
-		<column label="Nome" name="name" />
-	</scroll_list>
-	<button label="Novo" name="new_gesture_btn" />
-	<button label="Inventário" name="inventory_btn" />
-	<button label="Editar" name="edit_btn" />
-	<button label="Executar" name="play_btn" />
-	<button label="Parar" name="stop_btn" />
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_im.xml b/indra/newview/skins/default/xui/pt/floater_im.xml
index f79a1722d0..81090d5315 100644
--- a/indra/newview/skins/default/xui/pt/floater_im.xml
+++ b/indra/newview/skins/default/xui/pt/floater_im.xml
@@ -1,21 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <multi_floater name="im_floater" title="Mensagem Instantânea">
-	<text name="only_user_message">
+	<string name="only_user_message">
 		Você é o único usuário desta sessão.
-	</text>
-	<text name="offline_message">
+	</string>
+	<string name="offline_message">
 		[FIRST] [LAST] está offline.
-	</text>
-	<text name="generic_request_error">
+	</string>
+	<string name="invite_message">
+		Clique no botão [BUTTON NAME] para aceitar/ conectar para esse pate- papo em voz.
+	</string>
+	<string name="muted_message">
+		Você emudeceu este residente. Enviar uma mensagem vai automaticamente reativá-lo novamente .
+	</string>
+	<string name="generic_request_error">
 		Erro na requisição, por favor, tente novamente.
-	</text>
-	<text name="insufficient_perms_error">
+	</string>
+	<string name="insufficient_perms_error">
 		Você não tem permissões suficientes.
-	</text>
-	<text name="user_no_help">
-		O usuário requisitado não está mais nessa sessão de ajuda.
-	</text>
-	<text name="removed_from_group">
+	</string>
+	<string name="session_does_not_exist_error">
+		A sessão deixou de existir
+	</string>
+	<string name="no_ability_error">
+		Você não possui esta habilidade.
+	</string>
+	<string name="not_a_mod_error">
+		Você não é um moderador de sessão.
+	</string>
+	<string name="muted_error">
+		Moderador do grupo desabilitou seu bate-papo em texto.
+	</string>
+	<string name="add_session_event">
+		Não foi possível adicionar usuários na sessão de bate-papo com [RECIPIENT].
+	</string>
+	<string name="message_session_event">
+		Não foi possível enviar sua mensagem na sessão de bate- papo com [RECIPIENT].
+	</string>
+	<string name="removed_from_group">
 		Você foi removido do grupo.
-	</text>
+	</string>
+	<string name="close_on_no_ability">
+		Você não possui mais a habilidade de estar na sessão de bate- papo.
+	</string>
 </multi_floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_image_preview.xml b/indra/newview/skins/default/xui/pt/floater_image_preview.xml
index 94285eea60..a9f270c11d 100644
--- a/indra/newview/skins/default/xui/pt/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_image_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Image Preview" title="">
 	<text name="name_label">
 		Nome:
@@ -44,6 +44,7 @@
 	<text name="bad_image_text">
 		Incapaz de ler a imagem.Tente salvar a imagem como 24 bit Targa (.tga).
 	</text>
-	<button label="Cancelar" name="cancel_btn" />
-	<button label="Upload (L$[AMOUNT])" name="ok_btn" />
+	<check_box label="Usar compressão com menor perda" name="lossless_check"/>
+	<button label="Cancelar" name="cancel_btn"/>
+	<button label="Upload (L$[AMOUNT])" name="ok_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory.xml b/indra/newview/skins/default/xui/pt/floater_inventory.xml
index b34895f85d..a57573b5d1 100644
--- a/indra/newview/skins/default/xui/pt/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory.xml
@@ -1,49 +1,47 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Inventory" title="Inventário">
+	<search_editor label="Escreva aqui para busca" name="inventory search editor"/>
 	<tab_container name="inventory filter tabs">
-		<inventory_panel label="Todos os Itens" name="All Items" />
-		<inventory_panel label="Itens Recentes" name="Recent Items" />
+		<inventory_panel label="Todos os Itens" name="All Items"/>
+		<inventory_panel label="Itens Recentes" name="Recent Items"/>
 	</tab_container>
 	<menu_bar name="Inventory Menu">
 		<menu label="Arquivo" name="File">
-			<menu_item_call label="Abrir" name="Open" />
-			<menu_item_call label="Nova Janela" name="New Window" />
-			<menu_item_call label="Mostrar Filtros" name="Show Filters" />
-			<menu_item_call label="Fechar Todas as Pastas" name="Close All Folders" />
-			<menu_item_call label="Limpar Lixeira" name="Empty Trash" />
+			<menu_item_call label="Abrir" name="Open"/>
+			<menu_item_call label="Nova Janela" name="New Window"/>
+			<menu_item_call label="Mostrar Filtros" name="Show Filters"/>
+			<menu_item_call label="Redefinir Filtros" name="Reset Current"/>
+			<menu_item_call label="Fechar Todas as Pastas" name="Close All Folders"/>
+			<menu_item_call label="Limpar Lixeira" name="Empty Trash"/>
 		</menu>
 		<menu label="Criar" name="Create">
-			<menu_item_call label="Nova Pasta" name="New Folder" />
-			<menu_item_call label="Novo Script" name="New Script" />
-			<menu_item_call label="Nova Nota" name="New Note" />
-			<menu_item_call label="Novo Gesto" name="New Gesture" />
+			<menu_item_call label="Nova Pasta" name="New Folder"/>
+			<menu_item_call label="Novo Script" name="New Script"/>
+			<menu_item_call label="Nova Nota" name="New Note"/>
+			<menu_item_call label="Novo Gesto" name="New Gesture"/>
 			<menu label="Nova Roupa" name="New Clothes">
-				<menu_item_call label="Nova Camisa" name="New Shirt" />
-				<menu_item_call label="Nova Calça" name="New Pants" />
-				<menu_item_call label="Novos Sapatos" name="New Shoes" />
-				<menu_item_call label="Novas Meias" name="New Socks" />
-				<menu_item_call label="Nova Jaqueta" name="New Jacket" />
-				<menu_item_call label="Nova Saia" name="New Skirt" />
-				<menu_item_call label="Novas Luvas" name="New Gloves" />
-				<menu_item_call label="Nova Anágua" name="New Undershirt" />
-				<menu_item_call label="Novas Roupas de Baixo" name="New Underpants" />
+				<menu_item_call label="Nova Camisa" name="New Shirt"/>
+				<menu_item_call label="Nova Calça" name="New Pants"/>
+				<menu_item_call label="Novos Sapatos" name="New Shoes"/>
+				<menu_item_call label="Novas Meias" name="New Socks"/>
+				<menu_item_call label="Nova Jaqueta" name="New Jacket"/>
+				<menu_item_call label="Nova Saia" name="New Skirt"/>
+				<menu_item_call label="Novas Luvas" name="New Gloves"/>
+				<menu_item_call label="Nova Anágua" name="New Undershirt"/>
+				<menu_item_call label="Novas Roupas de Baixo" name="New Underpants"/>
 			</menu>
 			<menu label="Parte do corpo" name="New Body Parts">
-				<menu_item_call label="Nova Forma" name="New Shape" />
-				<menu_item_call label="Nova Pele" name="New Skin" />
-				<menu_item_call label="Novo Cabelo" name="New Hair" />
-				<menu_item_call label="Novos Olhos" name="New Eyes" />
+				<menu_item_call label="Nova Forma" name="New Shape"/>
+				<menu_item_call label="Nova Pele" name="New Skin"/>
+				<menu_item_call label="Novo Cabelo" name="New Hair"/>
+				<menu_item_call label="Novos Olhos" name="New Eyes"/>
 			</menu>
 		</menu>
 		<menu label="Organizar" name="Sort">
-			<menu_item_check label="Por Nome" name="By Name" />
-			<menu_item_check label="Por Data" name="By Date" />
-			<menu_item_check label="Pastas Sempre por Nome" name="Folders Always By Name" />
-			<menu_item_check label="Pastas em primeiro" name="System Folders To Top" />
-		</menu>
-		<menu label="Filtros" name="Filters">
-			<menu_item_check label="Modificar Conteúdo" name="Modify Current" />
-			<menu_item_call label="Reiniciar Atual" name="Reset Current" />
+			<menu_item_check label="Por Nome" name="By Name"/>
+			<menu_item_check label="Por Data" name="By Date"/>
+			<menu_item_check label="Pastas Sempre por Nome" name="Folders Always By Name"/>
+			<menu_item_check label="Pastas em primeiro" name="System Folders To Top"/>
 		</menu>
 	</menu_bar>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
index 4cc6797756..e73d15ffc9 100644
--- a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="item properties" title="Propriedades">
 	<text name="LabelItemNameTitle">
 		Nome:
@@ -12,14 +12,14 @@
 	<text name="LabelCreatorName">
 		Nicole Linden
 	</text>
-	<button label="Perfil..." label_selected="" name="BtnCreator" />
+	<button label="Perfil..." label_selected="" name="BtnCreator"/>
 	<text name="LabelOwnerTitle">
 		Dono:
 	</text>
 	<text name="LabelOwnerName">
 		Thrax Linden
 	</text>
-	<button label="Perfil..." label_selected="" name="BtnOwner" />
+	<button label="Perfil..." label_selected="" name="BtnOwner"/>
 	<text name="LabelAcquiredTitle">
 		Adquirido:
 	</text>
@@ -29,9 +29,9 @@
 	<text name="OwnerLabel">
 		Você pode:
 	</text>
-	<check_box label="Modificar" name="CheckOwnerModify" />
-	<check_box label="Copiar" name="CheckOwnerCopy" />
-	<check_box label="Revender/Doar" name="CheckOwnerTransfer" />
+	<check_box label="Modificar" name="CheckOwnerModify"/>
+	<check_box label="Copiar" name="CheckOwnerCopy"/>
+	<check_box label="Revender/Doar" name="CheckOwnerTransfer"/>
 	<text name="BaseMaskDebug">
 		B:
 	</text>
@@ -47,18 +47,18 @@
 	<text name="NextMaskDebug">
 		N:
 	</text>
-	<check_box label="Compartilhar com o grupo" name="CheckShareWithGroup" />
-	<check_box label="Permitir qualquer um copiar" name="CheckEveryoneCopy" />
+	<check_box label="Compartilhar com o grupo" name="CheckShareWithGroup"/>
+	<check_box label="Permitir qualquer um copiar" name="CheckEveryoneCopy"/>
 	<text name="NextOwnerLabel">
 		Próximo dono pode:
 	</text>
-	<check_box label="Modificar" name="CheckNextOwnerModify" />
-	<check_box label="Copiar" name="CheckNextOwnerCopy" />
-	<check_box label="Revender/Doar" name="CheckNextOwnerTransfer" />
+	<check_box label="Modificar" name="CheckNextOwnerModify"/>
+	<check_box label="Copiar" name="CheckNextOwnerCopy"/>
+	<check_box label="Revender/Doar" name="CheckNextOwnerTransfer"/>
 	<text name="SaleLabel">
 		Marcar Item:
 	</text>
-	<check_box label="A venda" name="CheckPurchase" />
+	<check_box label="A venda" name="CheckPurchase"/>
 	<radio_group name="RadioSaleType">
 		<radio_item name="radio">
 			Original
@@ -70,4 +70,16 @@
 	<text name="TextPrice">
 		Price:  L$
 	</text>
+	<string name="unknown">
+		(desconhecido)
+	</string>
+	<string name="public">
+		(público)
+	</string>
+	<string name="you_can">
+		Você pode:
+	</string>
+	<string name="owner_can">
+		Proprietário pode :
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_joystick.xml b/indra/newview/skins/default/xui/pt/floater_joystick.xml
index 136c4a8fdf..5291a9632c 100644
--- a/indra/newview/skins/default/xui/pt/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/pt/floater_joystick.xml
@@ -1,3 +1,84 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Joystick" title="Joystick Configuration">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Joystick" title="Configuração do Joystick">
+	<check_box name="enable_joystick">
+		Habilitar Joystick:
+	</check_box>
+	<spinner label="Mapeamento do eixo X" name="JoystickAxis1"/>
+	<spinner label="Mapeamento do eixo Y" name="JoystickAxis2"/>
+	<spinner label="Mapeamento do Eixo Z" name="JoystickAxis0"/>
+	<spinner label="Mapeamento da Elevação" name="JoystickAxis4"/>
+	<spinner label="Mapeamento da Guinada" name="JoystickAxis5"/>
+	<spinner label="Mapeamento da Rolagem" name="JoystickAxis3"/>
+	<spinner label="Mapeamento do Zoom" name="JoystickAxis6"/>
+	<check_box label="Zoom Direto" name="ZoomDirect"/>
+	<check_box label="Cursor 3D" name="Cursor3D"/>
+	<check_box label="Nível Automático" name="AutoLeveling"/>
+	<text name="Control Modes:">
+		Modos de Controle:
+	</text>
+	<check_box name="JoystickAvatarEnabled">
+		Avatar
+	</check_box>
+	<check_box name="JoystickBuildEnabled">
+		Construir
+	</check_box>
+	<check_box name="JoystickFlycamEnabled">
+		Camera aérea
+	</check_box>
+	<text name="XScale">
+		Escala X
+	</text>
+	<text name="YScale">
+		Escala Y
+	</text>
+	<text name="ZScale">
+		Escala Z
+	</text>
+	<text name="PitchScale">
+		Escala de Elevação
+	</text>
+	<text name="YawScale">
+		Escala da Guinada
+	</text>
+	<text name="RollScale">
+		Escala de Rolagem
+	</text>
+	<text name="XDeadZone">
+		Zona Morta X
+	</text>
+	<text name="YDeadZone">
+		Zona Morta Y
+	</text>
+	<text name="ZDeadZone">
+		Zona Morta Z
+	</text>
+	<text name="PitchDeadZone">
+		Zona Morta da Elevação
+	</text>
+	<text name="YawDeadZone">
+		Zona Morta da Guinada
+	</text>
+	<text name="RollDeadZone">
+		Zona Morta de Rolagem
+	</text>
+	<text name="Feathering">
+		Alisar
+	</text>
+	<slider label="" name="FlycamFeathering"/>
+	<text name="ZoomScale2">
+		Escala de Zoom
+	</text>
+	<text name="ZoomDeadZone">
+		Zona Morta de Zoom
+	</text>
+	<button label="Padrões do Navegador Espacial" name="SpaceNavigatorDefaults"/>
+	<string name="JoystickMonitor">
+		Monitor do Joystick
+	</string>
+	<string name="Axis">
+		Eixo [NUM]
+	</string>
+	<string name="NoDevice">
+		nenhum dispositivo detectado
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_land_holdings.xml b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
index 6d2acca5d3..8f0cffa453 100644
--- a/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
@@ -1,38 +1,39 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="land holdings floater" title="Meu terreno">
 	<scroll_list name="parcel list">
-		<column label="Nome" name="name" />
-		<column label="Localização" name="location" />
-		<column label="Área" name="area" />
-		<column label="" name="hidden" />
+		<column label="Nome" name="name"/>
+		<column label="Localização" name="location"/>
+		<column label="Área" name="area"/>
+		<column label="" name="hidden"/>
 	</scroll_list>
-	<button label="Teleporte" label_selected="Teleporte" name="Teleport"
-	     tool_tip="Teleportar para o centro do terreno." />
-	<button label="Mostrar no mapa" label_selected="Mostrar no mapa" name="Show on Map"
-	     tool_tip="Mostrar esse terreno no mapa do mundo." />
+	<button label="Teleporte" label_selected="Teleporte" name="Teleport" tool_tip="Teleportar para o centro do terreno."/>
+	<button label="Mostrar no mapa" label_selected="Mostrar no mapa" name="Show on Map" tool_tip="Mostrar esse terreno no mapa do mundo."/>
 	<text name="contrib_label">
 		Contribuições para os seus grupos:
 	</text>
 	<scroll_list name="grant list">
-		<column label="Grupo" name="group" />
-		<column label="Área" name="area" />
+		<column label="Grupo" name="group"/>
+		<column label="Área" name="area"/>
 	</scroll_list>
 	<text name="allowed_label">
 		Permitir marcações no terreno.
 	</text>
 	<text name="allowed_text">
-		0 m²
+		[AREA] m2
 	</text>
 	<text name="current_label">
 		Marcações atuais:
 	</text>
 	<text name="current_text">
-		0 m²
+		[AREA] m2
 	</text>
 	<text name="available_label">
 		Disponivel para compra de terras:
 	</text>
 	<text name="available_text">
-		0 m²
+		[AREA] m2
 	</text>
+	<string name="area_string">
+		[AREA] m2
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
index 9753b38f8e..5bf9b6ffdb 100644
--- a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
@@ -1,5 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script ed float" title="Script: Novo Script">
-	<button label="Resetar" label_selected="Resetar" name="Reset" />
-	<check_box label="Correndo" name="running" />
+	<button label="Resetar" label_selected="Resetar" name="Reset"/>
+	<check_box label="Correndo" name="running"/>
+	<check_box label="Mono" name="mono"/>
+	<string name="not_allowed">
+		Você não tem permissão para visualizar este script.
+	</string>
+	<string name="script_running">
+		Executando
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_postcard.xml b/indra/newview/skins/default/xui/pt/floater_postcard.xml
index deb5d0cb6e..5c07ce6b9e 100644
--- a/indra/newview/skins/default/xui/pt/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/pt/floater_postcard.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Postcard" title="Enviar cartão postal">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Postcard" title="Instantâneo por email">
 	<text name="to_label">
 		Email do Destinatário:
 	</text>
@@ -12,17 +12,25 @@
 	<text name="subject_label">
 		Assunto:
 	</text>
+	<line_editor label="Digite seu assunto aqui." name="subject_form"/>
 	<text name="msg_label">
 		Mensagem:
 	</text>
-	<check_box label="Publicar na Web" name="allow_publish_check"
-	     tool_tip="Publicar este postcard na web" />
-	<check_box label="Conteúdo Adulto" name="mature_check"
-	     tool_tip="Este postcard possui conteúdo adulto." />
-	<button label="?" name="publish_help_btn" />
+	<text_editor name="msg_form">
+		Digite sua mensagem aqui.
+	</text_editor>
 	<text name="fine_print">
-		Se o destinatário do seu postcard é residente em SL, você receberá um bonus..
+		Se seu indicado entrar no SL, você receberá um bônus pela indicação.
 	</text>
-	<button label="Cancelar" name="cancel_btn" />
-	<button label="Enviar" name="send_btn" />
+	<button label="Cancelar" name="cancel_btn"/>
+	<button label="Enviar" name="send_btn"/>
+	<string name="default_subject">
+		Cartão postal do Second Life.
+	</string>
+	<string name="default_message">
+		Dá uma olhada nisto!
+	</string>
+	<string name="upload_message">
+		&quot;Enviando...&quot;
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
index 13a27d3f08..564a9af645 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
@@ -1,32 +1,39 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="gesture_preview">
+	<string name="stop_txt">
+		Parar
+	</string>
+	<string name="preview_txt">
+		Prévia
+	</string>
+	<string name="none_text">
+		-- Nenhum --
+	</string>
 	<text name="desc_label">
 		Descrição:
 	</text>
 	<text name="trigger_label">
 		Gatilho:
 	</text>
-	<text name="replace_text"
-	     tool_tip="Substituir a(s) palavra(s) gatilho por estas palavras.">
+	<text name="replace_text" tool_tip="Substituir a(s) palavra(s) gatilho por estas palavras.">
 		Substituir por:
 	</text>
-	<line_editor name="replace_editor"
-	     tool_tip="Substituir a(s) palavra(s) gatilho por estas palavras. " />
+	<line_editor name="replace_editor" tool_tip="Substituir a(s) palavra(s) gatilho por estas palavras. "/>
 	<text name="key_label">
 		Tecla de Atalho:
 	</text>
-	<combo_box label="Nenhum" name="modifier_combo" />
-	<combo_box label="Nenhum" name="key_combo" />
+	<combo_box label="Nenhum" name="modifier_combo"/>
+	<combo_box label="Nenhum" name="key_combo"/>
 	<text name="library_label">
 		Biblioteca:
 	</text>
 	<text name="steps_label">
 		Passos:
 	</text>
-	<button label="Incluir" name="add_btn" />
-	<button label="Mover Para Cima" name="up_btn" />
-	<button label="Mover Para Baixo" name="down_btn" />
-	<button label="Remover" name="delete_btn" />
+	<button label="Incluir" name="add_btn"/>
+	<button label="Mover Para Cima" name="up_btn"/>
+	<button label="Mover Para Baixo" name="down_btn"/>
+	<button label="Remover" name="delete_btn"/>
 	<text name="help_label">
 		Todos os passos acontecem simultaneamente, a menos que você inclua passos de espera.
 	</text>
@@ -38,10 +45,9 @@
 			Parar
 		</radio_item>
 	</radio_group>
-	<check_box label="Até que a animação esteja concluída" name="wait_anim_check" />
-	<check_box label="tempo em segundos" name="wait_time_check" />
-	<check_box label="Ativar" name="active_check"
-	     tool_tip="Gesto ativos pode ser engatilhados escrevendo suas frases gatilho no chat ou através de suas teclas de atalho. Gestos normalmente ficam inativos quando existe um conflito nas teclas de atalho." />
-	<button label="Preview" name="preview_btn" />
-	<button label="Salvar" name="save_btn" />
+	<check_box label="Até que a animação esteja concluída" name="wait_anim_check"/>
+	<check_box label="tempo em segundos" name="wait_time_check"/>
+	<check_box label="Ativar" name="active_check" tool_tip="Gesto ativos pode ser engatilhados escrevendo suas frases gatilho no chat ou através de suas teclas de atalho. Gestos normalmente ficam inativos quando existe um conflito nas teclas de atalho."/>
+	<button label="Preview" name="preview_btn"/>
+	<button label="Salvar" name="save_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
index b8d9e2d6e9..9f48b6ee1f 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
@@ -1,10 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview notecard" title="Nota:">
-	<button label="Salvar" label_selected="Salvar" name="Save" />
-	<text type="string" length="1" name="desc txt">
+	<button label="Salvar" label_selected="Salvar" name="Save"/>
+	<text length="1" name="desc txt" type="string">
 		Descrição:
 	</text>
-	<text_editor type="string" length="1" name="Notecard Editor">
+	<text_editor length="1" name="Notecard Editor" type="string">
 		Carregando...
 	</text_editor>
+	<string name="no_object">
+		Não foi possível encontrar o objeto que contém esta nota.
+	</string>
+	<string name="not_allowed">
+		Você não tem permissão de visualizar esta nota.
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
index 9d130b8dd3..0a3922649a 100644
--- a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
@@ -1,59 +1,165 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_report_abuse" title="Reportar abuso">
+	<texture_picker label="" name="screenshot"/>
+	<check_box label="Incluir screenshot" name="screen_check"/>
 	<text name="reporter_title">
 		Denunciador:
 	</text>
+	<text name="reporter_field">
+		Loremipsum Dolorsitamut
+	</text>
 	<text name="sim_title">
 		Região:
 	</text>
+	<text name="sim_field">
+		Nome da Região
+	</text>
 	<text name="pos_title">
 		Posição:
 	</text>
-	<texture_picker name="screenshot" />
-	<check_box label="Incluir screenshot" name="screen_check" />
-	<button label="" label_selected="" name="pick_btn"
-	     tool_tip="Object Picker - Identifica um objeto com assunto deste report" />
+	<text name="pos_field">
+		{128.1, 128.1, 15.4}
+	</text>
 	<text name="select_object_label">
 		Clique no botão e em seguida no objeto:
 	</text>
+	<button label="" label_selected="" name="pick_btn" tool_tip="Object Picker - Identifica um objeto com assunto deste report"/>
 	<text name="object_name_label">
 		Nome:
 	</text>
+	<text name="object_name">
+		Consetetur Sadipscing
+	</text>
 	<text name="owner_name_label">
 		Proprietário:
 	</text>
-	<combo_box name="category_combo"
-	     tool_tip="Categoria -- Selecione a categoria que melhor descreve este report">
-		<combo_item name="Selectcategory">
-			Selecione a Categoria
+	<text name="owner_name">
+		Hendrerit Vulputate
+	</text>
+	<combo_box name="category_combo" tool_tip="Categoria -- Selecione a categoria que melhor descreve este report">
+		<combo_item name="Select_category">
+			Selecionar categoria
+		</combo_item>
+		<combo_item name="Age__Age_play">
+			Idade &gt; Idade no jogo
+		</combo_item>
+		<combo_item name="Age__Adult_resident_on_Teen_Second_Life">
+			Idade &gt; Residente adulto no Second Life Jovem
+		</combo_item>
+		<combo_item name="Age__Underage_resident_on_Adult_Second_Life">
+			Idade &gt; Residente menor no Second Life Adulto
+		</combo_item>
+		<combo_item name="Assault__Combat_sandbox___unsafe_area">
+			Assalto &gt; Sandbox de combate / área não segura
+		</combo_item>
+		<combo_item name="Assault__Safe_area">
+			Assalto &gt; Área segura
+		</combo_item>
+		<combo_item name="Assault__Weapons_testing_sandbox">
+			Assalto &gt; Testando armas em sandbox
+		</combo_item>
+		<combo_item name="Commerce__Failure_to_deliver_product_or_service">
+			Comércio &gt; Falha em enviar produto ou serviço
+		</combo_item>
+		<combo_item name="Disclosure__Real_world_information">
+			Revelar &gt; Informação do mundo real
+		</combo_item>
+		<combo_item name="Disclosure__Remotely_monitoring chat">
+			Revelar &gt; Conversa monitorada remotamente
+		</combo_item>
+		<combo_item name="Disclosure__Second_Life_information_chat_IMs">
+			Revelar &gt; Informação do Second Life/conversa/MIs
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
+			Distúrbio da paz &gt; Uso injusto dos recursos da região
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
+			Distúrbio da paz  &gt; Objetos com excesso de scripts
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Object_littering">
+			Distúrbio da paz  &gt; Objeto despejando lixo
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Repetitive_spam">
+			Distúrbio da paz &gt; Spam repetitivo
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
+			Distúrbio da paz &gt; Spam de anúncio indesejado
+		</combo_item>
+		<combo_item name="Fraud__L$">
+			Fraude &gt; L$
+		</combo_item>
+		<combo_item name="Fraud__Land">
+			Fraude &gt; Terra
+		</combo_item>
+		<combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
+			Fraude &gt; Esquema de pirâmide ou cartas encadeadas
+		</combo_item>
+		<combo_item name="Fraud__US$">
+			Fraude &gt; R$
+		</combo_item>
+		<combo_item name="Harassment__Advert_farms___visual_spam">
+			Perturbação &gt; Fazendas de Anúncios / spam visual
+		</combo_item>
+		<combo_item name="Harassment__Defaming_individuals_or_groups">
+			Perturbação &gt; Difamação de indivíduos ou grupos
+		</combo_item>
+		<combo_item name="Harassment__Impeding_movement">
+			Perturbação &gt; Impedindo movimentos
+		</combo_item>
+		<combo_item name="Harassment__Sexual_harassment">
+			Perturbação &gt; Perturbação sexual
+		</combo_item>
+		<combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
+			Perturbação &gt; Solicitando/incitando outros a violarem o ToS
+		</combo_item>
+		<combo_item name="Harassment__Verbal_abuse">
+			Perturbação &gt; Abuso verbal
+		</combo_item>
+		<combo_item name="Indecency__Broadly_offensive_content_or_conduct">
+			Indecência &gt; Conteúdo ou conduta amplamente ofensivos
+		</combo_item>
+		<combo_item name="Indecency__Broadly_visible_mature_content">
+			Indecência &gt; Conteúdo maduro visível de um modo geral
+		</combo_item>
+		<combo_item name="Indecency__Inappropriate_avatar_name">
+			Indecência &gt; Nome de avatar inapropriado
+		</combo_item>
+		<combo_item name="Indecency__Mature_content_in_PG_region">
+			Indecência &gt; Conteúdo maduro numa região PG
+		</combo_item>
+		<combo_item name="Intellectual_property_infringement_Content_Removal">
+			Violação de propriedade intelectual &gt; Remoção de Conteúdo
+		</combo_item>
+		<combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
+			Violação de Propriedade intelectual  &gt; Cópia Ilegal ou  Aproveitar-se de Permissões
 		</combo_item>
 		<combo_item name="Intolerance">
 			Intolerância
 		</combo_item>
-		<combo_item name="Harassment">
-			Assédio
+		<combo_item name="Land__Abuse_of_sandbox_resources">
+			Terra &gt; Abuso dos recursos da sandbox
 		</combo_item>
-		<combo_item name="Assault">
-			Assalto
+		<combo_item name="Land__Encroachment__Objects_textures">
+			Terra &gt; Invasão &gt; Objetos/texturas
 		</combo_item>
-		<combo_item name="Disclosure">
-			Exposição
+		<combo_item name="Land__Encroachment__Particles">
+			Terra &gt; Invasão &gt; Partículas
 		</combo_item>
-		<combo_item name="Indecency">
-			Indecência
+		<combo_item name="Land__Encroachment__Trees_plants">
+			Terra &gt; Violação &gt; Árvores/plantas
 		</combo_item>
-		<combo_item name="Age">
-			Idade
+		<combo_item name="Wagering_gambling">
+			Apostas/jogos de azar
 		</combo_item>
-		<combo_item name="Parcel">
-			Lote
+		<combo_item name="Other">
+			Outro
 		</combo_item>
 	</combo_box>
 	<text name="abuser_name_title">
 		Nome do Denunciado:
 	</text>
-	<button label="Selecione" label_selected="" name="select_abuser"
-	     tool_tip="Selecione o nome do Denuncionado numa lista" />
+	<button label="Escolher Residente" label_selected="" name="select_abuser" tool_tip="Selecione o nome do Denuncionado numa lista"/>
+	<check_box label="Não sei o nome do molestador" name="omit_abuser_name" tool_tip="Marque aqui se você não consegue fornecer o nome do agressor"/>
 	<text name="abuser_name_title2">
 		Local do Abuso:
 	</text>
@@ -64,11 +170,11 @@
 		Detalhes:
 	</text>
 	<text name="bug_aviso">
-		Por favor, seja específico com a data, local , natureza do abuso, texto do chat ou MI relevânte e selecione o objeto se possível.
+		Por favor, seja específico(a) sobre data, localidade, natureza do abuso, texto relevante de conversa/MI e selecione o objeto, se possível.
 	</text>
 	<text name="incomplete_title">
-		Nota: Reports imcompletos não serão investigados
+		Nota: Relatos incompletos não serão investigados.
 	</text>
-	<button label="Reportar Abuso" label_selected="Reportar Abuso" name="send_btn" />
-	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn" />
+	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	<button label="Reportar Abuso" label_selected="Reportar Abuso" name="send_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_script_debug.xml b/indra/newview/skins/default/xui/pt/floater_script_debug.xml
index 877f5b82b2..f3b8fc5f3d 100644
--- a/indra/newview/skins/default/xui/pt/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/pt/floater_script_debug.xml
@@ -1,6 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater name="script debug floater" title="Script Errors/Warning">
-	<tab_container name="Preview Tabs">
-		<floater label="Script" name="all_scripts" title="[All scripts]" />
-	</tab_container>
-</multi_floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<multi_floater name="script debug floater" title="Aviso de script/erro"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_snapshot.xml b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
index 4d3037715f..9180ae6c70 100644
--- a/indra/newview/skins/default/xui/pt/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
@@ -1,23 +1,46 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Snapshot" title="Visualizar foto">
 	<text name="type_label">
-		O que você gostaria de fazer?
+		Instantâneo do destino
 	</text>
 	<radio_group label="Tipo de Foto" name="snapshot_type_radio">
 		<radio_item name="postcard">
-			Enviar um postcard
+			Enviar por email
 		</radio_item>
 		<radio_item name="texture">
-			Upload de uma foto
+			Salvar no seu inventário (L$10)
 		</radio_item>
 		<radio_item name="local">
-			Salvar foto no seu HD
+			Salvar no seu disco rígido
 		</radio_item>
 	</radio_group>
+	<text name="file_size_label">
+		Tamanho do arquivo: [SIZE] KB
+	</text>
+	<button label="Atualizar o Instantâneo" name="new_snapshot_btn"/>
+	<button label="Enviar" name="send_btn"/>
+	<button label="Salvar (L$10)" name="upload_btn"/>
+	<flyout_button label="Salvar" name="save_btn" tool_tip="Salvar imagem em um arquivo">
+		<flyout_button_item name="save_item">
+			Salvar
+		</flyout_button_item>
+		<flyout_button_item name="saveas_item">
+			Salvar como...
+		</flyout_button_item>
+	</flyout_button>
+	<button label="Cancelar" name="discard_btn"/>
+	<button label="Mais &gt;&gt;" name="more_btn" tool_tip="Opções Avançadas"/>
+	<button label="&lt;&lt; Menos" name="less_btn" tool_tip="Opções Avançadas"/>
 	<text name="type_label2">
-		Que tamanho de imagem você precisa?
+		Tamanho
+	</text>
+	<text name="format_label">
+		Formato
 	</text>
 	<combo_box label="Resolução" name="postcard_size_combo">
+		<combo_item name="CurrentWindow">
+			Janela Atual
+		</combo_item>
 		<combo_item name="640x480">
 			640x480
 		</combo_item>
@@ -27,9 +50,6 @@
 		<combo_item name="1024x768">
 			1024x768
 		</combo_item>
-		<combo_item name="CurrentWindow">
-			Janela Atual
-		</combo_item>
 		<combo_item name="Custom">
 			Customizado
 		</combo_item>
@@ -77,9 +97,21 @@
 			Customizado
 		</combo_item>
 	</combo_box>
-	<spinner label="Largura" name="snapshot_width" />
-	<spinner label="Altura" name="snapshot_height" />
-	<slider label="Qualidade da Imagem" name="image_quality_slider" />
+	<combo_box label="Formato" name="local_format_combo">
+		<combo_item name="PNG">
+			PNG
+		</combo_item>
+		<combo_item name="JPEG">
+			JPEG
+		</combo_item>
+		<combo_item name="BMP">
+			BMP
+		</combo_item>
+	</combo_box>
+	<spinner label="Largura" name="snapshot_width"/>
+	<spinner label="Altura" name="snapshot_height"/>
+	<check_box label="Restringir proporções" name="keep_aspect_check"/>
+	<slider label="Qualidade da Imagem" name="image_quality_slider"/>
 	<text name="layer_type_label">
 		Capturar:
 	</text>
@@ -94,18 +126,12 @@
 			Decoração do Objeto
 		</combo_item>
 	</combo_box>
-	<text name="file_size_label">
-		Tamanho do Arquivo: [SIZE]
-	</text>
-	<check_box label="Mostrar interface na Foto" name="ui_check" />
-	<check_box label="Mostrar Objetos HUD na Foto" name="hud_check" />
-	<check_box label="Manter aberto após salvar" name="keep_open_check" />
-	<check_box label="Manter aparência selecionada" name="keep_aspect_check" />
-	<check_box label="Quadro Congelado" name="freeze_frame_check" />
-	<button label="Nova foto" name="new_snapshot_btn" />
-	<check_box label="Auto-snapshot" name="auto_snapshot_check" />
-	<button label="Upload (L$10)" name="upload_btn" />
-	<button label="Enviar" name="send_btn" />
-	<button label="Salvar" name="save_btn" />
-	<button label="Descartar" name="discard_btn" />
+	<check_box label="Mostrar interface na Foto" name="ui_check"/>
+	<check_box label="Mostrar Objetos HUD na Foto" name="hud_check"/>
+	<check_box label="Manter aberto após salvar" name="keep_open_check"/>
+	<check_box label="Quadro Congelado" name="freeze_frame_check"/>
+	<check_box label="Auto-atualizar" name="auto_snapshot_check"/>
+	<string name="unknown">
+		desconhecido
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
index 013b02bfdd..46e665d711 100644
--- a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
@@ -1,17 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="Pegar: Textura">
-	<text type="string" length="1" name="Multiple">
+	<string name="choose_picture">
+		Clique para escolher uma imagem
+	</string>
+	<text length="1" name="Multiple" type="string">
 		Multiplo
 	</text>
-	<text type="string" length="1" name="unknown">
-		Dimenções: 512 x 512
+	<text length="1" name="unknown" type="string">
+		Dimensões: [DIMENSIONS]
 	</text>
-	<button label="Padrão" label_selected="Padrão" name="Default" />
-	<button label="Nenhum" label_selected="Nenhum" name="None" />
-	<button label="Branco" label_selected="Branco" name="Blank" />
-	<check_box label="Mostrar Pastas" name="show_folders_check" />
-	<check_box label="Aplicar Imediatamente" name="apply_immediate_check" />
-	<button label="" label_selected="" name="Pipette" />
-	<button label="Cancelar" label_selected="Cancelar" name="Cancel" />
-	<button label="Selecionar" label_selected="Selecionar" name="Select" />
+	<button label="Padrão" label_selected="Padrão" name="Default"/>
+	<button label="Nenhum" label_selected="Nenhum" name="None"/>
+	<button label="Branco" label_selected="Branco" name="Blank"/>
+	<check_box label="Mostrar Pastas" name="show_folders_check"/>
+	<search_editor label="Clique aqui para buscar" name="inventory search editor"/>
+	<check_box label="Aplicar Imediatamente" name="apply_immediate_check"/>
+	<button label="" label_selected="" name="Pipette"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<button label="Selecionar" label_selected="Selecionar" name="Select"/>
+	<string name="pick title">
+		Pegar:
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml
index 336bff0c41..92c2feec34 100644
--- a/indra/newview/skins/default/xui/pt/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tools.xml
@@ -1,46 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="toolbox floater" title="">
-	<button label="" label_selected="" name="button focus" />
-	<text name="tool label">
-		Foco
-	</text>
-	<button label="" label_selected="" name="button move" />
-	<text name="tool label2">
-		Mover
-	</text>
-	<button label="" label_selected="" name="button edit" />
-	<text name="tool label3">
-		Editar
-	</text>
-	<button label="" label_selected="" name="button create" />
-	<text name="tool label4">
-		Criar
-	</text>
-	<button label="" label_selected="" name="button land" />
-	<text name="tool label5">
-		Terra
-	</text>
-	<check_box label="Zoom" name="radio zoom" />
-	<check_box label="Orbita (Ctrl)" name="radio orbit" />
-	<check_box label="Pan (Ctrl-Shift)" name="radio pan" />
-	<check_box label="Mover" name="radio move" />
-	<check_box label="Suspender (Ctrl)" name="radio lift" />
-	<check_box label="Girar (Ctrl-Shift)" name="radio spin" />
-	<check_box label="Posição" name="radio position" />
-	<check_box label="Rotacionar (Ctrl)" name="radio rotate" />
-	<check_box label="Esticar (Ctrl-Shift)" name="radio stretch" />
-	<check_box label="Selecionar Textura" name="radio select face" />
-	<check_box label="Editar partes linkadas" name="checkbox edit linked parts" />
-	<check_box label="Grade" name="checkbox snap to grid" />
-	<button label="Opções..." label_selected="Opções..." name="Options..." />
-	<check_box label="Esticar ambos os lados" name="checkbox uniform" />
-	<check_box label="Esticar Texturas" name="checkbox stretch textures" />
+	<button label="" label_selected="" name="button focus" tool_tip="Foco"/>
+	<button label="" label_selected="" name="button move" tool_tip="Mover"/>
+	<button label="" label_selected="" name="button edit" tool_tip="Editar"/>
+	<button label="" label_selected="" name="button create" tool_tip="Criar"/>
+	<button label="" label_selected="" name="button land" tool_tip="Terra"/>
+	<check_box label="Zoom" name="radio zoom"/>
+	<check_box label="Orbita (Ctrl)" name="radio orbit"/>
+	<check_box label="Pan (Ctrl-Shift)" name="radio pan"/>
+	<check_box label="Mover" name="radio move"/>
+	<check_box label="Suspender (Ctrl)" name="radio lift"/>
+	<check_box label="Girar (Ctrl-Shift)" name="radio spin"/>
+	<check_box label="Posição" name="radio position"/>
+	<check_box label="Rotacionar (Ctrl)" name="radio rotate"/>
+	<check_box label="Esticar (Ctrl-Shift)" name="radio stretch"/>
+	<check_box label="Selecionar Textura" name="radio select face"/>
+	<check_box label="Editar partes linkadas" name="checkbox edit linked parts"/>
 	<text name="text ruler mode">
 		Modo
 	</text>
-	<text name="text status">
-		Arraste para mover, shift+Arrastar para Copiar
-	</text>
 	<combo_box name="combobox grid mode">
 		<combo_item name="World">
 			Mundo
@@ -52,32 +30,39 @@
 			Referência
 		</combo_item>
 	</combo_box>
-	<button label="" label_selected="" name="ToolCube" />
-	<button label="" label_selected="" name="ToolPrism" />
-	<button label="" label_selected="" name="ToolPyramid" />
-	<button label="" label_selected="" name="ToolTetrahedron" />
-	<button label="" label_selected="" name="ToolCylinder" />
-	<button label="" label_selected="" name="ToolHemiCylinder" />
-	<button label="" label_selected="" name="ToolCone" />
-	<button label="" label_selected="" name="ToolHemiCone" />
-	<button label="" label_selected="" name="ToolSphere" />
-	<button label="" label_selected="" name="ToolHemiSphere" />
-	<check_box label="Copiar Seleção" name="checkbox copy selection" />
-	<button label="" label_selected="" name="ToolTorus" />
-	<button label="" label_selected="" name="ToolTube" />
-	<button label="" label_selected="" name="ToolRing" />
-	<button label="" label_selected="" name="ToolTree" />
-	<button label="" label_selected="" name="ToolGrass" />
-	<check_box label="Manter ferramenta selecionada" name="checkbox sticky" />
-	<check_box label="Copiar Centro" name="checkbox copy centers" />
-	<check_box label="Rotacionar Copia" name="checkbox copy rotates" />
-	<check_box label="Selecionar Terra" name="radio select land" />
-	<check_box label="Aplainar Terra" name="radio flatten" />
-	<check_box label="Elevar Terra" name="radio raise" />
-	<check_box label="Baixar Terra" name="radio lower" />
-	<check_box label="Suavizar Terra" name="radio smooth" />
-	<check_box label="Terrano Rígido" name="radio noise" />
-	<check_box label="Reverter Terra" name="radio revert" />
+	<check_box label="Esticar ambos os lados" name="checkbox uniform"/>
+	<check_box label="Esticar Texturas" name="checkbox stretch textures"/>
+	<check_box label="Grade" name="checkbox snap to grid"/>
+	<button label="Opções..." label_selected="Opções..." name="Options..."/>
+	<text name="text status">
+		Arraste para mover, shift+Arrastar para Copiar
+	</text>
+	<button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/>
+	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
+	<button label="" label_selected="" name="ToolPyramid" tool_tip="Pirâmide"/>
+	<button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tetraedro"/>
+	<button label="" label_selected="" name="ToolCylinder" tool_tip="Cilindro"/>
+	<button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Semi-cilindro"/>
+	<button label="" label_selected="" name="ToolCone" tool_tip="Cone"/>
+	<button label="" label_selected="" name="ToolHemiCone" tool_tip="Semi-cone"/>
+	<button label="" label_selected="" name="ToolSphere" tool_tip="Esfera"/>
+	<button label="" label_selected="" name="ToolHemiSphere" tool_tip="Semi-esfera"/>
+	<button label="" label_selected="" name="ToolTorus" tool_tip="Toróide"/>
+	<button label="" label_selected="" name="ToolTube" tool_tip="Tubo"/>
+	<button label="" label_selected="" name="ToolRing" tool_tip="Anel"/>
+	<button label="" label_selected="" name="ToolTree" tool_tip="Árvore"/>
+	<button label="" label_selected="" name="ToolGrass" tool_tip="Grama"/>
+	<check_box label="Manter ferramenta selecionada" name="checkbox sticky"/>
+	<check_box label="Copiar Seleção" name="checkbox copy selection"/>
+	<check_box label="Copiar Centro" name="checkbox copy centers"/>
+	<check_box label="Rotacionar Copia" name="checkbox copy rotates"/>
+	<check_box label="Selecionar Terra" name="radio select land"/>
+	<check_box label="Aplainar Terra" name="radio flatten"/>
+	<check_box label="Elevar Terra" name="radio raise"/>
+	<check_box label="Baixar Terra" name="radio lower"/>
+	<check_box label="Suavizar Terra" name="radio smooth"/>
+	<check_box label="Terrano Rígido" name="radio noise"/>
+	<check_box label="Reverter Terra" name="radio revert"/>
 	<combo_box name="combobox brush size">
 		<combo_item name="Small">
 			Pequeno
@@ -89,11 +74,13 @@
 			Grande
 		</combo_item>
 	</combo_box>
-	<button label="Aplicar no selecionado" label_selected="Aplicar no selecionado"
-	     name="button apply to selection" tool_tip="Modificar Terra Selecionada" />
-	<check_box label="Mostrar Proprietários" name="checkbox show owners" />
-	<button label="Mais &gt;&gt;" name="button more" tool_tip="Opções Avançadas" />
-	<button label="&lt;&lt; Menos" name="button less" tool_tip="Opções Avançadas" />
+	<text name="Strength:">
+		Força:
+	</text>
+	<button label="Aplicar no selecionado" label_selected="Aplicar no selecionado" name="button apply to selection" tool_tip="Modificar Terra Selecionada"/>
+	<check_box label="Mostrar Proprietários" name="checkbox show owners"/>
+	<button label="Mais &gt;&gt;" name="button more" tool_tip="Opções Avançadas"/>
+	<button label="&lt;&lt; Menos" name="button less" tool_tip="Opções Avançadas"/>
 	<tab_container name="Object Info Tabs">
 		<panel label="Comum" name="General">
 			<text name="Name:">
@@ -108,21 +95,21 @@
 			<text name="Creator Name">
 				Thrax Linden
 			</text>
-			<button label="Perfil..." label_selected="Perfil..." name="button creator profile" />
+			<button label="Perfil..." label_selected="Perfil..." name="button creator profile"/>
 			<text name="Owner:">
 				Proprietário:
 			</text>
 			<text name="Owner Name">
 				Thrax Linden
 			</text>
-			<button label="Perfil..." label_selected="Perfil..." name="button owner profile" />
+			<button label="Perfil..." label_selected="Perfil..." name="button owner profile"/>
 			<text name="Group:">
 				Grupo:
 			</text>
 			<text name="Group Name Proxy">
 				Os Lindens
 			</text>
-			<button label="Selecionar..." label_selected="Selecionar..." name="button set group" />
+			<button label="Selecionar..." label_selected="Selecionar..." name="button set group"/>
 			<text name="prim info">
 				1 Objeto, 1 Primitiva
 			</text>
@@ -132,20 +119,19 @@
 			<text name="perm_modify">
 				Você pode modificar este objeto.
 			</text>
-			<check_box label="Compartilhar com o Grupo" name="checkbox share with group"
-			     tool_tip="Permitir que o membros do grupo movam, modifiquem, copiem e apaguem" />
-			<text name="text deed continued">
+			<check_box label="Compartilhar com o Grupo" name="checkbox share with group" tool_tip="Permitir que o membros do grupo movam, modifiquem, copiem e apaguem"/>
+			<string name="text deed continued">
 				Acionar...
-			</text>
-			<text name="text deed">
+			</string>
+			<string name="text deed">
 				Acionar
-			</text>
-			<button label="Acionar..." label_selected="Acionar..." name="button deed"
-			     tool_tip="Objetos compartilhados do Grupo pode ser acionados pelo gerente do grupo." />
-			<check_box label="Permitir que qualquer um mova" name="checkbox allow everyone move" />
-			<check_box label="Permitir que qualquer um copie" name="checkbox allow everyone copy" />
-			<check_box label="A Venda" name="checkbox for sale" />
-			<text name="Price:  L$">
+			</string>
+			<button label="Acionar..." label_selected="Acionar..." name="button deed" tool_tip="Objetos compartilhados do Grupo pode ser acionados pelo gerente do grupo."/>
+			<check_box label="Permitir que qualquer um mova" name="checkbox allow everyone move"/>
+			<check_box label="Permitir que qualquer um copie" name="checkbox allow everyone copy"/>
+			<check_box label="Mostrar na busca" name="search_check" tool_tip="Permitir que as pessoas vejam este objeto nos resultados de busca"/>
+			<check_box label="A Venda" name="checkbox for sale"/>
+			<text name="Cost">
 				Preço:  L$
 			</text>
 			<radio_group name="sale type">
@@ -162,9 +148,9 @@
 			<text name="Next owner can:">
 				Próximo Proprietário pode:
 			</text>
-			<check_box label="Modificar" name="checkbox next owner can modify" />
-			<check_box label="Copiar" name="checkbox next owner can copy" />
-			<check_box label="Revender/Dar" name="checkbox next owner can transfer" />
+			<check_box label="Modificar" name="checkbox next owner can modify"/>
+			<check_box label="Copiar" name="checkbox next owner can copy"/>
+			<check_box label="Revender/Dar" name="checkbox next owner can transfer"/>
 			<text name="label click action">
 				Quando clicado com o botão esquerdo:
 			</text>
@@ -184,6 +170,12 @@
 				<combo_item name="Open">
 					Abrir
 				</combo_item>
+				<combo_item name="Play">
+					Executar a mídia do terreno
+				</combo_item>
+				<combo_item name="Opemmedia">
+					Abrir a mídia do terreno
+				</combo_item>
 			</combo_box>
 			<text name="B:">
 				B:
@@ -203,21 +195,36 @@
 			<text name="F:">
 				F:
 			</text>
-			<text name="text modify info 1">
+			<string name="text modify info 1">
 				Você pode modificar este objeto.
-			</text>
-			<text name="text modify info 2">
+			</string>
+			<string name="text modify info 2">
 				Você pode modificar estes objetos.
-			</text>
-			<text name="text modify info 3">
+			</string>
+			<string name="text modify info 3">
 				Você não pode modificar este objeto.
-			</text>
-			<text name="text modify info 4">
+			</string>
+			<string name="text modify info 4">
 				Você não pode modificar estes objetos.
-			</text>
-			<text name="text modify warning">
+			</string>
+			<string name="text modify warning">
 				Você precisa selecionar o objeto todo para ajustar as permissões.
-			</text>
+			</string>
+			<string name="Cost Default">
+				Preço:           L$
+			</string>
+			<string name="Cost Total">
+				Preço Total:  L$
+			</string>
+			<string name="Cost Per Unit">
+				Preço Por:     L$
+			</string>
+			<string name="Cost Mixed">
+				Preço Misturado
+			</string>
+			<string name="Sale Mixed">
+				Venda Misturada
+			</string>
 		</panel>
 		<panel label="Objeto" name="Object">
 			<text name="select_single">
@@ -226,32 +233,28 @@
 			<text name="edit_object">
 				Editar os parâmetros do Objeto:
 			</text>
-			<check_box label="Travado" name="checkbox locked"
-			     tool_tip="Previne que o objeto seja movido ou apagado. Muito útil para evitar edições não intencionais durante a construção." />
-			<check_box label="Física" name="Physical Checkbox Ctrl"
-			     tool_tip="Permite que os objetos sejam empurrados sofram efeito da gravidade" />
-			<check_box label="Temporário" name="Temporary Checkbox Ctrl"
-			     tool_tip="Faz com que o objeto seja apagado 1 minuto após ser criado." />
-			<check_box label="Fantasma" name="Phantom Checkbox Ctrl"
-			     tool_tip="Faz com que o objeto não colida com outros objetos ou avatares" />
+			<check_box label="Travado" name="checkbox locked" tool_tip="Previne que o objeto seja movido ou apagado. Muito útil para evitar edições não intencionais durante a construção."/>
+			<check_box label="Física" name="Physical Checkbox Ctrl" tool_tip="Permite que os objetos sejam empurrados sofram efeito da gravidade"/>
+			<check_box label="Temporário" name="Temporary Checkbox Ctrl" tool_tip="Faz com que o objeto seja apagado 1 minuto após ser criado."/>
+			<check_box label="Fantasma" name="Phantom Checkbox Ctrl" tool_tip="Faz com que o objeto não colida com outros objetos ou avatares"/>
 			<text name="label position">
 				Posição (metros)
 			</text>
-			<spinner label="X" name="Pos X" />
-			<spinner label="Y" name="Pos Y" />
-			<spinner label="Z" name="Pos Z" />
+			<spinner label="X" name="Pos X"/>
+			<spinner label="Y" name="Pos Y"/>
+			<spinner label="Z" name="Pos Z"/>
 			<text name="label size">
 				Tamanho (metros)
 			</text>
-			<spinner label="X" name="Scale X" />
-			<spinner label="Y" name="Scale Y" />
-			<spinner label="Z" name="Scale Z" />
+			<spinner label="X" name="Scale X"/>
+			<spinner label="Y" name="Scale Y"/>
+			<spinner label="Z" name="Scale Z"/>
 			<text name="label rotation">
 				Rotação (graus)
 			</text>
-			<spinner label="X" name="Rot X" />
-			<spinner label="Y" name="Rot Y" />
-			<spinner label="Z" name="Rot Z" />
+			<spinner label="X" name="Rot X"/>
+			<spinner label="Y" name="Rot Y"/>
+			<spinner label="Z" name="Rot Z"/>
 			<text name="label material">
 				Material
 			</text>
@@ -310,8 +313,8 @@
 			<text name="text cut">
 				Recorte inicial e final
 			</text>
-			<spinner label="B" name="cut begin" />
-			<spinner label="E" name="cut end" />
+			<spinner label="B" name="cut begin"/>
+			<spinner label="E" name="cut end"/>
 			<text name="text hollow">
 				Vazio
 			</text>
@@ -338,42 +341,63 @@
 			<text name="text twist">
 				Torcer no Inicio e final
 			</text>
-			<spinner label="B" name="Twist Begin" />
-			<spinner label="E" name="Twist End" />
+			<spinner label="B" name="Twist Begin"/>
+			<spinner label="E" name="Twist End"/>
 			<text name="scale_taper">
 				Afinar
 			</text>
 			<text name="scale_hole">
 				Tamanho do Buraco
 			</text>
-			<spinner label="X" name="Taper Scale X" />
-			<spinner label="Y" name="Taper Scale Y" />
+			<spinner label="X" name="Taper Scale X"/>
+			<spinner label="Y" name="Taper Scale Y"/>
 			<text name="text topshear">
 				Inclinar
 			</text>
-			<spinner label="X" name="Shear X" />
-			<spinner label="Y" name="Shear Y" />
+			<spinner label="X" name="Shear X"/>
+			<spinner label="Y" name="Shear Y"/>
 			<text name="advanced_cut">
 				Perfil Recortado no Início e Final
 			</text>
 			<text name="advanced_dimple">
 				Cova Inicio e Final
 			</text>
-			<spinner label="B" name="Path Limit Begin" />
-			<spinner label="E" name="Path Limit End" />
+			<spinner label="B" name="Path Limit Begin"/>
+			<spinner label="E" name="Path Limit End"/>
 			<text name="text taper2">
 				Afinar
 			</text>
-			<spinner label="X" name="Taper X" />
-			<spinner label="Y" name="Taper Y" />
+			<spinner label="X" name="Taper X"/>
+			<spinner label="Y" name="Taper Y"/>
 			<text name="text radius delta">
-				Radius Delta
+				Raio
 			</text>
 			<text name="text revolutions">
 				Revoluções
 			</text>
-			<texture_picker label="Sculpt Texture" name="sculpt texture control"
-			     tool_tip="Click to choose a picture" />
+			<texture_picker label="Sculpt Texture" name="sculpt texture control" tool_tip="Click to choose a picture"/>
+			<check_box label="Espelho" name="sculpt mirror control" tool_tip="Inverter a primitiva esculpida ao longo do eixo X."/>
+			<check_box label="De dentro para fora" name="sculpt invert control" tool_tip="Inverte as normais das primitivas esculpidas, fazendo-as parecer de dentro para fora."/>
+			<text name="label sculpt type">
+				Tipo costura
+			</text>
+			<combo_box name="sculpt type control">
+				<combo_item name="None">
+					(nenhum)
+				</combo_item>
+				<combo_item name="Sphere">
+					Esfera
+				</combo_item>
+				<combo_item name="Torus">
+					Toróide
+				</combo_item>
+				<combo_item name="Plane">
+					Plano
+				</combo_item>
+				<combo_item name="Cylinder">
+					Cilindro
+				</combo_item>
+			</combo_box>
 		</panel>
 		<panel label="Recursos" name="Features">
 			<text name="select_single">
@@ -382,34 +406,34 @@
 			<text name="edit_object">
 				Editar recursos do Objeto:
 			</text>
-			<check_box label="Flexíbilidade" name="Flexible1D Checkbox Ctrl"
-			     tool_tip="Permite que o objeto flexione no eixo Z. (Somente no lado do Cliente)" />
-			<spinner label="Suavidade" name="FlexNumSections" />
-			<spinner label="Gravidade" name="FlexGravity" />
-			<spinner label="Arrastar" name="FlexFriction" />
-			<spinner label="Vento" name="FlexWind" />
-			<spinner label="Tensão" name="FlexTension" />
-			<spinner label="Força X" name="FlexForceX" />
-			<spinner label="Força Y" name="FlexForceY" />
-			<spinner label="Força Z" name="FlexForceZ" />
-			<check_box label="Luz" name="Light Checkbox Ctrl"
-			     tool_tip="Faz com que o objeto emita luz" />
+			<check_box label="Flexíbilidade" name="Flexible1D Checkbox Ctrl" tool_tip="Permite que o objeto flexione no eixo Z. (Somente no lado do Cliente)"/>
+			<spinner label="Suavidade" name="FlexNumSections"/>
+			<spinner label="Gravidade" name="FlexGravity"/>
+			<spinner label="Arrastar" name="FlexFriction"/>
+			<spinner label="Vento" name="FlexWind"/>
+			<spinner label="Tensão" name="FlexTension"/>
+			<spinner label="Força X" name="FlexForceX"/>
+			<spinner label="Força Y" name="FlexForceY"/>
+			<spinner label="Força Z" name="FlexForceZ"/>
+			<check_box label="Luz" name="Light Checkbox Ctrl" tool_tip="Faz com que o objeto emita luz"/>
 			<text name="label color">
 				Cor
 			</text>
-			<color_swatch label="" name="colorswatch" tool_tip="Clique para abrir o seletor de Cores" />
-			<spinner label="Intensidade" name="Light Intensity" />
-			<spinner label="Radius" name="Light Radius" />
-			<spinner label="Queda" name="Light Falloff" />
+			<color_swatch label="" name="colorswatch" tool_tip="Clique para abrir o seletor de Cores"/>
+			<spinner label="Intensidade" name="Light Intensity"/>
+			<spinner label="Radius" name="Light Radius"/>
+			<spinner label="Queda" name="Light Falloff"/>
 		</panel>
 		<panel label="Textura" name="Texture">
-			<texture_picker label="Textura" name="texture control"
-			     tool_tip="Clique para escolher uma imagem" />
-			<color_swatch label="Cor" name="colorswatch" tool_tip="Clique para abrir o seletor de cores" />
+			<texture_picker label="Textura" name="texture control" tool_tip="Clique para escolher uma imagem"/>
+			<color_swatch label="Cor" name="colorswatch" tool_tip="Clique para abrir o seletor de cores"/>
 			<text name="color trans">
 				Transparência %
 			</text>
-			<check_box label="Claridade" name="checkbox fullbright" />
+			<text name="glow label">
+				Brilho
+			</text>
+			<check_box label="Claridade" name="checkbox fullbright"/>
 			<text name="tex gen">
 				Mapeamento
 			</text>
@@ -500,35 +524,35 @@
 			<text name="tex scale">
 				Repetir por Face
 			</text>
-			<spinner label="Horizontal (U)" name="TexScaleU" />
-			<check_box label="Flip" name="checkbox flip s" />
-			<spinner label="Vertical (V)" name="TexScaleV" />
-			<check_box label="Flip" name="checkbox flip t" />
+			<spinner label="Horizontal (U)" name="TexScaleU"/>
+			<check_box label="Flip" name="checkbox flip s"/>
+			<spinner label="Vertical (V)" name="TexScaleV"/>
+			<check_box label="Flip" name="checkbox flip t"/>
 			<text name="tex rotate">
 				Rotação (graus)
 			</text>
-			<text name="string repeats per meter">
+			<string name="string repeats per meter">
 				Repetir por Metro
-			</text>
-			<text name="string repeats per face">
+			</string>
+			<string name="string repeats per face">
 				Repetir por Face
-			</text>
+			</string>
 			<text name="rpt">
 				Repetir por Metro
 			</text>
-			<button label="Aplicar" label_selected="Aplicar" name="button apply" />
+			<button label="Aplicar" label_selected="Aplicar" name="button apply"/>
 			<text name="tex offset">
 				Offset
 			</text>
-			<spinner label="Horizontal (U)" name="TexOffsetU" />
-			<spinner label="Vertical (V)" name="TexOffsetV" />
+			<spinner label="Horizontal (U)" name="TexOffsetU"/>
+			<spinner label="Vertical (V)" name="TexOffsetV"/>
 			<text name="textbox autofix">
 				Alinhar Texturas (precisa ser carregada primeiro)
 			</text>
-			<button label="Alinhar" label_selected="Alinhar" name="button align" />
+			<button label="Alinhar" label_selected="Alinhar" name="button align"/>
 		</panel>
 		<panel label="Conteúdo" name="Contents">
-			<button label="Novo Script..." label_selected="Novo Script..." name="button new script" />
+			<button label="Novo Script..." label_selected="Novo Script..." name="button new script"/>
 		</panel>
 	</tab_container>
 	<panel name="land info panel">
@@ -538,14 +562,49 @@
 		<text name="label_area">
 			Área: [AREA] m2.
 		</text>
-		<button label="Comprar Terra..." label_selected="Comprar Terra.."
-		     name="button buy land" />
-		<button label="Abandonar Terra..." label_selected="Abandonar Terra..."
-		     name="button abandon land" />
-		<button label="Sub-Dividir..." label_selected="Subdivide..."
-		     name="button subdivide land" />
-		<button label="Unir..." label_selected="Unir..." name="button join land" />
-		<button label="Sobre a Terra..." label_selected="Sobre a Terra..."
-		     name="button about land" />
+		<button label="Comprar Terra..." label_selected="Comprar Terra.." name="button buy land"/>
+		<button label="Abandonar Terra..." label_selected="Abandonar Terra..." name="button abandon land"/>
+		<button label="Sub-Dividir..." label_selected="Subdivide..." name="button subdivide land"/>
+		<button label="Unir..." label_selected="Unir..." name="button join land"/>
+		<button label="Sobre a Terra..." label_selected="Sobre a Terra..." name="button about land"/>
 	</panel>
+	<string name="status_rotate">
+		Arrastar as bandas coloridas para girar o objeto
+	</string>
+	<string name="status_scale">
+		Clicar e arrastar para esticar o lado selecionado
+	</string>
+	<string name="status_move">
+		Arrastar para mover, Shift-arrastar para copiar
+	</string>
+	<string name="status_modifyland">
+		Clicar e reter para modificar a terra
+	</string>
+	<string name="status_camera">
+		Clicar e arrastar para mudar a vista
+	</string>
+	<string name="status_grab">
+		Arrastar para mover objetos, Ctrl para levantar, Ctrl-Shift para girar
+	</string>
+	<string name="status_place">
+		Clicar no mundo para criar, shift-clicar para selecionar
+	</string>
+	<string name="status_selectland">
+		Clicar e arrastar para selecionar a terra.
+	</string>
+	<string name="grid_screen_text">
+		Tela
+	</string>
+	<string name="grid_local_text">
+		Local
+	</string>
+	<string name="grid_world_text">
+		Mundo
+	</string>
+	<string name="grid_reference_text">
+		Referência
+	</string>
+	<string name="grid_attachment_text">
+		Anexo
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_top_objects.xml b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
index 6da86f51f6..70f6b4b6ab 100644
--- a/indra/newview/skins/default/xui/pt/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
@@ -1,50 +1,51 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="top_objects" title="Carregando...">
 	<text name="title_text">
 		Carregando...
 	</text>
 	<scroll_list name="objects_list">
-		<column label="Placar" name="score" />
-		<column label="Nome" name="name" />
-		<column label="Proprietário" name="owner" />
-		<column label="Local" name="location" />
+		<column label="Placar" name="score"/>
+		<column label="Nome" name="name"/>
+		<column label="Proprietário" name="owner"/>
+		<column label="Local" name="location"/>
+		<column label="Tempo" name="time"/>
 	</scroll_list>
 	<text name="id_text">
 		ID do Objeto:
 	</text>
-	<button label="Mostrar Avisos" name="show_beacon_btn" />
+	<button label="Mostrar Avisos" name="show_beacon_btn"/>
 	<text name="obj_name_text">
 		Nome do Objeto:
 	</text>
-	<button label="Filtro" name="filter_object_btn" />
+	<button label="Filtro" name="filter_object_btn"/>
 	<text name="owner_name_text">
 		Nome do Proprietário:
 	</text>
-	<button label="Filtro" name="filter_owner_btn" />
-	<button label="Retornar Selecionado" name="return_selected_btn" />
-	<button label="Retornar Tudo" name="return_all_btn" />
-	<button label="Desabilitar Selecionado" name="disable_selected_btn" />
-	<button label="Desabilitar Tudo" name="disable_all_btn" />
-	<button label="Atualizar" name="refresh_btn" />
-	<text name="top_scripts_title">
+	<button label="Filtro" name="filter_owner_btn"/>
+	<button label="Retornar Selecionado" name="return_selected_btn"/>
+	<button label="Retornar Tudo" name="return_all_btn"/>
+	<button label="Desabilitar Selecionado" name="disable_selected_btn"/>
+	<button label="Desabilitar Tudo" name="disable_all_btn"/>
+	<button label="Atualizar" name="refresh_btn"/>
+	<string name="top_scripts_title">
 		Top Scripts
-	</text>
-	<text name="top_scripts_text">
+	</string>
+	<string name="top_scripts_text">
 		[COUNT] scripts tomando um total de [TIME] ms
-	</text>
-	<text name="scripts_score_label">
+	</string>
+	<string name="scripts_score_label">
 		Tempo
-	</text>
-	<text name="top_colliders_title">
+	</string>
+	<string name="top_colliders_title">
 		Top Colisões
-	</text>
-	<text name="top_colliders_text">
+	</string>
+	<string name="top_colliders_text">
 		Top [COUNT] objetos experimentando muitas colisções em potencial
-	</text>
-	<text name="colliders_score_label">
+	</string>
+	<string name="colliders_score_label">
 		Placar
-	</text>
-	<text name="none_descriptor">
+	</string>
+	<string name="none_descriptor">
 		Nenhum encotrado.
-	</text>
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_tos.xml b/indra/newview/skins/default/xui/pt/floater_tos.xml
index 5e4e819834..3c77bc88ea 100644
--- a/indra/newview/skins/default/xui/pt/floater_tos.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tos.xml
@@ -1,22 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="modal container" title=" ">
-	<button label="Continuar" label_selected="Continuar" name="Continue" />
-	<button label="Cancelar" label_selected="Cancelar" name="Cancel" />
-	<radio_group name="tos_agreement">
-		<radio_item name="radio_disagree">
-			Eu não concordo com os Termos de Serviço
-		</radio_item>
-		<radio_item name="radio_agree">
-			Eu concordo com os Termos de Serviço
-		</radio_item>
-	</radio_group>
-	<text name="tos_title">
-		Contrato dos Termos de Serviço
-	</text>
+	<button label="Continuar" label_selected="Continuar" name="Continue"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<check_box label="Eu concordo com os Termos do Serviço" name="agree_chk"/>
 	<text name="tos_heading">
 		Por favor, leia os seguintes Termos de Serviço cuidadosamente. Para continuar acessando Second Life, você precisa aceitar o acordo.
 	</text>
 	<text_editor name="tos_text">
 		TOS_TEXT
 	</text_editor>
+	<string name="real_url">
+		http://secondlife.com/app/tos/
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_world_map.xml b/indra/newview/skins/default/xui/pt/floater_world_map.xml
index 5501c81aa0..493dce341a 100644
--- a/indra/newview/skins/default/xui/pt/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/pt/floater_world_map.xml
@@ -50,15 +50,14 @@
 		Eventos (M)
 	</text>
 	<check_box label=" " name="event_mature_chk" />
-	<combo_box label="Meus Amigos" name="friend combo" tool_tip="Amigos para mostrar no Mapa">
+	<combo_box label="Amigos Conectados" name="friend combo" tool_tip="Amigos para mostrar no Mapa">
 		<combo_item name="none_selected">
-			Meus Amigos
+			Amigos Conectados
 		</combo_item>
 	</combo_box>
-	<combo_box label="Minhas Landmarks" name="landmark combo"
-	     tool_tip="Landmark para mostrar no Mapa">
+	<combo_box label="Landmarks" name="landmark combo" tool_tip="Landmark para mostrar no Mapa">
 		<combo_item name="none_selected">
-			Minhas Landmarks
+			Landmarks
 		</combo_item>
 	</combo_box>
 	<line_editor label="Procurar por nome de região" name="location"
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory.xml b/indra/newview/skins/default/xui/pt/menu_inventory.xml
index 0c9bc772a9..45ed66d749 100644
--- a/indra/newview/skins/default/xui/pt/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inventory.xml
@@ -29,7 +29,7 @@
 		<menu_item_call label="Novo cabelo" name="New Hair" />
 		<menu_item_call label="Novos olhos" name="New Eyes" />
 	</menu>
-	<menu_item_call label="Abrir" name="Landmark Open" />
+	<menu_item_call label="Teletransporte" name="Landmark Open"/>
 	<menu_item_call label="Abrir" name="Animation Open" />
 	<menu_item_call label="Abrir" name="Sound Open" />
 	<menu_item_call label="Remover item." name="Purge Item" />
@@ -48,7 +48,7 @@
 	<menu_item_call label="Contatos IM Online na pasta." name="IM Online Contacts In Folder" />
 	<menu_item_call label="Todos contantos MI na pasta." name="IM All Contacts In Folder" />
 	<menu_item_call label="Executar" name="Sound Play" />
-	<menu_item_call label="Teleportar para Landmark" name="Teleport To Landmark" />
+	<menu_item_call label="Sobre as Landmarks" name="Teleport To Landmark"/>
 	<menu_item_call label="Executar in World" name="Animation Play" />
 	<menu_item_call label="Executar localmente." name="Animation Audition" />
 	<menu_item_call label="Mandar Mensagem Instantânea" name="Send Instant Message" />
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index 46d279e810..56195b551d 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -1,197 +1,201 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Main Menu">
 	<menu label="Arquivo" name="File">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-		<menu_item_call label="Upload de imagem (L$[COST])..." name="Upload Image" />
-		<menu_item_call label="Upload de som(L$[COST])..." name="Upload Sound" />
-		<menu_item_call label="Upload de animação (L$[COST])..." name="Upload Animation" />
-		<menu_item_call label="Upload de Arquivo (L$[COST] por arquivo)..." name="Bulk Upload" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="Fechar janela" name="Close Window" />
-		<menu_item_call label="Fechar todas as janelas" name="Close All Windows" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="Salvar textura como" name="Save Texture As..." />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="Tirar Foto" name="Take Snapshot" />
-		<menu_item_call label="Salvar Foto no disco" name="Snapshot to Disk" />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu label="Ajustar o tamanho da janela" name="Set Window Size">
-			<menu_item_call label="320x240" name="320x240" />
-			<menu_item_call label="640x480" name="640x480" />
-			<menu_item_call label="800x600" name="800x600" />
-			<menu_item_separator label="-----------" name="separator" />
-			<menu_item_call label="720x480 (NTSC)" name="720x480 (NTSC)" />
-			<menu_item_call label="768x576 (PAL)" name="768x576 (PAL)" />
-		</menu>
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="Sair" name="Quit" />
+		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+		<menu_item_call label="Upload de imagem (L$[COST])..." name="Upload Image"/>
+		<menu_item_call label="Upload de som(L$[COST])..." name="Upload Sound"/>
+		<menu_item_call label="Upload de animação (L$[COST])..." name="Upload Animation"/>
+		<menu_item_call label="Upload de Arquivo (L$[COST] por arquivo)..." name="Bulk Upload"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Fechar janela" name="Close Window"/>
+		<menu_item_call label="Fechar todas as janelas" name="Close All Windows"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Salvar textura como" name="Save Texture As..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Tirar Foto" name="Take Snapshot"/>
+		<menu_item_call label="Salvar Foto no disco" name="Snapshot to Disk"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Sair" name="Quit"/>
 	</menu>
 	<menu label="Editar" name="Edit">
-		<menu_item_call label="Voltar" name="Undo" />
-		<menu_item_call label="Avançar" name="Redo" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="Cortar" name="Cut" />
-		<menu_item_call label="Copiar" name="Copy" />
-		<menu_item_call label="Pasta" name="Paste" />
-		<menu_item_call label="Apagar" name="Delete" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="Procurar..." name="Search..." />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="Selecionar todos" name="Select All" />
-		<menu_item_call label="Retirar seleção" name="Deselect" />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu_item_call label="Duplicar" name="Duplicate" />
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu label="Anexar objeto" name="Attach Object" />
-		<menu label="Desanexar objeto" name="Detach Object" />
+		<menu_item_call label="Voltar" name="Undo"/>
+		<menu_item_call label="Avançar" name="Redo"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Cortar" name="Cut"/>
+		<menu_item_call label="Copiar" name="Copy"/>
+		<menu_item_call label="Pasta" name="Paste"/>
+		<menu_item_call label="Apagar" name="Delete"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Procurar..." name="Search..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Selecionar todos" name="Select All"/>
+		<menu_item_call label="Retirar seleção" name="Deselect"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Duplicar" name="Duplicate"/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu label="Anexar objeto" name="Attach Object"/>
+		<menu label="Desanexar objeto" name="Detach Object"/>
 		<menu label="Tirar a roupa" name="Take Off Clothing">
-			<menu_item_call label="Camiseta" name="Shirt" />
-			<menu_item_call label="Calças" name="Pants" />
-			<menu_item_call label="Sapatos" name="Shoes" />
-			<menu_item_call label="Meias" name="Socks" />
-			<menu_item_call label="Blusa" name="Jacket" />
-			<menu_item_call label="Luvas" name="Gloves" />
-			<menu_item_call label="Anágua" name="Menu Undershirt" />
-			<menu_item_call label="Roupa de baixo" name="Menu Underpants" />
-			<menu_item_call label="saia" name="Skirt" />
-			<menu_item_call label="Toda a roupa" name="All Clothes" />
+			<menu_item_call label="Camiseta" name="Shirt"/>
+			<menu_item_call label="Calças" name="Pants"/>
+			<menu_item_call label="Sapatos" name="Shoes"/>
+			<menu_item_call label="Meias" name="Socks"/>
+			<menu_item_call label="Blusa" name="Jacket"/>
+			<menu_item_call label="Luvas" name="Gloves"/>
+			<menu_item_call label="Anágua" name="Menu Undershirt"/>
+			<menu_item_call label="Roupa de baixo" name="Menu Underpants"/>
+			<menu_item_call label="saia" name="Skirt"/>
+			<menu_item_call label="Toda a roupa" name="All Clothes"/>
 		</menu>
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu_item_call label="Movimentos..." name="Gestures..." />
-		<menu_item_call label="Perfil..." name="Profile..." />
-		<menu_item_call label="Aparência..." name="Appearance..." />
-		<menu_item_separator label="-----------" name="separator7" />
-		<menu_item_check label="Amigos..." name="Friends..." />
-		<menu_item_call label="Grupos..." name="Groups..." />
-		<menu_item_separator label="-----------" name="separator8" />
-		<menu_item_call label="Preferências..." name="Preferences..." />
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call label="Movimentos..." name="Gestures..."/>
+		<menu_item_call label="Perfil..." name="Profile..."/>
+		<menu_item_call label="Aparência..." name="Appearance..."/>
+		<menu_item_separator label="-----------" name="separator7"/>
+		<menu_item_check label="Amigos..." name="Friends..."/>
+		<menu_item_call label="Grupos..." name="Groups..."/>
+		<menu_item_separator label="-----------" name="separator8"/>
+		<menu_item_call label="Preferências..." name="Preferences..."/>
 	</menu>
 	<menu label="Exibir" name="View">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-		<menu_item_call label="Visão do mouse" name="Mouselook" />
-		<menu_item_check label="Construção" name="Build" />
-		<menu_item_call label="Resetar visão" name="Reset View" />
-		<menu_item_call label="Olhar para o último movimento" name="Look at Last Chatter" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_check label="Barra de ferramentas" name="Toolbar" />
-		<menu_item_check label="Histórico de chat" name="Chat History" />
-		<menu_item_check label="Mensagem instantânea" name="Instant Message" />
-		<menu_item_call label="Inventário" name="Inventory" />
-		<menu_item_check label="Lista de pessoas que não podem falar com você" name="Mute List" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_check label="Controle de câmeras" name="Camera Controls" />
-		<menu_item_check label="Controle de movimentos" name="Movement Controls" />
-		<menu_item_check label="Mapa do mundo" name="World Map" />
-		<menu_item_check label="Mini-Mapa" name="Mini-Map" />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_check label="Barra de estatísticas" name="Statistics Bar" />
-		<menu_item_check label="Linhas de propriedades" name="Property Lines" />
-		<menu_item_check label="Dono de terrenos" name="Land Owners" />
-		<menu_item_separator label="-----------" name="separator4" />
+		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+		<menu_item_call label="Visão do mouse" name="Mouselook"/>
+		<menu_item_check label="Construção" name="Build"/>
+		<menu_item_check label="Joystick Flycam" name="Joystick Flycam"/>
+		<menu_item_call label="Resetar visão" name="Reset View"/>
+		<menu_item_call label="Olhar para o último movimento" name="Look at Last Chatter"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_check label="Barra de ferramentas" name="Toolbar"/>
+		<menu_item_check label="Conversa local" name="Chat History"/>
+		<menu_item_check label="Comunicar" name="Instant Message"/>
+		<menu_item_check label="Inventário" name="Inventory"/>
+		<menu_item_check label="Microfone ativo" name="Active Speakers"/>
+		<menu_item_check label="Lista de pessoas que não podem falar com você" name="Mute List"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_check label="Controle de câmeras" name="Camera Controls"/>
+		<menu_item_check label="Controle de movimentos" name="Movement Controls"/>
+		<menu_item_check label="Mapa do mundo" name="World Map"/>
+		<menu_item_check label="Mini-Mapa" name="Mini-Map"/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_check label="Barra de estatísticas" name="Statistics Bar"/>
+		<menu_item_check label="Linhas de propriedades" name="Property Lines"/>
+		<menu_item_check label="Dono de terrenos" name="Land Owners"/>
+		<menu_item_separator label="-----------" name="separator4"/>
 		<menu label="Dicas" name="Hover Tips">
-			<menu_item_check label="Mostrar dicas" name="Show Tips" />
-			<menu_item_separator label="-----------" name="separator" />
-			<menu_item_check label="Dicas de terreno" name="Land Tips" />
-			<menu_item_check label="Dicas de todos os objetos" name="Tips On All Objects" />
-		</menu>
-		<menu_item_check label="Mostrar tamanho fisíco" name="Alt Shows Physical" />
-		<menu_item_check label="Luz para transparência" name="Highlight Transparent" />
-		<menu label="Piscar" name="Beacons">
-			<menu_item_check label="Objetos com scripts" name="Scripted Objects" />
-			<menu_item_check label="Objetos fisícos" name="Physical Objects" />
-			<menu_item_check label="Recursos de som" name="Sound Sources" />
-			<menu_item_check label="Recursos" name="Particle Sources" />
-			<menu_item_separator label="-----------" name="separator" />
-			<menu_item_check label="Partículas escondidas" name="Hide Particles" />
+			<menu_item_check label="Mostrar dicas" name="Show Tips"/>
+			<menu_item_separator label="-----------" name="separator"/>
+			<menu_item_check label="Dicas de terreno" name="Land Tips"/>
+			<menu_item_check label="Dicas de todos os objetos" name="Tips On All Objects"/>
 		</menu>
-		<menu_item_check label="Mostrar anexo em HUD" name="Show HUD Attachments" />
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="Mais zoom" name="Zoom In" />
-		<menu_item_call label="Zoom padrão" name="Zoom Default" />
-		<menu_item_call label="Menos zoom" name="Zoom Out" />
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu_item_call label="Tela cheia" name="Toggle Fullscreen" />
-		<menu_item_call label="Ajustar o tamanho da UI ao padrão" name="Set UI Size to Default" />
+		<menu_item_check label="Luz para transparência" name="Highlight Transparent"/>
+		<menu_item_check label="Balizas" name="beacons"/>
+		<menu_item_check label="Esconder partículas" name="Hide Particles"/>
+		<menu_item_check label="Mostrar anexo em HUD" name="Show HUD Attachments"/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu_item_call label="Mais zoom" name="Zoom In"/>
+		<menu_item_call label="Zoom padrão" name="Zoom Default"/>
+		<menu_item_call label="Menos zoom" name="Zoom Out"/>
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call label="Tela cheia" name="Toggle Fullscreen"/>
+		<menu_item_call label="Ajustar o tamanho da UI ao padrão" name="Set UI Size to Default"/>
 	</menu>
 	<menu label="Mundo" name="World">
-		<menu_item_call label="Conversa" name="Chat" />
-		<menu_item_call label="Iniciar movimento" name="Start Gesture" />
-		<menu_item_check label="Sempre Correr" name="Always Run" />
-		<menu_item_check label="Voar" name="Fly" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="Criar Landmark aqui" name="Create Landmark Here" />
-		<menu_item_call label="Marcar como  casa " name="Set Home to Here" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="Teleportar para casa" name="Teleport Home" />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="Deixar ausente" name="Set Away" />
-		<menu_item_call label="Modo Ocupado" name="Set Busy" />
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="Meu terreno..." name="My Land..." />
-		<menu_item_call label="Sobre terreno..." name="About Land..." />
-		<menu_item_call label="Comprar terreno..." name="Buy Land..." />
-		<menu_item_call label="Região/Estado..." name="Region/Estate..." />
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu label="Forçar o sol" name="Force Sun">
-			<menu_item_call label="Amanhecer" name="Sunrise" />
-			<menu_item_call label="Meio-dia" name="Noon" />
-			<menu_item_call label="Pôr do sol" name="Sunset" />
-			<menu_item_call label="Meia noite" name="Midnight" />
-			<menu_item_separator label="-----------" name="separator" />
-			<menu_item_call label="Reverter para o padrão da região" name="Revert to Region Default" />
+		<menu_item_call label="Conversa" name="Chat"/>
+		<menu_item_check label="Sempre Correr" name="Always Run"/>
+		<menu_item_check label="Voar" name="Fly"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Criar Landmark aqui" name="Create Landmark Here"/>
+		<menu_item_call label="Marcar como  casa " name="Set Home to Here"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Teleportar para casa" name="Teleport Home"/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Deixar ausente" name="Set Away"/>
+		<menu_item_call label="Modo Ocupado" name="Set Busy"/>
+		<menu_item_call label="Parar todas as animações" name="Stop All Animations"/>
+		<menu_item_call label="Liberar controles" name="Release Keys"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Histórico de conta..." name="Account History..."/>
+		<menu_item_call label="Gerenciar minha conta..." name="Manage My Account..."/>
+		<menu_item_call label="Comprar L$..." name="Buy and Sell L$..."/>
+		<menu_item_separator label="-----------" name="separator5"/>
+		<menu_item_call label="Meu terreno..." name="My Land..."/>
+		<menu_item_call label="Sobre terreno..." name="About Land..."/>
+		<menu_item_call label="Comprar terreno..." name="Buy Land..."/>
+		<menu_item_call label="Região/Estado..." name="Region/Estate..."/>
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu label="Configurações de ambiente" name="Environment Settings">
+			<menu_item_call label="Amanhecer" name="Sunrise"/>
+			<menu_item_call label="Meio dia" name="Noon"/>
+			<menu_item_call label="Pôr do sol" name="Sunset"/>
+			<menu_item_call label="Meia noite" name="Midnight"/>
+			<menu_item_call label="Reverter ao padrão da região" name="Revert to Region Default"/>
+			<menu_item_separator label="-----------" name="separator"/>
+			<menu_item_call label="Editor de ambiente" name="Environment Editor"/>
 		</menu>
 	</menu>
 	<menu label="Ferramentas" name="Tools">
 		<menu label="Selecionar ferramenta" name="Select Tool">
-			<menu_item_call label="Foco" name="Focus" />
-			<menu_item_call label="Mover" name="Move" />
-			<menu_item_call label="Editar" name="Edit" />
-			<menu_item_call label="Criar" name="Create" />
-			<menu_item_call label="Terreno" name="Land" />
+			<menu_item_call label="Foco" name="Focus"/>
+			<menu_item_call label="Mover" name="Move"/>
+			<menu_item_call label="Editar" name="Edit"/>
+			<menu_item_call label="Criar" name="Create"/>
+			<menu_item_call label="Terreno" name="Land"/>
 		</menu>
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_check label="Selecionar apenas meus objetos" name="Select Only My Objects" />
-		<menu_item_check label="Selecionar apenas objetos móveis" name="Select Only Movable Objects" />
-		<menu_item_check label="Selecionar objetos pelo som" name="Select By Surrounding" />
-		<menu_item_check label="Mostrar seleções escondidas" name="Show Hidden Selection" />
-		<menu_item_check label="Mostrar luz radiante para solução"
-		     name="Show Light Radius for Selection" />
-		<menu_item_check label="Mostrar seleções de feixes" name="Show Selection Beam" />
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_check label="Alinhar a grade" name="Snap to Grid" />
-		<menu_item_call label="Alinhar objeto a grade XY" name="Snap Object XY to Grid" />
-		<menu_item_call label="Usar seleção na grade" name="Use Selection for Grid" />
-		<menu_item_call label="Opções de grade..." name="Grid Options..." />
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="Unir" name="Link" />
-		<menu_item_call label="Desunir" name="Unlink" />
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu_item_call label="Parar todas as animações" name="Stop All Animations" />
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="Focus na seleção" name="Focus on Selection" />
-		<menu_item_call label="Zoom na Seleção" name="Zoom to Selection" />
-		<menu_item_call label="Comprar objetos" name="Menu Object Take" />
-		<menu_item_call label="Pegar cópia" name="Take Copy" />
-		<menu_item_call label="Salvar objeto direto no meu inventário"
-		     name="Save Object Back to My Inventory" />
-		<menu_item_call label="Salvar todos os objetos" name="Save Object Back to Object Contents" />
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu_item_call label="Mostrar scripts defeituosos/Erros de janela"
-		     name="Show Script Warning/Error Window" />
-		<menu_item_call label="Recolocar scripts na seleção" name="Recompile Scripts in Selection" />
-		<menu_item_call label="Resetar script selecionado" name="Reset Scripts in Selection" />
-		<menu_item_call label="Ajustar scripts para funcionar na seleção"
-		     name="Set Scripts to Running in Selection" />
-		<menu_item_call label="Ajustar scripts para não funcionar na seleção"
-		     name="Set Scripts to Not Running in Selection" />
-		<menu_item_separator label="-----------" name="separator6" />
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_check label="Selecionar apenas meus objetos" name="Select Only My Objects"/>
+		<menu_item_check label="Selecionar apenas objetos móveis" name="Select Only Movable Objects"/>
+		<menu_item_check label="Selecionar objetos pelo som" name="Select By Surrounding"/>
+		<menu_item_check label="Mostrar seleções escondidas" name="Show Hidden Selection"/>
+		<menu_item_check label="Mostrar luz radiante para solução" name="Show Light Radius for Selection"/>
+		<menu_item_check label="Mostrar seleções de feixes" name="Show Selection Beam"/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_check label="Alinhar a grade" name="Snap to Grid"/>
+		<menu_item_call label="Alinhar objeto a grade XY" name="Snap Object XY to Grid"/>
+		<menu_item_call label="Usar seleção na grade" name="Use Selection for Grid"/>
+		<menu_item_call label="Opções de grade..." name="Grid Options..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_check label="Editar partes ligadas" name="Edit Linked Parts"/>
+		<menu_item_call label="Unir" name="Link"/>
+		<menu_item_call label="Desunir" name="Unlink"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Focus na seleção" name="Focus on Selection"/>
+		<menu_item_call label="Zoom na Seleção" name="Zoom to Selection"/>
+		<menu_item_call label="Comprar objetos" name="Menu Object Take"/>
+		<menu_item_call label="Pegar cópia" name="Take Copy"/>
+		<menu_item_call label="Salvar objeto direto no meu inventário" name="Save Object Back to My Inventory"/>
+		<menu_item_call label="Salvar todos os objetos" name="Save Object Back to Object Contents"/>
+		<menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call label="Mostrar scripts defeituosos/Erros de janela" name="Show Script Warning/Error Window"/>
+		<menu label="Recolocar scripts na seleção" name="Recompile Scripts in Selection">
+			<menu_item_call label="Mono" name="Mono"/>
+			<menu_item_call label="LSL" name="LSL"/>
+		</menu>
+		<menu_item_call label="Resetar script selecionado" name="Reset Scripts in Selection"/>
+		<menu_item_call label="Ajustar scripts para funcionar na seleção" name="Set Scripts to Running in Selection"/>
+		<menu_item_call label="Ajustar scripts para não funcionar na seleção" name="Set Scripts to Not Running in Selection"/>
 	</menu>
 	<menu label="Ajuda" name="Help">
-		<menu_item_call label="Ajuda Second Life" name="Second Life Help" />
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="Reportar Abuso..." name="Report Abuse..." />
-		<menu_item_call label="Colisões, impulsos e batidas..." name="Bumps, Pushes &amp;amp; Hits..." />
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu_item_call label="Sobre Second Life..." name="About Second Life..." />
+		<menu_item_call label="Ajuda Second Life" name="Second Life Help"/>
+		<menu_item_call label="Tutorial" name="Tutorial"/>
+		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Blog official da Linden..." name="Official Linden Blog..."/>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Portal de Scripts..." name="Scripting Portal..."/>
+		<menu_item_separator label="-----------" name="separator3"/>
+		<menu_item_call label="Reportar Abuso..." name="Report Abuse..."/>
+		<menu_item_call label="Colisões, impulsos e batidas..." name="Bumps, Pushes &amp;amp; Hits..."/>
+		<menu_item_call label="Medidor de Lag" name="Lag Meter"/>
+		<menu_item_separator label="-----------" name="separator7"/>
+		<menu label="Reportando Bug" name="Bug Reporting">
+			<menu_item_call label="Rastreador público de problemas..." name="Public Issue Tracker..."/>
+			<menu_item_call label="Ajuda do rastreador público de problemas..." name="Publc Issue Tracker Help..."/>
+			<menu_item_separator label="-----------" name="separator7"/>
+			<menu_item_call label="Reportando Bug 101..." name="Bug Reporing 101..."/>
+			<menu_item_call label="Questões de Segurança..." name="Security Issues..."/>
+			<menu_item_call label="Wiki de QA ..." name="QA Wiki..."/>
+			<menu_item_separator label="-----------" name="separator9"/>
+			<menu_item_call label="Reportar Bug..." name="Report Bug..."/>
+		</menu>
+		<menu_item_call label="Sobre Second Life..." name="About Second Life..."/>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_general.xml b/indra/newview/skins/default/xui/pt/panel_group_general.xml
index 31bd1b6b4e..ec57397e29 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_general.xml
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Geral" name="general_tab">
-	<text name="help_text">
+	<string name="help_text">
 		A aba diversos contém informações gerais sobre esse grupo, a lista dos donos e seus membros, preferências gerais do grupo e opções dos membros. Passe o seu mouse por cima para ver mais informações. Ajuda.
-	</text>
-	<button label="?" label_selected="?" name="help_button" />
-	<line_editor name="group_name_editor">
-		Digite o nome do seu novo grupo aqui
-	</line_editor>
+	</string>
+	<string name="group_info_unchanged">
+		Informações gerais do grupo foram modificadas
+	</string>
+	<button label="?" label_selected="?" name="help_button"/>
+	<line_editor label="Digite o nome do seu novo grupo aqui" name="group_name_editor"/>
 	<text name="group_name">
 		Digite o nome do seu novo grupo aqui
 	</text>
@@ -19,54 +20,57 @@
 	<text name="group_charter_label">
 		Patente do Grupo
 	</text>
-	<texture_picker label="Group Insignia" name="insignia"
-	     tool_tip="Clique para escolher uma imagem" />
+	<texture_picker label="Group Insignia" name="insignia" tool_tip="Clique para escolher uma imagem"/>
 	<text_editor name="charter">
 		Patente do grupo
 	</text_editor>
-	<button label="Juntar (L$0)" label_selected="Juntar (L$0)" name="join_button" />
-	<button label="Vista detalhada" label_selected="Vista detalhada" name="info_button" />
-	<text>
-		Donos &amp; Membros visíveis
+	<button label="Juntar (L$0)" label_selected="Juntar (L$0)" name="join_button"/>
+	<button label="Vista detalhada" label_selected="Vista detalhada" name="info_button"/>
+	<text name="text_owners_and_visible_members">
+		Proprietários &amp; Membros visíveis
 	</text>
-	<text>
-		Os proprietários são mostrados em realce
+	<text name="text_owners_are_shown_in_bold">
+		(Proprietários são mostrados em negrito )
 	</text>
 	<name_list name="visible_members">
-		<column label="Nome do membro" name="name" />
-		<column label="Título" name="title" />
-		<column label="Último login" name="online" />
+		<column label="Nome do membro" name="name"/>
+		<column label="Título" name="title"/>
+		<column label="Último login" name="online"/>
 	</name_list>
-	<text name="incomplete_member_data_str">
-		Recuperando dados do membro
-	</text>
-	<text name="confirm_group_create_str">
-		Criar este grupo custará L$100. Você está certo que quer gastar L$100 para criar este grupo?
-	</text>
-	<text>
-		Preferências do grupo
+	<text name="text_group_preferences">
+		Preferências de Grupos
 	</text>
 	<panel name="preferences_container">
-		<check_box label="Mostrar na lista do grupo." name="show_in_group_list"
-		     tool_tip="Selecione onde esse grupo será exibido.   janela de procura e no perfil dos membros." />
-		<check_box label="Publicar na Web." name="publish_on_web"
-		     tool_tip="Selecione onde a informações desse grupo irá ser publicada na Web." />
-		<check_box label="Abrir o registro" name="open_enrollement"
-		     tool_tip="Esse grupo permite que novos membros entrem sem serem convidados" />
-		<check_box label="Tx. de adesão: L$" name="check_enrollment_fee"
-		     tool_tip="É necessário uma taxa de registro." />
-		<spinner name="spin_enrollment_fee"
-		     tool_tip="Os novos membros terão de pagar a taxa de registro para fazerem parte do grupo." />
-		<check_box label="Adulto" name="mature"
-		     tool_tip="Selecione se o grupo possuir conteúdo adulto." />
+		<check_box label="Mostre na busca" name="show_in_group_list" tool_tip="Deixe as pessoas ver este grupo nos resultados de busca."/>
+		<check_box label="Aberta inscrição" name="open_enrollement" tool_tip="Esse grupo permite que novos membros entrem sem serem convidados"/>
+		<check_box label="Taxa de inscrição: L$" name="check_enrollment_fee" tool_tip="É necessário uma taxa de registro."/>
+		<spinner name="spin_enrollment_fee" tool_tip="Os novos membros terão de pagar a taxa de registro para fazerem parte do grupo."/>
+		<combo_box name="group_mature_check" tool_tip="Define se a informação do seu grupo é considerada adulta.">
+			<combo_item name="select_mature">
+				- Selecinar conteúdo adulto -
+			</combo_item>
+			<combo_item name="mature">
+				Conteúdo adulto
+			</combo_item>
+			<combo_item name="not_mature">
+				Conteúdo não adulto
+			</combo_item>
+		</combo_box>
 		<panel name="title_container">
 			<text name="active_title_label">
 				Meu título ativo
 			</text>
-			<combo_box name="active_title"
-			     tool_tip="Mude o título que aparece em seu avatar quando o grupo estiver ativo." />
+			<combo_box name="active_title" tool_tip="Mude o título que aparece em seu avatar quando o grupo estiver ativo."/>
 		</panel>
-		<check_box label="Receba notícias do grupo." name="receive_notices"
-		     tool_tip="Você quer receber notícias desse grupo" />
+		<check_box label="Receber avisos do grupo" name="receive_notices" tool_tip="Você quer receber notícias desse grupo"/>
+		<check_box label="Listar grupo no meu perfil" name="list_groups_in_profile" tool_tip="Define se você deseja listar este grupo no seu Perfil"/>
 	</panel>
+	<string name="incomplete_member_data_str">
+		Recuperando dados do membro
+	</string>
+	<string name="confirm_group_create_str">
+		Criar este grupo irá custar L$100. 
+Você está realmente, realmente, REALMENTE seguro que deseja gastar L$100 para criar este grupo? 
+Esteja consciente de que ninguém mais se juntar este grupo dentro de 48 horas, será dissolvido e o nome não estará disponível para uso futuro.
+	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_invite.xml b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
index 89f0b933c7..f8e76b87f0 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
@@ -1,18 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Convidar um membro" name="invite_panel">
 	<text name="help_text">
-		Você pode seleciolar vários residentes para convidar para o seu grupo. Clique &apos;Selecionador de pessoas&apos; para iniciar.
+		Você pode selecionar múltiplos residentes para convidar ao seu grupo. Clique &apos;Abra o Selecionador de Pessoas&apos; para iniciar.
 	</text>
-	<button label="Abrir selecionador de pessoas." name="add_button" tool_tip="" />
-	<name_list name="invitee_list"
-	     tool_tip="Segure a tecla Ctrl e clique no nome dos residentes para selecionar multiplos personagens." />
-	<button label="Remove Selected from List" name="remove_button"
-	     tool_tip="Remove os residentes selecionados acima  da lista de convite." />
+	<button label="Abrir selecionador de pessoas." name="add_button" tool_tip=""/>
+	<name_list name="invitee_list" tool_tip="Mantenha apertada a tecla Control e clique nos nomes dos residentes para uma seleção múltipla."/>
+	<button label="Remove Selected from List" name="remove_button" tool_tip="Remove os residentes selecionados acima  da lista de convite."/>
 	<text name="role_text">
-		Selecione a função a ser dada a eles:
+		Escolha que Função atribuir a eles:
 	</text>
-	<combo_box name="role_name"
-	     tool_tip="Selecione da lista de Funções os que você está permitido a dar aos membros." />
-	<button label="Mandar convite." name="ok_button" />
-	<button label="Cancelar" name="cancel_button" />
+	<combo_box name="role_name" tool_tip="Escolha a partir da lista de Funções autorizadas a você para inclusão de membros."/>
+	<button label="Mandar convite." name="ok_button"/>
+	<button label="Cancelar" name="cancel_button"/>
+	<string name="confirm_invite_owner_str">
+		Você tem certeza de que deseja convidar novo(s) proprietário(s)?  Esta ação é permanente!
+	</string>
+	<string name="loading">
+		(carregando...)
+	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
index 7288c98dc6..f299d78f79 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
@@ -1,51 +1,54 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Terra L$" name="land_money_tab">
-	<text name="help_text">
+	<string name="help_text">
 		Lotes pertencentes ao grupo são listadas com detalhes de contribuição. Um aviso aparece até que o total de Terras em Uso seja menor ou igual ao Total de Contribuições. As abas de Planejamento, Detalhes e Vendas fornecem informações sobre as finanças do grupo.
-	</text>
-	<button label="?" name="help_button" />
-	<text name="cant_view_group_land_text">
+	</string>
+	<button label="?" name="help_button"/>
+	<string name="cant_view_group_land_text">
 		Você não tem permissão para ver as terras pertencentes ao grupo.
-	</text>
-	<text name="cant_view_group_accounting_text">
+	</string>
+	<string name="cant_view_group_accounting_text">
 		Você não tem permissão para ver as informações sobre as contas do grupo.
-	</text>
+	</string>
+	<string name="loading_txt">
+		Carregando...
+	</string>
 	<text name="group_land_heading">
 		Terra percentence ao grupo
 	</text>
 	<scroll_list name="group_parcel_list">
-		<column label="Nome do Lote" name="name" />
-		<column label="Região" name="location" />
-		<column label="Área" name="area" />
-		<column label="" name="hidden" />
+		<column label="Nome do Lote" name="name"/>
+		<column label="Região" name="location"/>
+		<column label="Área" name="area"/>
+		<column label="" name="hidden"/>
 	</scroll_list>
-	<button label="Mostrar no Mapa" label_selected="Mostrar no Mapa" name="map_button" />
+	<button label="Mostrar no Mapa" label_selected="Mostrar no Mapa" name="map_button"/>
 	<text name="total_contributed_land_label">
 		Contribuição Total:
 	</text>
 	<text name="total_contributed_land_value">
-		0 metros quadrados
+		[AREA] m2
 	</text>
 	<text name="total_land_in_use_label">
 		Total de Terra em Uso:
 	</text>
 	<text name="total_land_in_use_value">
-		0 metros quadrados
+		[AREA] m2
 	</text>
 	<text name="land_available_label">
 		Terra Disponível:
 	</text>
 	<text name="land_available_value">
-		0 metros quadrados
+		[AREA] m2
 	</text>
 	<text name="your_contribution_label">
 		Sua Contribuição:
 	</text>
-	<text name="your_contribution_max_value_append">
-		metros quadrados
-	</text>
+	<string name="land_contrib_error">
+		Não é possível definir sua contribuição para o terreno.
+	</string>
 	<text name="your_contribution_max_value">
-		(aguardado)
+		m2 ([AMOUNT] máxima)
 	</text>
 	<text name="group_over_limit_text">
 		Membros do grupo precisam contribuir com mais créditos de Terra para garantir a terra em uso.
@@ -54,28 +57,19 @@
 		Grupo L$
 	</text>
 	<tab_container name="group_money_tab_container">
-		<panel label="Planejamento" name="group_money_planning_tab">
-			<text_editor name="group_money_planning_text">
-				Computando...
-			</text_editor>
-		</panel>
 		<panel label="Detalhes" name="group_money_details_tab">
 			<text_editor name="group_money_details_text">
 				Computando...
 			</text_editor>
-			<button label="&lt; Cedo" label_selected="&lt; Cedo" name="earlier_details_button"
-			     tool_tip="Voltar no Tempo" />
-			<button label="Tarde &gt;" label_selected="Tarde &gt;" name="later_details_button"
-			     tool_tip="Adiantar o Tempo" />
+			<button label="&lt; Cedo" label_selected="&lt; Cedo" name="earlier_details_button" tool_tip="Voltar no Tempo"/>
+			<button label="Tarde &gt;" label_selected="Tarde &gt;" name="later_details_button" tool_tip="Adiantar o Tempo"/>
 		</panel>
 		<panel label="Vendas" name="group_money_sales_tab">
 			<text_editor name="group_money_sales_text">
 				Computando...
 			</text_editor>
-			<button label="&lt; Mais Cedo" label_selected="&lt; Mais Cedo"
-			     name="earlier_sales_button" tool_tip="Voltar no Tempo" />
-			<button label="Mais Tarde" label_selected="Mais Tarde" name="later_sales_button"
-			     tool_tip="Adiantar o Tempo" />
+			<button label="&lt; Mais Cedo" label_selected="&lt; Mais Cedo" name="earlier_sales_button" tool_tip="Voltar no Tempo"/>
+			<button label="Mais Tarde" label_selected="Mais Tarde" name="later_sales_button" tool_tip="Adiantar o Tempo"/>
 		</panel>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_notices.xml b/indra/newview/skins/default/xui/pt/panel_group_notices.xml
index f5698a7506..aa328708a0 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_notices.xml
@@ -11,7 +11,9 @@
 		Arquivo de notícias do grupo
 	</text>
 	<text name="lbl2">
-		As notícias são mantidas por 14 dias. Clicar na notícia que você desejar ver.
+		As notícias são mantidas por 14 dias. Clique na notícia abaixo que você deseja ver.
+Clique no botão “Atualizar” para verificar se novas notícias foram recebidas.
+Listas de aviso estão limitadas a 200 por grupo, diariamente.
 	</text>
 	<scroll_list name="notice_list">
 		<column label="" name="icon" />
diff --git a/indra/newview/skins/default/xui/pt/panel_group_roles.xml b/indra/newview/skins/default/xui/pt/panel_group_roles.xml
index 8bf421cc75..cbb21c5b49 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_roles.xml
@@ -1,15 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Membros e Funções" name="roles_tab">
-	<text name="default_needs_apply_text">
+	<string name="default_needs_apply_text">
 		Existem alterações
-	</text>
-	<text name="want_apply_text">
+	</string>
+	<string name="want_apply_text">
 		Você quer aplicar essas alterações?
-	</text>
-	<text name="cant_delete_role">
-		Todos os proprietários possuem funções especiais que não podem ser apagadas.
-	</text>
-	<button label="?" name="help_button" />
+	</string>
+	<button label="?" name="help_button"/>
 	<panel name="members_header">
 		<text name="static">
 			Membros e Funções
@@ -46,43 +43,46 @@ Estes ajustes podem ser customizados para uma flexibilidade maior.
 	</panel>
 	<tab_container name="roles_tab_container">
 		<panel label="Membros" name="members_sub_tab" tool_tip="Membros">
-			<button label="Pesquisar" name="search_button" />
-			<button label="Mostrar todos" name="show_all_button" />
+			<button label="Pesquisar" name="search_button"/>
+			<button label="Mostrar todos" name="show_all_button"/>
 			<name_list name="member_list">
-				<column label="Nome do membro" name="name" />
-				<column label="Tarefa cedida." name="donated" />
-				<column label="Último login" name="online" />
+				<column label="Nome do membro" name="name"/>
+				<column label="Tarefa cedida." name="donated"/>
+				<column label="Último login" name="online"/>
 			</name_list>
-			<button label="Convidar nova pessoa" name="member_invite" />
-			<button label="Sair do Grupo" name="member_eject" />
-			<text name="help_text">
-				Você pode adicionar ou remover as funções atribuídas ou selecionar múltiplos membros pressionando o Ctrl e clicando em seus nomes.
-			</text>
+			<button label="Convidar nova pessoa" name="member_invite"/>
+			<button label="Sair do Grupo" name="member_eject"/>
+			<string name="help_text">
+				Você pode adicionar ou remover os direitos designados aos membros.Selecione vários membros segurando a tecla Ctrl e clicando em seus nomes.
+			</string>
 		</panel>
 		<panel label="Funções" name="roles_sub_tab">
-			<button label="Busca" name="search_button" />
-			<button label="Mostrar todos" name="show_all_button" />
+			<button label="Busca" name="search_button"/>
+			<button label="Mostrar todos" name="show_all_button"/>
 			<scroll_list name="role_list">
-				<column label="Nome da função" name="name" />
-				<column label="Título" name="title" />
-				<column label="Membro" name="members" />
+				<column label="Nome da função" name="name"/>
+				<column label="Título" name="title"/>
+				<column label="Membro" name="members"/>
 			</scroll_list>
-			<button label="Criar nova função..." name="role_create" />
-			<button label="Apagar função" name="role_delete" />
-			<text name="help_text">
+			<button label="Criar nova função..." name="role_create"/>
+			<button label="Apagar função" name="role_delete"/>
+			<string name="help_text">
 				Funções e habilidades permitidas para os membros da lista. Os membros poderão ter um ou mais funções. O grupo poderá ter 10 ou mais funções, Incluíndo as funções dos membros e do dono do grupo.
-			</text>
+			</string>
+			<string name="cant_delete_role">
+				Os direitos de “Todos” e dos “Donos” são especiais e não podem ser apagados
+			</string>
 		</panel>
 		<panel label="Habilidades" name="actions_sub_tab">
-			<button label="Busca" name="search_button" />
-			<button label="Mostrar todos" name="show_all_button" />
+			<button label="Busca" name="search_button"/>
+			<button label="Mostrar todos" name="show_all_button"/>
 			<scroll_list name="action_list" tool_tip="Selecionar habilidade e ver detalhes.">
-				<column label="" name="icon" />
-				<column label="" name="action" />
+				<column label="" name="icon"/>
+				<column label="" name="action"/>
 			</scroll_list>
-			<text name="help_text">
+			<string name="help_text">
 				Habilidades permite que os membros façam coisas especificas dentro do grupo.Há uma grande variedade de habilidades.
-			</text>
+			</string>
 		</panel>
 	</tab_container>
 	<panel name="members_footer">
@@ -93,13 +93,12 @@ Estes ajustes podem ser customizados para uma flexibilidade maior.
 			Habilidades permitidas
 		</text>
 		<scroll_list name="member_assigned_roles">
-			<column label="" name="checkbox" />
-			<column label="" name="role" />
+			<column label="" name="checkbox"/>
+			<column label="" name="role"/>
 		</scroll_list>
-		<scroll_list name="member_allowed_actions"
-		     tool_tip="Ver detalhes das habilidades permitidas">
-			<column label="" name="icon" />
-			<column label="" name="action" />
+		<scroll_list name="member_allowed_actions" tool_tip="Ver detalhes das habilidades permitidas">
+			<column label="" name="icon"/>
+			<column label="" name="action"/>
 		</scroll_list>
 	</panel>
 	<panel name="roles_footer">
@@ -124,17 +123,14 @@ Estes ajustes podem ser customizados para uma flexibilidade maior.
 		<text name="static4">
 			Membros atribuídos
 		</text>
-		<text name="static5"
-		     tool_tip="A list of Abilities the currently selected role can perform.">
+		<text name="static5">
 			Habilidades permitidas
 		</text>
-		<check_box label="Membros visivéis" name="role_visible_in_list"
-		     tool_tip="Selecione se os membros estarão visivéis na aba diversos para as pessoas de fora do grupo." />
-		<scroll_list name="role_allowed_actions"
-		     tool_tip="Para ver detalhes de cada habiliadade permitida veja a aba correspondente.">
-			<column label="" name="icon" />
-			<column label="" name="checkbox" />
-			<column label="" name="action" />
+		<check_box label="Membros visivéis" name="role_visible_in_list" tool_tip="Selecione se os membros estarão visivéis na aba diversos para as pessoas de fora do grupo."/>
+		<scroll_list name="role_allowed_actions" tool_tip="Para ver detalhes de cada habiliadade permitida veja a aba correspondente.">
+			<column label="" name="icon"/>
+			<column label="" name="checkbox"/>
+			<column label="" name="action"/>
 		</scroll_list>
 	</panel>
 	<panel name="actions_footer">
diff --git a/indra/newview/skins/default/xui/pt/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml
index fb42e2487e..8b9cef37d0 100644
--- a/indra/newview/skins/default/xui/pt/panel_login.xml
+++ b/indra/newview/skins/default/xui/pt/panel_login.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_login">
 	<text name="first_name_text">
 		Primeiro nome:
@@ -23,15 +23,15 @@
 			&lt; Digite o nome da região;
 		</combo_item>
 	</combo_box>
-	<check_box label="Lembrar senha" name="remember_check" />
-	<text name="full_screen_text">
-		O visor indicará a tela cheia quando entrar.
+	<check_box label="Lembrar senha" name="remember_check"/>
+	<button label="Entrar" label_selected="Entrar" name="connect_btn"/>
+	<text name="create_new_account_text">
+		Registrar-se para uma conta
 	</text>
-	<button label="Preferências..." label_selected="Preferências..."
-	     name="preferences_btn" />
-	<button label="Conectar" label_selected="Conectar" name="connect_btn" />
-	<button label="Sair" label_selected="Sair" name="quit_btn" />
-	<text name="version_text">
-		1.23.4 (5)
+	<text name="forgot_password_text">
+		Esqueceu seu nome de usuário e senha?
+	</text>
+	<text name="channel_text">
+		[CHANNEL] [VERSION]
 	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
index d99e620938..952997a542 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -1,56 +1,57 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat" name="chat">
-	<text type="string" length="1" name="text_box">
-		Tamanho da Fonte do Chat:
+	<text length="1" name="text_box" type="string">
+		Tamanho da Fonte &#10;do Chat:
 	</text>
-	<radio_group name="chat font size">
-		<radio_item type="string" length="1" name="radio">
+	<radio_group name="chat_font_size">
+		<radio_item name="radio">
 			Pequeno
 		</radio_item>
-		<radio_item type="string" length="1" name="radio2">
+		<radio_item name="radio2">
 			Médio
 		</radio_item>
-		<radio_item type="string" length="1" name="radio3">
+		<radio_item name="radio3">
 			Grande
 		</radio_item>
 	</radio_group>
-	<text type="string" length="1" name="text_box2">
+	<text length="1" name="text_box2" type="string">
 		Cor do Chat:
 	</text>
-	<color_swatch label="Sistema" name="system" />
-	<color_swatch label="Usuários" name="users" />
-	<color_swatch label="Objetos" name="objects" />
-	<color_swatch label="Bubble" name="background" />
-	<color_swatch label="URLs" name="links" />
-	<text type="string" length="1" name="text_box3">
+	<color_swatch label="Você" name="user"/>
+	<color_swatch label="Outros" name="agent"/>
+	<color_swatch label="MI" name="im"/>
+	<color_swatch label="Sistema" name="system"/>
+	<color_swatch label="Erros" name="script_error"/>
+	<color_swatch label="Objetos" name="objects"/>
+	<color_swatch label="Dono" name="owner"/>
+	<color_swatch label="Bubble" name="background"/>
+	<color_swatch label="URLs" name="links"/>
+	<text length="1" name="text_box8" type="string">
+		Erros de Script:
+	</text>
+	<check_box label="Mostrar Erros de Script e avisos como chat comum" name="script_errors_as_chat"/>
+	<text length="1" name="text_box3" type="string">
 		Console do Chat:
 	</text>
-	<spinner label="Ocultar Chat depois" name="fade_chat_time" />
-	<text type="string" length="1" name="text_box4">
+	<spinner label="Ocultar Chat depois" name="fade_chat_time"/>
+	<text length="1" name="text_box4" type="string">
 		(segundos)
 	</text>
-	<text type="string" length="1" name="text_box5">
+	<text length="1" name="text_box5" type="string">
 		(# linhas)
 	</text>
-	<slider label="Opacidade" name="console_opacity" />
-	<text type="string" length="1" name="text_box6">
+	<slider label="Opacidade" name="console_opacity"/>
+	<check_box label="Use a largura total da tela (Precisa reiniciar)" name="chat_full_width_check"/>
+	<text length="1" name="text_box6" type="string">
 		Opções do Chat:
 	</text>
-	<check_box label="Usar largura da tela cheia no Chat (depois do reinício)"
-	     name="chat_full_width_check" />
-	<check_box label="Fechar Chat depois de tocar voltar" name="close_chat_on_return_check" />
-	<check_box label="Teclas de Setas movem o avatar durante o chat"
-	     name="arrow_keys_move_avatar_check" />
-	<check_box label="Mostrar data e hora no chat" name="show_timestamps_check" />
-	<text type="string" length="1" name="text_box7">
+	<check_box label="Feche a barra de conversa após pressionar retornar" name="close_chat_on_return_check"/>
+	<check_box label="Teclas de Setas movem o avatar durante o chat" name="arrow_keys_move_avatar_check"/>
+	<check_box label="Mostrar a hora na conversa local" name="show_timestamps_check"/>
+	<check_box label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
+	<text length="1" name="text_box7" type="string">
 		Bubble Chat:
 	</text>
-	<check_box label="Mostrar bolhas do chat" name="bubble_text_chat" />
-	<slider label="Opacidade" name="bubble_chat_opacity" />
-	<text type="string" length="1" name="text_box8">
-		Erros de Script:
-	</text>
-	<check_box label="Mostrar Erros de Script e avisos como chat comum"
-	     name="script_errors_as_chat" />
-	<color_swatch label="Cor" name="script_error" />
+	<check_box label="Mostrar bolhas do chat" name="bubble_text_chat"/>
+	<slider label="Opacidade" name="bubble_chat_opacity"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
index f076766793..599d325d8e 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
@@ -1,67 +1,105 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Geral" name="general_panel">
-	<combo_box name="location_combobox">
-		<combo_item name="MyHome">
+	<radio_group name="default_start_location">
+		<radio_item name="MyHome" tool_tip="Como padrão, registrar na minha casa.">
 			Minha Casa
-		</combo_item>
-	</combo_box>
-	<check_box label="Mostrar Posição Inicial na Tela de Login"
-	     name="show_location_checkbox" />
-	<radio_group name="fade_out_radio">
-		<radio_item type="string" length="1" name="Never">
-			Nunca
 		</radio_item>
-		<radio_item type="string" length="1" name="Temporarily">
-			Temporariamente
-		</radio_item>
-		<radio_item type="string" length="1" name="Always">
-			Sempre
+		<radio_item name="MyLastLocation" tool_tip="Por padrão, registrar na minha última localidade.">
+			Minha Última Localidade
 		</radio_item>
 	</radio_group>
-	<check_box label="Ocultar meu Nome na minha Tela" name="show_my_name_checkbox" />
-	<check_box label="Ocultar meu Título no Grupo" name="show_my_title_checkbox" />
-	<check_box label="Avatar com Nomes Pequenos" name="small_avatar_names_checkbox" />
-	<color_swatch label="" name="effect_color_swatch"
-	     tool_tip="Clique para abrir po seletor de cores" />
-	<spinner label="Tempo para ficar Ausente:" name="afk_timeout_spinner" />
-	<check_box label="Avisar meus amigos que estou online"
-	     name="friends_online_notify_checkbox" />
-	<check_box label="Rotacionar Mini-Mapa" name="rotate_mini_map_checkbox" />
-	<check_box label="Avisar quando receber ou gastar Linden dollars (L$)"
-	     name="notify_money_change_checkbox" />
-	<check_box label="Usar a paleta de cores padrão do sistema"
-	     name="use_system_color_picker_checkbox"
-	     tool_tip="Usar a palheta de cores padrão do sistema ao invés de uma feita dentro de Second Life." />
-	<text type="string" length="1" name="start_location_textbox">
+	<check_box label="Mostrar Posição Inicial na Tela de Login" name="show_location_checkbox"/>
+	<combo_box name="fade_out_combobox">
+		<combo_item name="Never">
+			Nunca
+		</combo_item>
+		<combo_item name="Show Temporarily">
+			Mostrar Temporariamente
+		</combo_item>
+		<combo_item name="Always">
+			Sempre
+		</combo_item>
+	</combo_box>
+	<check_box label="Avatar com Nomes Pequenos" name="small_avatar_names_checkbox"/>
+	<check_box label="Ocultar meu Nome na minha Tela" name="show_my_name_checkbox"/>
+	<text name="group_titles_textbox">
+		Títulos dos Grupos:
+	</text>
+	<check_box label="Esconder Todos os Títulos de Grupos" name="show_all_title_checkbox"/>
+	<check_box label="Ocultar meu Título no Grupo" name="show_my_title_checkbox"/>
+	<color_swatch label="" name="effect_color_swatch" tool_tip="Clique para abrir po seletor de cores"/>
+	<text name="UI Size:">
+		Tamanho da UI:
+	</text>
+	<check_box label="Usar escala independente da resolução" name="ui_auto_scale"/>
+	<spinner label="Tempo para ficar Ausente:" name="afk_timeout_spinner"/>
+	<check_box label="Rotacionar Mini-Mapa" name="rotate_mini_map_checkbox"/>
+	<check_box label="Avisar quando receber ou gastar Linden dollars (L$)" name="notify_money_change_checkbox"/>
+	<check_box label="Usar a paleta de cores padrão do sistema" name="use_system_color_picker_checkbox" tool_tip="Usar a palheta de cores padrão do sistema ao invés de uma feita dentro de Second Life."/>
+	<check_box label="Mostrar o painel de busca na barra sobreposta" name="show_search_panel" tool_tip="Mostrar o painel de busca embutido."/>
+	<text length="1" name="start_location_textbox" type="string">
 		Posição Inicial:
 	</text>
-	<text type="string" length="1" name="show_names_textbox">
+	<text length="1" name="show_names_textbox" type="string">
 		Mostrar Nomes:
 	</text>
-	<text type="string" length="1" name="effects_color_textbox">
+	<text length="1" name="effects_color_textbox" type="string">
 		Cores para Meus Efeitos:
 	</text>
-	<text type="string" length="1" name="seconds_textbox">
+	<text length="1" name="seconds_textbox" type="string">
 		segundos
 	</text>
-	<text type="string" length="1" name="crash_report_textbox">
+	<text length="1" name="crash_report_textbox" type="string">
 		Relatórios de Falhas:
 	</text>
-	<text type="string" length="1" name="language_textbox2">
+	<text name="language_textbox">
+		Linguagem:
+	</text>
+	<text length="1" name="language_textbox2" type="string">
 		(Precisa de reinício para efetivar)
 	</text>
-	<text name="region_name_prompt">
+	<string name="region_name_prompt">
 		Digite o nome da Região
-	</text>
+	</string>
 	<combo_box name="crash_behavior_combobox">
-		<combo_item type="string" length="1" name="Askbeforesending">
+		<combo_item length="1" name="Askbeforesending" type="string">
 			Perguntar antes de enviar
 		</combo_item>
-		<combo_item type="string" length="1" name="Alwayssend">
+		<combo_item length="1" name="Alwayssend" type="string">
 			Sempre enviar
 		</combo_item>
-		<combo_item type="string" length="1" name="Neversend">
+		<combo_item length="1" name="Neversend" type="string">
 			Nunca Enviar
 		</combo_item>
 	</combo_box>
+	<combo_box name="language_combobox">
+		<combo_item name="System Default Language">
+			Padrão do Sistema
+		</combo_item>
+		<combo_item name="English">
+			English (Inglês)
+		</combo_item>
+		<combo_item name="Deutsch(German)">
+			Deutsch (Alemão) - Beta
+		</combo_item>
+		<combo_item name="Spanish">
+			Español (Espanhol) - Beta
+		</combo_item>
+		<combo_item name="French">
+			Français (Francês) - Beta
+		</combo_item>
+		<combo_item name="Portugese">
+			Português - Beta
+		</combo_item>
+		<combo_item name="Chinese">
+			汉语/漢語 (Chinês) - Beta
+		</combo_item>
+		<combo_item name="(Japanese)">
+			日本語 (Japonês) - Beta
+		</combo_item>
+		<combo_item name="(Korean)">
+			한국어 (Coreano) - Beta
+		</combo_item>
+	</combo_box>
+	<check_box label="Compartilhar a linguagem com objetos" name="language_is_public" tool_tip="Isto permite que os objetos no mundo conheçam sua linguagem preferida."/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
index 58b9956976..327f5639fc 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
@@ -1,40 +1,176 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Gráficos" name="Display panel">
-	<check_box label="Executar em Janela" name="windowed mode" />
-	<text type="string" length="1" name="Fullscreen Aspect Ratio:">
-		Aparência de Tela Cheia:
+	<button label="?" name="GraphicsPreferencesHelpButton"/>
+	<check_box label="Execute Second Life emu ma janela" name="windowed mode"/>
+	<text_editor bottom="-56" height="40" name="FullScreenInfo" width="480">
+		Caso contrário, visualizador irá exibir em tela inteira quando fizer o acesso.
+	</text_editor>
+	<text name="WindowSizeLabel">
+		Tamanho da Janela:
 	</text>
-	<text type="string" length="1" name="(width / height)">
-		(largura / altura)
+	<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">
+		Resolução de Display:
 	</text>
-	<combo_box name="aspect_ratio">
-		<combo_item type="string" length="1" name="4:3(StandardCRT)">
+	<text name="AspectRatioLabel1" tool_tip="largura / altura">
+		Aspecto da tela:
+	</text>
+	<combo_box name="aspect_ratio" tool_tip="largura / altura">
+		<combo_item length="1" name="4:3(StandardCRT)" type="string">
 			4:3 (CRT Padrão)
 		</combo_item>
-		<combo_item type="string" length="1" name="5:4(1280x1024LCD)">
+		<combo_item length="1" name="5:4(1280x1024LCD)" type="string">
 			5:4 (1280x1024 LCD)
 		</combo_item>
-		<combo_item type="string" length="1" name="16:9(Widescreen)">
+		<combo_item name="8:5(Widescreen)">
+			8:5 (tela ampla)
+		</combo_item>
+		<combo_item length="1" name="16:9(Widescreen)" type="string">
 			16:9 (Widescreen)
 		</combo_item>
 	</combo_box>
-	<check_box label="Auto detectar" name="aspect_auto_detect" />
-	<text type="string" length="1" name="UI Size:">
-		Tamanho da interface:
+	<check_box label="Auto-detectar ratio" name="aspect_auto_detect"/>
+	<text name="HigherText">
+		Qualidade e
 	</text>
-	<text type="string" length="1" name="(meters, lower is faster)">
-		(metros, menor é mais rápido)
+	<text name="QualityText">
+		Performance:
 	</text>
-	<text type="string" length="1" name="text2">
-		Mostrar Opções:
+	<text name="FasterText">
+		Mais &#10;rápido
 	</text>
-	<check_box label="Usar resolução de escala independente" name="ui_auto_scale" />
-	<spinner label="Desenhar Distância:" name="draw_distance" />
-	<check_box label="Mostrar Avatar em Mouselook" name="avfp" />
-	<text name="resolution_format">
-		[RES_X] x [RES_Y]
+	<text name="ShadersPrefText">
+		Baixo
 	</text>
-	<text name="aspect_ratio_text">
-		[NUM]:[DEN]
+	<text name="ShadersPrefText2">
+		Mid
+	</text>
+	<text name="ShadersPrefText3">
+		Alto
+	</text>
+	<text name="ShadersPrefText4">
+		Ultra
+	</text>
+	<text name="HigherText2">
+		Mais alto
+	</text>
+	<text name="QualityText2">
+		Qualidade
+	</text>
+	<check_box label="Padrão" name="CustomSettings" left="395" />
+	<text name="ShadersText">
+		Sombreamentos:
+	</text>
+	<check_box label="Bump de Mapeamento e Brilho" name="BumpShiny"/>
+	<check_box label="Sombreamento básico" name="BasicShaders" tool_tip="Desabilitar esta opção poderá impedir que alguns drivers de placa de vídeo a travem."/>
+	<check_box label="Sombreamento Atmosférico" name="WindLightUseAtmosShaders"/>
+	<check_box label="Reflexos de Água" name="Reflections"/>
+	<text name="ReflectionDetailText">
+		Detalhes de Reflexão:
 	</text>
+	<radio_group name="ReflectionDetailRadio">
+		<radio_item name="0">
+			Terreno e Árvores
+		</radio_item>
+		<radio_item name="1">
+			Todos os objetos estáticos
+		</radio_item>
+		<radio_item name="2">
+			Todos os avatares e Objetos
+		</radio_item>
+		<radio_item name="3">
+			Tudo
+		</radio_item>
+	</radio_group>
+	<text name="AvatarRenderingText">
+		Renderização de Avatar:
+	</text>
+	<check_box label="Avatar Impostors" name="AvatarImpostors"/>
+	<check_box label="Hardware Skinning" name="AvatarVertexProgram"/>
+	<check_box label="Vestimenta do Avatar" name="AvatarCloth"/>
+	<text name="DrawDistanceMeterText1">
+		m
+	</text>
+	<text name="DrawDistanceMeterText2">
+		m
+	</text>
+	<slider label="Medir Distancia:" name="DrawDistance"/>
+	<slider label="Contador máximo de partículas" name="MaxParticleCount"/>
+	<slider label="Qualidade de Post Process:" name="RenderPostProcess"/>
+	<text name="MeshDetailText">
+		Detalhes de Malha:
+	</text>
+	<slider label="Objetos:" name="ObjectMeshDetail"/>
+	<slider label="Primitivos Flexiveis:" name="FlexibleMeshDetail"/>
+	<slider label="Árvores:" name="TreeMeshDetail"/>
+	<slider label="Avatares:" name="AvatarMeshDetail"/>
+	<slider label="Terreno:" name="TerrainMeshDetail"/>
+	<slider label="Céu:" name="SkyMeshDetail"/>
+	<text name="PostProcessText">
+		Baixo
+	</text>
+	<text name="ObjectMeshDetailText">
+		Baixo
+	</text>
+	<text name="FlexibleMeshDetailText">
+		Baixo
+	</text>
+	<text name="TreeMeshDetailText">
+		Baixo
+	</text>
+	<text name="AvatarMeshDetailText">
+		Baixo
+	</text>
+	<text name="TerrainMeshDetailText">
+		Baixo
+	</text>
+	<text name="SkyMeshDetailText">
+		Baixo
+	</text>
+	<text name="LightingDetailText">
+		Detalhes de Iluminação:
+	</text>
+	<radio_group name="LightingDetailRadio">
+		<radio_item name="SunMoon">
+			Sol e Lua apenas
+		</radio_item>
+		<radio_item name="LocalLights">
+			Luzes locais nas proximidades
+		</radio_item>
+	</radio_group>
+	<text name="TerrainDetailText">
+		Detalhes do Terreno:
+	</text>
+	<radio_group name="TerrainDetailRadio">
+		<radio_item name="0">
+			Baixo
+		</radio_item>
+		<radio_item name="2">
+			Alto
+		</radio_item>
+	</radio_group>
+	<button label="Configurações Recomendadas" name="Defaults"/>
+	<button label="Opções de Hardware" label_selected="Opções de Hardware" name="GraphicsHardwareButton"/>
+	<string name="resolution_format">
+		[RES_X] x [RES_Y]
+	</string>
+	<string name="aspect_ratio_text">
+		[NUM]:[DEN]
+	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
index f82586d87f..b4c0d92f53 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Corretagem" name="Covenant">
-	<text name="covenant_help_text">
-		As mudanças à informação do convénio mostrarão em todos os pacotes na propriedade.
+	<text name="covenant_help_text" bottom="-25">
+		As mudanças à informação do convénio mostrarão em todos os pacotes
+na propriedade.
 	</text>
-	<text name="region_name_lbl">
+	<text name="region_name_lbl" bottom_delta="-31">
 		Região:
 	</text>
 	<text name="region_name_text">
 		(desconhecido)
 	</text>
-	<text name="estate_name_lbl">
+	<text name="estate_name_lbl" bottom_delta="-19">
 		Propriedade:
 	</text>
 	<text name="estate_name_text">
 		(desconhecido)
 	</text>
 	<text name="covenent_instructions">
-		Arraste o cartao de um Corretor 
-para este estado.
+		Arraste e solte um notecard para alterar o Contrato para este Terreno.
 	</text>
 	<button label="?" name="covenant_help" />
 	<button label="Resetar" name="reset_covenant" />
-	<text name="estate_owner_lbl">
+	<text name="estate_owner_lbl" bottom_delta="-19">
 		Proprietário final:
 	</text>
 	<text name="estate_owner_text">
diff --git a/indra/newview/skins/default/xui/pt/panel_region_debug.xml b/indra/newview/skins/default/xui/pt/panel_region_debug.xml
index d597b28f33..0c2ab2b57a 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_debug.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Debug" name="Debug">
 	<text name="region_text_lbl">
 		Região:
@@ -6,29 +6,35 @@
 	<text name="region_text">
 		nenhum
 	</text>
-	<check_box label="Desabilitar Scripts" name="disable_scripts_check"
-	     tool_tip="Desabilitar todos scripts nesta região" />
-	<button label="?" name="disable_scripts_help" />
-	<check_box label="Desabilitar colisões" name="disable_collisions_check"
-	     tool_tip="Desabilitar colisões dos avateres nessa região" />
-	<button label="?" name="disable_collisions_help" />
-	<check_box label="Desabilitar física" name="disable_physics_check"
-	     tool_tip="Desabilitar fisíca nessa região" />
-	<button label="?" name="disable_physics_help" />
-	<button label="Aplicar" name="apply_btn" />
-	<button label="Escolher o avatar..." name="choose_avatar_btn" />
-	<button label="Retornar objetos com scripts no terreno de outros"
-	     name="return_scripted_other_land_btn" />
-	<button label="Retornar todos os objetos com script" name="return_scripted_all_btn" />
-	<button label="Ranking-Colisões" name="top_colliders_btn"
-	     tool_tip="Lista dos objetos que experimentam as colisões " />
-	<button label="?" name="top_colliders_help" />
-	<button label="Ranking-Scripts" name="top_scripts_btn"
-	     tool_tip="List of objects spending the most time running scripts" />
-	<button label="?" name="top_scripts_help" />
-	<button label="Restart Region" name="restart_btn"
-	     tool_tip="Inicio da contagem regressiva em 2 minutos" />
-	<button label="?" name="restart_help" />
-	<button label="Cancelar Reinicio" name="cancel_restart_btn"
-	     tool_tip="Cancelar o reinicio da região" />
+	<check_box label="Desabilitar Scripts" name="disable_scripts_check" tool_tip="Desabilitar todos scripts nesta região"/>
+	<button label="?" name="disable_scripts_help"/>
+	<check_box label="Desabilitar colisões" name="disable_collisions_check" tool_tip="Desabilitar colisões dos avateres nessa região"/>
+	<button label="?" name="disable_collisions_help"/>
+	<check_box label="Desabilitar física" name="disable_physics_check" tool_tip="Desabilitar fisíca nessa região"/>
+	<button label="?" name="disable_physics_help"/>
+	<button label="Aplicar" name="apply_btn"/>
+	<text name="objret_text_lbl">
+		Retornar Objeto
+	</text>
+	<text name="resident_text_lbl">
+		Residente:
+	</text>
+	<line_editor name="target_avatar_name">
+		(nenhum)
+	</line_editor>
+	<button label="Escolher..." name="choose_avatar_btn"/>
+	<text name="options_text_lbl">
+		Opções:
+	</text>
+	<check_box label="Retornar apenas aqueles objetos que contenham scripts" name="return_scripts" tool_tip="Retornar apenas objetos que contenham scripts."/>
+	<check_box label="Retornar apenas aqueles objetos na terra de alguém" name="return_other_land" tool_tip="Retornar apenas objetos que estejam em uma terra pertencente a alguém"/>
+	<check_box label="Retornar objetos em cada região desta propriedade" name="return_estate_wide" tool_tip="Retornar objetos em todas as regiões que constituem esta propriedade"/>
+	<button label="Retornar" name="return_btn"/>
+	<button label="Ranking-Colisões" name="top_colliders_btn" tool_tip="Lista dos objetos que experimentam as colisões "/>
+	<button label="?" name="top_colliders_help"/>
+	<button label="Ranking-Scripts" name="top_scripts_btn" tool_tip="List of objects spending the most time running scripts"/>
+	<button label="?" name="top_scripts_help"/>
+	<button label="Restart Region" name="restart_btn" tool_tip="Inicio da contagem regressiva em 2 minutos"/>
+	<button label="?" name="restart_help"/>
+	<button label="Cancelar Reinicio" name="cancel_restart_btn" tool_tip="Cancelar o reinicio da região"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
index f647abb92c..eb3aa5af70 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Estado" name="Estate">
 	<text name="estate_help_text">
-		As mudanças aos ajustes nesta aba afetarão todas as regiões na propriedade.
+		Mudanças nas definições nesta guia irá afetar
+todas as regiões do Terreno.
 	</text>
 	<text name="estate_text">
 		Estado:
@@ -15,49 +16,54 @@
 	<text name="estate_owner">
 		(nenhum)
 	</text>
-	<text name="estate_manager_label">
-		Gerentes da propriedade:
+	<check_box label="Usar Tempo global " name="use_global_time_check"/>
+	<button label="?" name="use_global_time_help"/>
+	<check_box label="Sol fixo " name="fixed_sun_check"/>
+	<button label="?" name="fixed_sun_help"/>
+	<slider label="Fase " name="sun_hour_slider"/>
+	<check_box label="Permitir acesso público" name="externally_visible_check"/>
+	<button label="?" name="externally_visible_help"/>
+	<text name="Only Allow">
+		Acesso restrito a:
 	</text>
-	<button label="?" name="estate_manager_help" />
-	<button label="Adicionar..." name="add_estate_manager_btn" />
-	<button label="Remover..." name="remove_estate_manager_btn" />
-	<check_box label="Usar Tempo global " name="use_global_time_check" />
-	<button label="?" name="use_global_time_help" />
-	<check_box label="Sol fixo " name="fixed_sun_check" />
-	<button label="?" name="fixed_sun_help" />
-	<slider label="Fase " name="sun_hour_slider" />
-	<check_box label="Acesso público " name="externally_visible_check" />
-	<button label="?" name="externally_visible_help" />
-	<check_box label="Permitir Tele-transporte direto" name="allow_direct_teleport" />
-	<button label="?" name="allow_direct_teleport_help" />
-	<text name="region_text_lbl">
-		Proibir acesso a:
-	</text>
-	<check_box label="Informações de não pagamento" name="deny_anonymous" />
-	<check_box label="Informações de pagamento" name="deny_identified" />
-	<check_box label="Informações de pagtos realizados" name="deny_transacted" />
+	<check_box label="Residentes com informações de pagamento em arquivo" name="limit_payment" tool_tip="Banir residents não identificados."/>
+	<check_box label="Idade verificada -adultos" name="limit_age_verified" tool_tip="Banir residentes que não tenham confirmado a sua idade. Ver support.secondlife.com para mais informações."/>
+	<check_box label="Permitir conversa de voz" name="voice_chat_check"/>
+	<button label="?" name="voice_chat_help"/>
+	<check_box label="Permitir Tele-transporte direto" name="allow_direct_teleport"/>
+	<button label="?" name="allow_direct_teleport_help"/>
 	<text name="abuse_email_text">
-		E-mail do abuso:
+		Endereço de email de Abuso:
+	</text>
+	<string name="email_unsupported">
+		Funcionalidade não suportada
+	</string>
+	<button label="?" name="abuse_email_address_help"/>
+	<button label="Aplicar" name="apply_btn"/>
+	<button label="Descartar Estado" name="kick_user_from_estate_btn"/>
+	<button label="Enviar mensagem ao Estado " name="message_estate_btn"/>
+	<text name="estate_manager_label">
+		Gerentes da propriedade:
 	</text>
-	<button label="Aplicar" name="apply_btn" />
+	<button label="?" name="estate_manager_help"/>
+	<button label="Remover..." name="remove_estate_manager_btn"/>
+	<button label="Adicionar..." name="add_estate_manager_btn"/>
 	<text name="allow_resident_label">
 		Residentes permitidos:
 	</text>
-	<button label="?" name="allow_resident_help" />
-	<button label="Adicionar..." name="add_allowed_avatar_btn" />
-	<button label="Remover..." name="remove_allowed_avatar_btn" />
+	<button label="?" name="allow_resident_help"/>
+	<button label="Remover..." name="remove_allowed_avatar_btn"/>
+	<button label="Adicionar..." name="add_allowed_avatar_btn"/>
 	<text name="allow_group_label">
-		Grupos reservados:
+		Grupos permitidos:
 	</text>
-	<button label="?" name="allow_group_help" />
-	<button label="Adicionar..." name="add_allowed_group_btn" />
-	<button label="Remover..." name="remove_allowed_group_btn" />
+	<button label="?" name="allow_group_help"/>
+	<button label="Remover..." name="remove_allowed_group_btn"/>
+	<button label="Adicionar..." name="add_allowed_group_btn"/>
 	<text name="ban_resident_label">
-		Residentes proibidos:
+		Residentes banidos:
 	</text>
-	<button label="?" name="ban_resident_help" />
-	<button label="Adicionar..." name="add_banned_avatar_btn" />
-	<button label="Remover..." name="remove_banned_avatar_btn" />
-	<button label="Enviar mensagem ao Estado " name="message_estate_btn" />
-	<button label="Descartar Estado" name="kick_user_from_estate_btn" />
+	<button label="?" name="ban_resident_help"/>
+	<button label="Remover..." name="remove_banned_avatar_btn"/>
+	<button label="Adicionar..." name="add_banned_avatar_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_general.xml b/indra/newview/skins/default/xui/pt/panel_region_general.xml
index c80d6f4aa7..45e813f637 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_general.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Região" name="General">
 	<text name="region_text_lbl">
 		Região:
@@ -6,23 +6,30 @@
 	<text name="region_text">
 		desconhecido
 	</text>
-	<check_box label="Bloquear Terraform" name="block_terraform_check" />
-	<button label="?" name="terraform_help" />
-	<check_box label="Bloquear Vôo" name="block_fly_check" />
-	<button label="?" name="fly_help" />
-	<check_box label="Permitir Dano" name="allow_damage_check" />
-	<button label="?" name="damage_help" />
-	<check_box label="Restringir Empurrar" name="restrict_pushobject" />
-	<button label="?" name="restrict_pushobject_help" />
-	<check_box label="Permitir Revenda de Terra" name="allow_land_resell_check" />
-	<button label="?" name="land_resell_help" />
-	<check_box label="Permitir Compartilhamento/Divisão de Lotes"
-	     name="allow_parcel_changes_check" />
-	<button label="?" name="parcel_changes_help" />
-	<spinner label="Agente Limite" name="agent_limit_spin" />
-	<button label="?" name="agent_limit_help" />
-	<spinner label="Objeto Bonus" name="object_bonus_spin" />
-	<button label="?" name="object_bonus_help" />
+	<text name="version_channel_text_lbl">
+		Versão:
+	</text>
+	<text name="version_channel_text">
+		desconhecido
+	</text>
+	<check_box label="Bloquear Terraform" name="block_terraform_check"/>
+	<button label="?" name="terraform_help"/>
+	<check_box label="Bloquear Vôo" name="block_fly_check"/>
+	<button label="?" name="fly_help"/>
+	<check_box label="Permitir Dano" name="allow_damage_check"/>
+	<button label="?" name="damage_help"/>
+	<check_box label="Restringir Empurrar" name="restrict_pushobject"/>
+	<button label="?" name="restrict_pushobject_help"/>
+	<check_box label="Permitir Revenda de Terra" name="allow_land_resell_check"/>
+	<button label="?" name="land_resell_help"/>
+	<check_box label="Permitir Unir/Dividir Terra" name="allow_parcel_changes_check"/>
+	<button label="?" name="parcel_changes_help"/>
+	<check_box label="Bloquear Mostrar Terra na Busca" name="block_parcel_search_check" tool_tip="Permitir que as pessoas vejam esta região e seus terrenos nos resultados de busca"/>
+	<button label="?" name="parcel_search_help"/>
+	<spinner label="Agente Limite" name="agent_limit_spin"/>
+	<button label="?" name="agent_limit_help"/>
+	<spinner label="Objeto Bonus" name="object_bonus_spin"/>
+	<button label="?" name="object_bonus_help"/>
 	<text label="Maturidade" name="access_text">
 		Maturidade:
 	</text>
@@ -34,10 +41,10 @@
 			Adulto
 		</combo_item>
 	</combo_box>
-	<button label="?" name="access_help" />
-	<button label="Aplicar" name="apply_btn" />
-	<button label="Teleportar um usuário para Casa..." name="kick_btn" />
-	<button label="Teleportar Todos os Usuários..." name="kick_all_btn" />
-	<button label="Enviar Mensagem para Região..." name="im_btn" />
-	<button label="Gerenciar Telehub..." name="manage_telehub_btn" />
+	<button label="?" name="access_help"/>
+	<button label="Aplicar" name="apply_btn"/>
+	<button label="Teleportar um usuário para Casa..." name="kick_btn"/>
+	<button label="Teleportar Todos os Usuários..." name="kick_all_btn"/>
+	<button label="Enviar Mensagem para Região..." name="im_btn"/>
+	<button label="Gerenciar Telehub..." name="manage_telehub_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_status_bar.xml b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
index 194bf1147b..2174d3d2f7 100644
--- a/indra/newview/skins/default/xui/pt/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
@@ -1,32 +1,38 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="status">
-	<text type="string" length="1" name="ParcelNameText"
-	     tool_tip="Nome do pedaço de terra em que você esta. Clique para informações.">
+	<text length="1" name="ParcelNameText" tool_tip="Nome do pedaço de terra em que você esta. Clique para informações." type="string">
 		Nome do pedaço de terra vai aqui.
 	</text>
-	<text type="string" length="1" name="BalanceText" tool_tip="Cotação de Compra">
+	<text length="1" name="BalanceText" tool_tip="Cotação de Compra" type="string">
 		L$
 	</text>
-	<button label="" label_selected="" name="buycurrency" tool_tip="Compras" />
-	<text type="string" length="12" name="TimeText" tool_tip="Hora atual (Pacific)">
+	<button label="" label_selected="" name="buycurrency" tool_tip="Compras"/>
+	<text length="12" name="TimeText" tool_tip="Hora atual (Pacific)" type="string">
 		12:00 AM
 	</text>
-	<button label="" label_selected="" name="scriptout" tool_tip="Erros e avisos do Script" />
-	<button label="" label_selected="" name="health" tool_tip="Saúde" />
-	<text type="string" length="1" name="HealthText" tool_tip="Saúde">
+	<string name="StatBarDaysOfWeek">
+		Domingo:Segunda-feira:terça-feira:Quarta-feira:Quinta-feira:Sexta-feira:Sábado
+	</string>
+	<string name="StatBarMonthsOfYear">
+		Janeiro: Fevereiro: Março: Abril: Maio: Junho: Julho: Agosto: Setembro: Outubro: Novembro: Dezembro
+	</string>
+	<button label="" label_selected="" name="scriptout" tool_tip="Erros e avisos do Script"/>
+	<button label="" label_selected="" name="health" tool_tip="Saúde"/>
+	<text length="1" name="HealthText" tool_tip="Saúde" type="string">
 		100%
 	</text>
-	<button label="" label_selected="" name="fly" tool_tip="Sem voar." />
-	<button label="" label_selected="" name="build" tool_tip="Sem construções." />
-	<button label="" label_selected="" name="scripts" tool_tip="Sem scripts." />
-	<button label="" label_selected="" name="restrictpush"
-	     tool_tip="Restriro llEmpurrar objeto." />
-	<button label="" label_selected="" name="buyland" tool_tip="Comprar esse pedaço" />
-	<line_editor label="Procurar" name="search_editor" tool_tip="Procurar em Second Life" />
-	<text name="packet_loss_tooltip">
+	<button label="" label_selected="" name="no_fly" tool_tip="Não é permitido Voar"/>
+	<button label="" label_selected="" name="no_build" tool_tip="construir/Rezzar não permitido"/>
+	<button label="" label_selected="" name="no_scripts" tool_tip="Scripts não permitidos"/>
+	<button label="" label_selected="" name="restrictpush" tool_tip="Não Empurrar"/>
+	<button label="" label_selected="" name="status_no_voice" tool_tip="Voz não disponível aqui"/>
+	<button label="" label_selected="" name="buyland" tool_tip="Comprar esse pedaço"/>
+	<line_editor label="Buscar" name="search_editor" tool_tip="Buscar no Second Life"/>
+	<button label="" label_selected="" name="search_btn" tool_tip="Buscar no Second Life"/>
+	<string name="packet_loss_tooltip">
 		Perda de pacote
-	</text>
-	<text name="bandwidth_tooltip">
+	</string>
+	<string name="bandwidth_tooltip">
 		Banda
-	</text>
+	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/teleport_strings.xml b/indra/newview/skins/default/xui/pt/teleport_strings.xml
index b3f1c39242..df6dc2cd02 100644
--- a/indra/newview/skins/default/xui/pt/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/pt/teleport_strings.xml
@@ -1,56 +1,43 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <teleport_messages>
 	<message_set name="errors">
 		<message name="invalid_tport">
-			Foi encontrado um problema na sua solicitação de teleport. Você
-                  provavelmente precisará entrar no Second Life novamente 
-                  antes de teleportar-se. Se esse problema persistir, por favor 
-                  verifique o FAQ do suporte técnico em www.secondlife.com/support.
+			Problema encontrado ao processar seu pedido de Teleporte. Você pode tentar reiniciar  antes de tentar teleportar. Se você continuar a receber essa mensagem, por favor cheque a FAQ do Suporte Técnico em: 
+www.secondlife.com/support
 		</message>
 		<message name="invalid_region_handoff">
-			Foi encontrado um problema ao processar sua transição entre as 
-                  regiões. Você provavelmente precisará entrar no Second Life 
-                  novamente antes de conseguir passar entre regiões. 
-                  Se esse problema persistir, por favor verifique o FAQ do suporte
-                  técnico em www.secondlife.com/support.
+			Problema encontrado ao processar a passage de regiões. Você pode tentar reiniciar antes de tentar atravessar regiões novamente. Se você continuar a receber essa mensagem, por favor cheque a FAQ do Suporte Técnico em: 
+www.secondlife.com/support
 		</message>
 		<message name="blocked_tport">
-			Desculpe, teleport temporariamente bloqueado. Tente novamente em
-                  alguns instantes. Se você ainda não puder teleportar-se, por favor,
-                  entre novamente no Second Life para resolver seu problema.
+			Desculpe, Teleportes estão atualmente bloqueados. Tente novamente dentro de alguns instantes. Se você continuar com problemas de teleporte, por favor tente deslogar e relogar para resolver o problema.
 		</message>
 		<message name="nolandmark_tport">
 			Desculpe, mas o sistema não conseguiu localizar a landmark de destino.
 		</message>
 		<message name="timeout_tport">
-			Desculpe, mas o sistema está incapaz de completar sua conexão para o 
-			teleport. Tente novamente em alguns instantes.
+			Desculpe, não foi possível para o sistema executar o teleporte, Tente novamente dentro de alguns instantes.
 		</message>
 		<message name="noaccess_tport">
 			Desculpe, você não tem permissão para acessar esse destino.
 		</message>
 		<message name="missing_attach_tport">
-			Seus anexos não foram carregados ainda. Tente esperar por alguns
-			segundos ou entre no Second Life novamente antes de tentar
-			teleportar-se.
+			Seu anexos ainda não chegaram. Tente esperar por alguns momentos ou deslogar e logar antes de tentar teleportar novamente.
 		</message>
 		<message name="too_many_uploads_tport">
-			A fila de recursos nesta região está sobrecarregada portanto sua solicitação 
-			de teleport não pode ser atendida em tempo hábil. Por favor tente novamente
-			em alguns minutos ou vá para uma área menos carregada.
+			A fluxo nesta região é atualmente tão alto e entupido que seu pedido de teleporte não será possível teleportar com êxito em tempo oportuno. Por favor, tente novamente em alguns minutos ou vá a uma área menos ocupada.
 		</message>
 		<message name="expired_tport">
-			Desculpe, mas o sistema não foi capaz de completar sua solicitação
-			de teleport. Por favor, tente novamente em alguns minutos.
+			Desculpe, mas o sistema não conseguiu concluir o seu pedido teleporte em tempo hábil. Por favor, tente novamente em alguns minutos.
 		</message>
 		<message name="expired_region_handoff">
-			Desculpe, mas o sistema não foi capaz de completar transição entre 
-			as regiões. Por favor, tente novamente em alguns minutos.
+			Desculpe, mas o sistema não pôde concluir a sua travessia de região em tempo hábil. Por favor, tente novamente em alguns minutos.
 		</message>
 		<message name="no_host">
-			Não foi possível encontrar o destino para o teleport. O destino
-			pode estar temporariamente indisponível ou não existir mais.
-			Por favor, tente novamente em alguns minutos.
+			Não foi possível encontrar o destino do teleporte. O destino pode estar temporariamente indisponível ou não existir mais. Por favor, tente novamente em poucos minutos.
+		</message>
+		<message name="no_inventory_host">
+			O sistema de inventário está indisponível no momento.
 		</message>
 	</message_set>
 	<message_set name="progress">
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index a7037e0199..135c77c7f3 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -429,6 +429,7 @@ class DarwinManifest(ViewerManifest):
                     self.path("secondlife.icns")
                 else:
                     self.path("secondlife_firstlook.icns", "secondlife.icns")
+                self.path("SecondLife.nib")
                 
                 # Translations
                 self.path("English.lproj")
diff --git a/indra/win_crash_logger/llcrashloggerwindows.cpp b/indra/win_crash_logger/llcrashloggerwindows.cpp
index beec31a008..098bef3251 100644
--- a/indra/win_crash_logger/llcrashloggerwindows.cpp
+++ b/indra/win_crash_logger/llcrashloggerwindows.cpp
@@ -322,7 +322,7 @@ bool LLCrashLoggerWindows::mainLoop()
 	{
 		gHwndReport = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PREVREPORTBOX), 0, NULL);
 		// Ignore result
-		(void) SendDlgItemMessage(gHwndReport, IDC_CHECK_AUTO, BM_SETCHECK, 1, 0);
+		(void) SendDlgItemMessage(gHwndReport, IDC_CHECK_AUTO, BM_SETCHECK, 0, 0);
 		// Include the product name in the caption and various dialog items.
 		ProcessCaption(gHwndReport);
 		ProcessDlgItemText(gHwndReport, IDC_STATIC_MSG);
diff --git a/indra/win_crash_logger/win_crash_logger.cpp b/indra/win_crash_logger/win_crash_logger.cpp
index 8f339d6661..ba0d6fbc9e 100644
--- a/indra/win_crash_logger/win_crash_logger.cpp
+++ b/indra/win_crash_logger/win_crash_logger.cpp
@@ -54,56 +54,9 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 {
 	llinfos << "Starting crash reporter" << llendl;
 
-	// In Win32, we need to generate argc and argv ourselves...
-	// Note: GetCommandLine() returns a  potentially return a LPTSTR
-	// which can resolve to a LPWSTR (unicode string).
-	// (That's why it's different from lpCmdLine which is a LPSTR.)
-	// We don't currently do unicode, so call the non-unicode version
-	// directly.
-	llinfos << "Processing command line" << llendl;
-	LPSTR cmd_line_including_exe_name = GetCommandLineA();
-
-	const S32	MAX_ARGS = 100;
-	int argc = 0;
-	char *argv[MAX_ARGS];		
-
-	char *token = NULL;
-	if( cmd_line_including_exe_name[0] == '\"' )
-	{
-		// Exe name is enclosed in quotes
-		token = strtok( cmd_line_including_exe_name, "\"" );
-		argv[argc++] = token;
-		token = strtok( NULL, " \t," );
-	}
-	else
-	{
-		// Exe name is not enclosed in quotes
-		token = strtok( cmd_line_including_exe_name, " \t," );
-	}
-
-	while( (token != NULL) && (argc < MAX_ARGS) )
-	{
-		argv[argc++] = token;
-		/* Get next token: */
-		if (*(token + strlen(token) + 1) == '\"')		
-		{
-			token = strtok( NULL, "\"");
-		}
-		else
-		{
-			token = strtok( NULL, " \t," );
-		}
-	}
-
 	LLCrashLoggerWindows app;
-	bool ok = app.parseCommandOptions(argc, argv);
-	if(!ok)
-	{
-		llwarns << "Unable to parse command line." << llendl;
-	}
-	
 	app.setHandle(hInstance);
-	ok = app.init();
+	bool ok = app.init();
 	if(!ok)
 	{
 		llwarns << "Unable to initialize application." << llendl;
author	Mark Palange <palange@lindenlab.com>	2008-12-23 19:39:58 +0000
committer	Mark Palange <palange@lindenlab.com>	2008-12-23 19:39:58 +0000
commit	fb793870fe95f1951d7c30ea6068e187b9dededd (patch)
tree	6d11632353ff4fb07133625ec5031b135b1e2882 /indra
parent	d182b9fb82b9c63f41d81bc80dbbfe627475facf (diff)