diff --git a/indra/llaudio/llaudioengine_fmodex.cpp b/indra/llaudio/llaudioengine_fmodex.cpp
index 2b2bd19d5..d57ef7f3a 100644
--- a/indra/llaudio/llaudioengine_fmodex.cpp
+++ b/indra/llaudio/llaudioengine_fmodex.cpp
@@ -95,6 +95,28 @@ inline bool Check_FMOD_Error(FMOD_RESULT result, const char *string)
 	return true;
 }
 
+void* F_STDCALL decode_alloc(unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr)
+{
+	if(type & FMOD_MEMORY_STREAM_DECODE)
+	{
+		llinfos << "Decode buffer size: " << size << llendl;
+	}
+	else if(type & FMOD_MEMORY_STREAM_FILE)
+	{
+		llinfos << "Strean buffer size: " << size << llendl;
+	}
+	return new char[size];
+}
+void* F_STDCALL decode_realloc(void *ptr, unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr)
+{
+	memset(ptr,0,size);
+	return ptr;
+}
+void F_STDCALL decode_dealloc(void *ptr, FMOD_MEMORY_TYPE type, const char *sourcestr)
+{
+	delete[] (char*)ptr;
+}
+
 bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
 {
 
@@ -108,6 +130,10 @@ bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
 
 	LL_DEBUGS("AppInit") << "LLAudioEngine_FMODEX::init() initializing FMOD" << LL_ENDL;
 
+	result = FMOD::Memory_Initialize(NULL, 0, &decode_alloc, &decode_realloc, &decode_dealloc, FMOD_MEMORY_STREAM_DECODE | FMOD_MEMORY_STREAM_FILE);
+	if(Check_FMOD_Error(result, "FMOD::Memory_Initialize"))
+		return false;
+
 	result = FMOD::System_Create(&mSystem);
 	if(Check_FMOD_Error(result, "FMOD::System_Create"))
 		return false;
@@ -124,54 +150,8 @@ bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
 			<< ")!  You should be using FMOD Ex" << FMOD_VERSION << LL_ENDL;
 	}
 
-#if LL_WINDOWS
-	int numdrivers;
-	FMOD_SPEAKERMODE speakermode;
-	FMOD_CAPS caps;
-	char name[256];
-
-	//Is this block applicable to linux?
-	{
-		result = mSystem->getNumDrivers(&numdrivers);
-		Check_FMOD_Error(result, "FMOD::System::getNumDrivers");
-		if (numdrivers == 0)
-		{
-			result = mSystem->setOutput(FMOD_OUTPUTTYPE_NOSOUND);
-			Check_FMOD_Error(result, "FMOD::System::setOutput");
-		}
-		else
-		{
-			result = mSystem->getDriverCaps(0, &caps, 0, &speakermode);
-			Check_FMOD_Error(result,"FMOD::System::getDriverCaps");
-			/*
-			Set the user selected speaker mode.
-			*/
-			result = mSystem->setSpeakerMode(speakermode);
-			Check_FMOD_Error(result, "FMOD::System::setSpeakerMode");
-			if (caps & FMOD_CAPS_HARDWARE_EMULATED)
-			{
-				/*
-				The user has the 'Acceleration' slider set to off! This is really bad
-				for latency! You might want to warn the user about this.
-				*/
-				result = mSystem->setDSPBufferSize(1024, 10);
-				Check_FMOD_Error(result, "FMOD::System::setDSPBufferSize");
-			}
-			result = mSystem->getDriverInfo(0, name, 256, 0);
-			Check_FMOD_Error(result, "FMOD::System::getDriverInfo");
-
-			if (strstr(name, "SigmaTel"))
-			{
-				/*
-				Sigmatel sound devices crackle for some reason if the format is PCM 16bit.
-				PCM floating point output seems to solve it.
-				*/
-				result = mSystem->setSoftwareFormat(48000, FMOD_SOUND_FORMAT_PCMFLOAT, 0,0, FMOD_DSP_RESAMPLER_LINEAR);
-				Check_FMOD_Error(result,"FMOD::System::setSoftwareFormat");
-			}
-		}
-	}
-#endif //LL_WINDOWS
+	result = mSystem->setSoftwareFormat(44100, FMOD_SOUND_FORMAT_PCM16, 0, 0, FMOD_DSP_RESAMPLER_LINEAR);
+	Check_FMOD_Error(result,"FMOD::System::setSoftwareFormat");
 
 	// In this case, all sounds, PLUS wind and stream will be software.
 	result = mSystem->setSoftwareChannels(num_channels + 2);
@@ -297,6 +277,19 @@ bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
 
 	LL_INFOS("AppInit") << "LLAudioEngine_FMODEX::init() FMOD Ex initialized correctly" << LL_ENDL;
 
+	int r_numbuffers, r_samplerate, r_channels, r_bits;
+	unsigned int r_bufferlength;
+	char r_name[256];
+	mSystem->getDSPBufferSize(&r_bufferlength, &r_numbuffers);
+	mSystem->getSoftwareFormat(&r_samplerate, NULL, &r_channels, NULL, NULL, &r_bits);
+	mSystem->getDriverInfo(0, r_name, 255, 0);
+	r_name[255] = '\0';
+	int latency = 1000.0 * r_bufferlength * r_numbuffers /r_samplerate;
+
+	LL_INFOS("AppInit") << "FMOD device: "<< r_name << "\n"
+		<< "FMOD Ex parameters: " << r_samplerate << " Hz * " << r_channels << " * " <<r_bits <<" bit\n"
+		<< "\tbuffer " << r_bufferlength << " * " << r_numbuffers << " (" << latency <<"ms)" << LL_ENDL;
+
 	mInited = true;
 
 	return true;
diff --git a/indra/llaudio/llstreamingaudio.h b/indra/llaudio/llstreamingaudio.h
index 0e81cc530..3fb9ad4e3 100644
--- a/indra/llaudio/llstreamingaudio.h
+++ b/indra/llaudio/llstreamingaudio.h
@@ -58,6 +58,9 @@ class LLStreamingAudioInterface
 	virtual const LLSD *getMetaData() = 0;
 	virtual bool supportsWaveData() = 0;
 	virtual bool getWaveData(float* arr, S32 count, S32 stride = 1) = 0;
+
+	virtual bool supportsAdjustableBufferSizes(){return false;}
+	virtual void setBufferSizes(U32 streambuffertime, U32 decodebuffertime){};
 };
 
 #endif // LL_STREAMINGAUDIO_H
diff --git a/indra/llaudio/llstreamingaudio_fmodex.cpp b/indra/llaudio/llstreamingaudio_fmodex.cpp
index 6d97bcc49..fa7044e67 100644
--- a/indra/llaudio/llstreamingaudio_fmodex.cpp
+++ b/indra/llaudio/llstreamingaudio_fmodex.cpp
@@ -50,7 +50,7 @@ public:
 
 	const std::string& getURL() 	{ return mInternetStreamURL; }
 
-	FMOD_OPENSTATE getOpenState();
+	FMOD_OPENSTATE getOpenState(unsigned int* percentbuffered=NULL, bool* starving=NULL, bool* diskbusy=NULL);
 protected:
 	FMOD::System* mSystem;
 	FMOD::Channel* mStreamChannel;
@@ -74,7 +74,7 @@ LLStreamingAudio_FMODEX::LLStreamingAudio_FMODEX(FMOD::System *system) :
 {
 	// Number of milliseconds of audio to buffer for the audio card.
 	// Must be larger than the usual Second Life frame stutter time.
-	const U32 buffer_seconds = 5;		//sec
+	const U32 buffer_seconds = 10;		//sec
 	const U32 estimated_bitrate = 128;	//kbit/sec
 	mSystem->setStreamBufferSize(estimated_bitrate * buffer_seconds * 128/*bytes/kbit*/, FMOD_TIMEUNIT_RAWBYTES);
 
@@ -145,7 +145,10 @@ void LLStreamingAudio_FMODEX::update()
 		return;
 	}
 
-	FMOD_OPENSTATE open_state = mCurrentInternetStreamp->getOpenState();
+	unsigned int progress;
+	bool starving;
+	bool diskbusy;
+	FMOD_OPENSTATE open_state = mCurrentInternetStreamp->getOpenState(&progress, &starving, &diskbusy);
 
 	if (open_state == FMOD_OPENSTATE_READY)
 	{
@@ -158,6 +161,7 @@ void LLStreamingAudio_FMODEX::update()
 			// Reset volume to previously set volume
 			setGain(getGain());
 			mFMODInternetStreamChannelp->setPaused(false);
+			mLastStarved.stop();
 		}
 	}
 	else if(open_state == FMOD_OPENSTATE_ERROR)
@@ -168,6 +172,7 @@ void LLStreamingAudio_FMODEX::update()
 
 	if(mFMODInternetStreamChannelp)
 	{
+		//llinfos << "progress = " << progress << llendl;
 		if(!mMetaData)
 			mMetaData = new LLSD;
 
@@ -237,12 +242,29 @@ void LLStreamingAudio_FMODEX::update()
 					}
 				}
 			}
+			if(starving)
+			{
+				if(!mLastStarved.getStarted())
+				{
+					llinfos << "Stream starvation detected! Muting stream audio until it clears." << llendl;
+					llinfos << "  (diskbusy="<<diskbusy<<")" << llendl;
+					llinfos << "  (progress="<<progress<<")" << llendl;
+					mFMODInternetStreamChannelp->setMute(true);
+				}
+				mLastStarved.start();
+			}
+			else if(mLastStarved.getStarted() && mLastStarved.getElapsedTimeF32() > 1.f)
+			{
+				mLastStarved.stop();
+				mFMODInternetStreamChannelp->setMute(false);
+			}
 		}
 	}
 }
 
 void LLStreamingAudio_FMODEX::stop()
 {
+	mLastStarved.stop();
 	if(mMetaData)
 	{
 		delete mMetaData;
@@ -341,6 +363,11 @@ void LLStreamingAudio_FMODEX::setGain(F32 vol)
 	if(!mFMODInternetStreamChannelp || !mCurrentInternetStreamp)
 		return false;
 
+	bool muted=false;
+	mFMODInternetStreamChannelp->getMute(&muted);
+	if(muted)
+		return false;
+
 	static std::vector<float> local_array(count);	//Have to have an extra buffer to mix channels. Bleh.
 	if(count > (S32)local_array.size())	//Expand the array if needed. Try to minimize allocation calls, so don't ever shrink.
 		local_array.resize(count);
@@ -442,9 +469,19 @@ bool LLAudioStreamManagerFMODEX::stopStream()
 	}
 }
 
-FMOD_OPENSTATE LLAudioStreamManagerFMODEX::getOpenState()
+FMOD_OPENSTATE LLAudioStreamManagerFMODEX::getOpenState(unsigned int* percentbuffered, bool* starving, bool* diskbusy)
 {
 	FMOD_OPENSTATE state;
-	mInternetStream->getOpenState(&state,NULL,NULL,NULL);
+	mInternetStream->getOpenState(&state,percentbuffered,starving,diskbusy);
 	return state;
 }
+
+void LLStreamingAudio_FMODEX::setBufferSizes(U32 streambuffertime, U32 decodebuffertime)
+{
+	mSystem->setStreamBufferSize(streambuffertime/1000*128*128, FMOD_TIMEUNIT_RAWBYTES);
+	FMOD_ADVANCEDSETTINGS settings;
+	memset(&settings,0,sizeof(settings));
+	settings.cbsize=sizeof(settings);
+	settings.defaultDecodeBufferSize = decodebuffertime;//ms
+	mSystem->setAdvancedSettings(&settings);
+}
\ No newline at end of file
diff --git a/indra/llaudio/llstreamingaudio_fmodex.h b/indra/llaudio/llstreamingaudio_fmodex.h
index 064b266e6..1b5211485 100644
--- a/indra/llaudio/llstreamingaudio_fmodex.h
+++ b/indra/llaudio/llstreamingaudio_fmodex.h
@@ -37,6 +37,7 @@
 #include "stdtypes.h" // from llcommon
 
 #include "llstreamingaudio.h"
+#include "lltimer.h"
 
 //Stubs
 class LLAudioStreamManagerFMODEX;
@@ -66,6 +67,8 @@ class LLStreamingAudio_FMODEX : public LLStreamingAudioInterface
 	/*virtual*/ const LLSD *getMetaData(){return mMetaData;}	//return NULL if not playing.
 	/*virtual*/ bool supportsWaveData(){return true;}
 	/*virtual*/ bool getWaveData(float* arr, S32 count, S32 stride = 1);
+	/*virtual*/ bool supportsAdjustableBufferSizes(){return true;}
+	/*virtual*/ void setBufferSizes(U32 streambuffertime, U32 decodebuffertime);
 private:
 	FMOD::System *mSystem;
 
@@ -76,6 +79,8 @@ private:
 	std::string mURL;
 	F32 mGain;
 
+	LLTimer mLastStarved;
+
 	LLSD *mMetaData;
 };
 
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index 7e957d356..ea9afec16 100644
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -55,7 +55,6 @@ set_target_properties(SLPlugin
   )
 
 target_link_libraries(SLPlugin
-  ${GOOGLE_PERFTOOLS_LIBRARIES}
   ${LLPLUGIN_LIBRARIES}
   ${LLMESSAGE_LIBRARIES}
   ${LLCOMMON_LIBRARIES}
@@ -82,11 +81,4 @@ if (DARWIN)
   )
 endif (DARWIN)
 
-if (WINDOWS)
-    set_target_properties(SLPlugin
-      PROPERTIES
-        LINK_FLAGS "${GOOGLE_PERFTOOLS_LINKER_FLAGS}"
-        )
-endif (WINDOWS)
-
 #ll_deploy_sharedlibs_command(SLPlugin)
diff --git a/indra/newview/app_settings/settings_sh.xml b/indra/newview/app_settings/settings_sh.xml
index 803f7a12e..feae4cb77 100644
--- a/indra/newview/app_settings/settings_sh.xml
+++ b/indra/newview/app_settings/settings_sh.xml
@@ -40,6 +40,28 @@
       <string>Boolean</string>
       <key>Value</key>
       <integer>0</integer>
+    </map>
+    <key>SHFMODExStreamBufferSize</key>
+    <map>
+      <key>Comment</key>
+      <string>Sets the streaming buffer size (in milliseconds)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>7000</integer>
+    </map>
+    <key>SHFMODExDecodeBufferSize</key>
+    <map>
+      <key>Comment</key>
+      <string>Sets the streaming decode buffer size (in milliseconds)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>1000</integer>
     </map>
 		<key>SHAllowScriptCommands</key>
 		<map>
diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh
index ea944f1c2..04edf2a76 100755
--- a/indra/newview/linux_tools/wrapper.sh
+++ b/indra/newview/linux_tools/wrapper.sh
@@ -59,8 +59,15 @@
 ##   you're building your own viewer, bear in mind that the executable
 ##   in the bin directory will be stripped: you should replace it with
 ##   an unstripped binary before you run.
-#export LL_WRAPPER='gdb --args'
-#export LL_WRAPPER='valgrind --smc-check=all --error-limit=no --log-file=secondlife.vg --leak-check=full --suppressions=/usr/lib/valgrind/glibc-2.5.supp --suppressions=secondlife-i686.supp'
+if [ -n "$ASCENDED_DEVELOPER" ]; then
+	if [ "$ASCENDED_DEVELOPER" = "1" ]; then
+		export LL_WRAPPER='gdb --args'
+	elif [ "$ASCENDED_DEVELOPER" = "2" ]; then
+		export LL_WRAPPER='valgrind --smc-check=all --error-limit=no --log-file=secondlife.vg --leak-check=full --suppressions=/usr/lib/valgrind/glibc-2.5.supp --suppressions=secondlife-i686.supp'
+	elif [ "$ASCENDED_DEVELOPER" = "3" ]; then
+		export LL_WRAPPER='strace -f -ff -o singularity.strace'
+	fi
+fi
 
 ## - This allows one to set an arbitrary value for LD_PRELOAD.
 ##   It won't work if LL_TCMALLOC is set because that uses it's
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 8fcbb600e..1995efd2c 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -4206,7 +4206,7 @@ void LLSoundBridge::openSoundPreview(void* which)
 		rect.translate(left - rect.mLeft, top - rect.mTop);
 		LLPreviewSound* preview = new LLPreviewSound("preview sound",
 										   rect,
-										   std::string("Sound: ") + me->getName(),
+										   LLTrans::getString("Sound: ") + me->getName(),
 										   me->mUUID);
 		preview->setFocus(TRUE);
 		// Keep entirely onscreen.
@@ -6308,7 +6308,7 @@ public:
 				rect.translate(left - rect.mLeft, top - rect.mTop);
 				LLPreviewSound* preview = new LLPreviewSound("preview sound",
 												   rect,
-												   std::string("Sound: ") + item->getName(),
+												   LLTrans::getString("Sound: ") + item->getName(),
 												   mUUID);
 				preview->setFocus(TRUE);
 				// Keep entirely onscreen.
diff --git a/indra/newview/llviewerfoldertype.cpp b/indra/newview/llviewerfoldertype.cpp
index 8c7184ede..a779b617b 100644
--- a/indra/newview/llviewerfoldertype.cpp
+++ b/indra/newview/llviewerfoldertype.cpp
@@ -125,15 +125,15 @@ LLViewerFolderDictionary::LLViewerFolderDictionary()
 	addEntry(LLFolderType::FT_LOST_AND_FOUND, 		new ViewerFolderEntry("Lost And Found",	   		"inv_folder_lostandfound.tga",		"inv_folder_lostandfound.tga",	TRUE,		false));
 	addEntry(LLFolderType::FT_ANIMATION, 			new ViewerFolderEntry("Animations",				"inv_folder_animation.tga",			"inv_folder_animation.tga",		FALSE,		false));
 	addEntry(LLFolderType::FT_GESTURE, 				new ViewerFolderEntry("Gestures",				"inv_folder_gesture.tga",			"inv_folder_gesture.tga",		FALSE,		false));
-	addEntry(LLFolderType::FT_FAVORITE, 			new ViewerFolderEntry("Favorites",				"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	FALSE,		false));
+	addEntry(LLFolderType::FT_FAVORITE, 			new ViewerFolderEntry("Favorites",				"inv_folder_favorite.tga",			"inv_folder_favorite.tga",		FALSE,		false));
 
-	addEntry(LLFolderType::FT_CURRENT_OUTFIT, 		new ViewerFolderEntry("Current Outfit",			"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	TRUE,		false));
-	addEntry(LLFolderType::FT_OUTFIT, 				new ViewerFolderEntry("New Outfit",				"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	TRUE,		false));
-	addEntry(LLFolderType::FT_MY_OUTFITS, 			new ViewerFolderEntry("My Outfits",				"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	TRUE,		false));
-	addEntry(LLFolderType::FT_MESH, 				new ViewerFolderEntry("Meshes",					"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	FALSE,		false));
+	addEntry(LLFolderType::FT_CURRENT_OUTFIT, 		new ViewerFolderEntry("Current Outfit",			"inv_folder_outfit.tga",			"inv_folder_outfit.tga",		TRUE,		false));
+	addEntry(LLFolderType::FT_OUTFIT, 				new ViewerFolderEntry("New Outfit",				"inv_folder_outfit.tga",			"inv_folder_outfit.tga",		TRUE,		false));
+	addEntry(LLFolderType::FT_MY_OUTFITS, 			new ViewerFolderEntry("My Outfits",				"inv_folder_outfit.tga",			"inv_folder_outfit.tga",		TRUE,		false));
+	addEntry(LLFolderType::FT_MESH, 				new ViewerFolderEntry("Meshes",					"inv_folder_mesh.tga",				"inv_folder_mesh.tga",			FALSE,		false));
 	
-	addEntry(LLFolderType::FT_INBOX, 				new ViewerFolderEntry("Inbox",					"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	FALSE,		false));
-	addEntry(LLFolderType::FT_OUTBOX, 				new ViewerFolderEntry("Outbox",					"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	FALSE,		false));
+	addEntry(LLFolderType::FT_INBOX, 				new ViewerFolderEntry("Inbox",					"inv_folder_inbox.tga",				"inv_folder_inbox.tga",			FALSE,		false));
+	addEntry(LLFolderType::FT_OUTBOX, 				new ViewerFolderEntry("Outbox",					"inv_folder_outbox.tga",			"inv_folder_outbox.tga",		FALSE,		false));
 
 	addEntry(LLFolderType::FT_BASIC_ROOT, 			new ViewerFolderEntry("Basic Root",				"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	FALSE,		false));
 		 
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp
index 9e7df265e..1349429ee 100644
--- a/indra/newview/llviewerparcelmedia.cpp
+++ b/indra/newview/llviewerparcelmedia.cpp
@@ -54,6 +54,7 @@
 #include "llaudioengine.h"
 #include "lloverlaybar.h"
 #include "slfloatermediafilter.h"
+#include "llstreamingaudio.h"
 
 // Static Variables
 
@@ -661,6 +662,9 @@ void LLViewerParcelMedia::playStreamingMusic(LLParcel* parcel, bool filter)
 	else if (gAudiop)
 	{
 		LLStringUtil::trim(music_url);
+		LLStreamingAudioInterface *stream = gAudiop->getStreamingAudioImpl();
+		if(stream && stream->supportsAdjustableBufferSizes())
+			stream->setBufferSizes(gSavedSettings.getU32("SHFMODExStreamBufferSize"),gSavedSettings.getU32("SHFMODExDecodeBufferSize"));
 		gAudiop->startInternetStream(music_url);
 		if (music_url.empty())
 		{
diff --git a/indra/newview/skins/default/textures/inv_folder_favorite.tga b/indra/newview/skins/default/textures/inv_folder_favorite.tga
new file mode 100644
index 000000000..a6c807d12
Binary files /dev/null and b/indra/newview/skins/default/textures/inv_folder_favorite.tga differ
diff --git a/indra/newview/skins/default/textures/inv_folder_inbox.tga b/indra/newview/skins/default/textures/inv_folder_inbox.tga
new file mode 100644
index 000000000..04539c2cc
Binary files /dev/null and b/indra/newview/skins/default/textures/inv_folder_inbox.tga differ
diff --git a/indra/newview/skins/default/textures/inv_folder_mesh.tga b/indra/newview/skins/default/textures/inv_folder_mesh.tga
new file mode 100644
index 000000000..be95f0007
Binary files /dev/null and b/indra/newview/skins/default/textures/inv_folder_mesh.tga differ
diff --git a/indra/newview/skins/default/textures/inv_folder_outbox.tga b/indra/newview/skins/default/textures/inv_folder_outbox.tga
new file mode 100644
index 000000000..589348221
Binary files /dev/null and b/indra/newview/skins/default/textures/inv_folder_outbox.tga differ
diff --git a/indra/newview/skins/default/textures/inv_folder_outfit.tga b/indra/newview/skins/default/textures/inv_folder_outfit.tga
new file mode 100644
index 000000000..dfb05929b
Binary files /dev/null and b/indra/newview/skins/default/textures/inv_folder_outfit.tga differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 973f76923..3552b3eaf 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -105,11 +105,16 @@
   <texture name="inv_folder_bodypart.tga"/>
   <texture name="inv_folder_callingcard.tga"/>
   <texture name="inv_folder_clothing.tga"/>
+  <texture name="inv_folder_favorite.tga"/>
   <texture name="inv_folder_gesture.tga"/>
+  <texture name="inv_folder_inbox.tga"/>
   <texture name="inv_folder_landmark.tga"/>
   <texture name="inv_folder_lostandfound.tga"/>
+  <texture name="inv_folder_mesh.tga"/>
   <texture name="inv_folder_notecard.tga"/>
   <texture name="inv_folder_object.tga"/>
+  <texture name="inv_folder_outfit.tga"/>
+  <texture name="inv_folder_outbox.tga"/>
   <texture name="inv_folder_plain_closed.tga"/>
   <texture name="inv_folder_plain_open.tga"/>
   <texture name="inv_folder_script.tga"/>
@@ -147,7 +152,7 @@
   <texture name="inv_item_texture.tga"/>
   <texture name="inv_item_underpants.tga"/>
   <texture name="inv_item_undershirt.tga"/>
-  
+
   <texture name="lag_status_critical.tga"/>
   <texture name="lag_status_good.tga"/>
   <texture name="lag_status_warning.tga"/>
@@ -370,6 +375,9 @@
   <texture name="icn_label_music.tga"/>
   <texture name="icn_label_media.tga"/>
   <texture name="arrow_down.tga"/>
+  <texture name="arrow_up.tga"/>
+  <texture name="arrow_left.tga"/>
+  <texture name="arrow_right.tga"/>
   <texture name="cloud-particle.j2c" use_mips="true"/>
   
   <texture name="skin_thumbnail_default.png" preload="true" />
@@ -396,7 +404,10 @@
   
   <texture name="go-previous-4.png"/>
   <texture name="go-next-4.png"/>
-  <texture name="view-refresh-5.png"/> 
+  <texture name="view-refresh-5.png"/>
   <texture name="go-home-4.png"/>
 
+  <texture name="Inv_WindLight.png" preload="true"/>
+  <texture name="Inv_WaterLight.png" preload="true"/>
+
 </textures>
diff --git a/indra/newview/skins/default/xui/en-us/floater_preview_sound.xml b/indra/newview/skins/default/xui/en-us/floater_preview_sound.xml
index 0c422f1c8..36596ca13 100644
--- a/indra/newview/skins/default/xui/en-us/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_preview_sound.xml
@@ -23,4 +23,5 @@
 	     mouse_opaque="true" name="Sound play btn" scale_image="true"
 	     sound_flags="0" tool_tip="Play this sound so that others can hear it."
 	     width="120" />
+	 <string name="Sound: ">Sound: </string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_post_process.xml b/indra/newview/skins/default/xui/es/floater_post_process.xml
index aef810211..138856077 100644
--- a/indra/newview/skins/default/xui/es/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/es/floater_post_process.xml
@@ -1,141 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Post-Process Floater" title="Configuración de Post Procesado">
-	  <tab_container name="Post-Process Tabs">
-			 <panel label="Filtro de Color" name="ColorFilterPanel">
-					<check_box label="Activar" name="enable_color_filter"/>
-					<text name="ColorFilterGammaText">
-						  Gama
-					</text>
-					<slider label="" name="gamma" />
-					<text name="ColorFilterBrightnessText">
-						  Brillo
-					</text>
-					<slider label="" name="brightness" />
-					<text name="ColorFilterSaturationText">
-						  Saturación
-					</text>
-					<slider label="" name="saturation"/>
-					<text name="ColorFilterContrastText">
-						  Contraste
-					</text>
-					<slider label="" name="contrast"/>
-					<text name="ColorFilterBaseText">
-						  Color base del contraste
-					</text>
-					<slider label="R" name="contrast_base[0]"/>
-					<slider label="G" name="contrast_base[1]"/>
-					<slider label="B" name="contrast_base[2]"/>
-					<slider label="I" name="contrast_base[3]"/>
-			 </panel>
-			 <panel label="Desenfoque Gaussiano" name="GaussBlurPanel">
-					<check_box label="Activar" name="enable_gauss_blur"/>
-					<text name="GaussBlurPassesText">
-						  Pasos a aplicar
-					</text>
-					<slider label="" name="gauss_blur_passes"/>
-			 </panel>
-		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
-		     label="Night Vision" left="1" mouse_opaque="false"
-		     name="NightVisionPanel" width="398">
-			<check_box bottom="-20" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="false" label="Enable"
-			     left="14" mouse_opaque="true" name="enable_night_vision" width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="NightVisionBrightMultText" v_pad="0"
-			     width="355">
-				Light Amplification Multiple
+	<tab_container name="Post-Process Tabs">
+		<panel label="Filtro de Color" name="ColorFilterPanel">
+			<check_box label="Activar" name="enable_color_filter"/>
+			<text name="ColorFilterGammaText">
+				Gama
 			</text>
-			<slider bottom_delta="-30" can_edit_text="true"
-			     decimal_digits="3" follows="left"
-			     height="18" increment="0.01" initial_val="3.0" label="" left="14"
-			     max_val="10" min_val="1" mouse_opaque="true"
-			     name="brightness_multiplier" show_text="true" value="0.7" width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="NightVisionNoiseSizeText" v_pad="0"
-			     width="355">
-				Noise Size
+			<slider label="" name="gamma" />
+			<text name="ColorFilterBrightnessText">
+				Brillo
 			</text>
-			<slider bottom_delta="-30" can_edit_text="true"
-			     decimal_digits="3" follows="left" height="18" increment="0.1"
-			     initial_val="1" label="" left="14" max_val="100" min_val="1"
-			     mouse_opaque="true" name="noise_size" show_text="true"
-			     value="1.0" width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="NightVisionNoiseStrengthText"
-			     v_pad="0" width="355">
-				Noise Strength
+			<slider label="" name="brightness" />
+			<text name="ColorFilterSaturationText">
+				Saturación
 			</text>
-			<slider bottom_delta="-30" can_edit_text="true" decimal_digits="3"
-			     follows="left" height="18" increment="0.01" initial_val="0.3" label=""
-			     left="14" max_val="1" min_val="0" mouse_opaque="true"
-			     name="noise_strength" show_text="true" value="1.0" width="200" />
+			<slider label="" name="saturation"/>
+			<text name="ColorFilterContrastText">
+				Contraste
+			</text>
+			<slider label="" name="contrast"/>
+			<text name="ColorFilterBaseText">
+				Color base del contraste
+			</text>
+			<slider label="R" name="contrast_base[0]"/>
+			<slider label="G" name="contrast_base[1]"/>
+			<slider label="B" name="contrast_base[2]"/>
+			<slider label="I" name="contrast_base[3]"/>
 		</panel>
-		<!--<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
-		     label="Bloom" left="1" mouse_opaque="true"
-		     name="BloomPanel" width="398">
-			<check_box bottom="-20" control_name="BloomToggle" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="false" label="Enable"
-			     left="14" mouse_opaque="true" name="BloomToggle" width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="BloomExtractText" v_pad="0"
-			     width="355">
-				Luminosity Extraction
+		<panel label="Desenfoque Gaussiano" name="GaussBlurPanel">
+			<check_box label="Activar" name="enable_gauss_blur"/>
+			<text name="GaussBlurPassesText">
+				Pasos a aplicar
 			</text>
-			<slider bottom_delta="-30" can_edit_text="true" control_name="BloomExtract"
-			     decimal_digits="3" follows="left" height="18" increment="0.01"
-			     initial_val="0.9" label="" left="14" max_val="1" min_val="0"
-			     mouse_opaque="true" name="BloomExtract" show_text="true" value="0.7"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="BloomSizeText" v_pad="0" width="355">
-				Bloom Size
+			<slider label="" name="gauss_blur_passes"/>
+		</panel>
+		<panel label="Visión Nocturna" name="NightVisionPanel">
+			<check_box label="Activar" name="enable_night_vision"/>
+			<text name="NightVisionBrightMultText">
+					Amplificación Múltiple de luz
 			</text>
-			<slider bottom_delta="-30" can_edit_text="true" control_name="BloomSize"
-			     decimal_digits="3" follows="left" height="18" increment="0.01"
-			     initial_val="3.0" label="" left="14" max_val="20" min_val="0"
-			     mouse_opaque="true" name="BloomSize" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="BloomStrengthText" v_pad="0"
-			     width="355">
-				Bloom Strength
+			<slider label="" name="brightness_multiplier"/>
+			<text name="NightVisionNoiseSizeText">
+				Tamaño del Ruido
 			</text>
-			<slider bottom_delta="-30" can_edit_text="true" control_name="BloomStrength"
-			     decimal_digits="3" follows="left" height="18" increment="0.01"
-			     initial_val="1.2" label="" left="14" max_val="10" min_val="0"
-			     mouse_opaque="true" name="BloomStrength" show_text="true" value="1.0"
-			     width="200" />
-		</panel>-->
-		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
-		     label="Extras" left="1" mouse_opaque="false" name="Extras"
-		     width="398">
-			<button bottom="-33" enabled="true" font="SansSerif" halign="center" height="20"
-			      label="LoadEffect" label_selected="LoadEffect" left="15"
-			     mouse_opaque="true" name="PPLoadEffect" scale_image="true" width="100" />
-			<button bottom="-60" enabled="true" font="SansSerif" halign="center" height="20"
-			      label="SaveEffect" label_selected="SaveEffect" left="15"
-			     mouse_opaque="true" name="PPSaveEffect" scale_image="true" width="100" />
-			<combo_box allow_text_entry="false" bottom="-33" follows="left|top" height="18"
-			     left_delta="120" max_chars="20" mouse_opaque="true" name="PPEffectsCombo"
-			     width="150" />
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-75"
-			     enabled="true" follows="left|right|bottom" font="SansSerif"
-			     handle_edit_keys_directly="false" height="20"
-			     label="Effect Name" left="135" max_length="40" mouse_opaque="true"
-			     name="PPEffectNameEditor" select_all_on_focus_received="false"
-			     select_on_focus="false" tab_group="1" width="150" />
+			<slider label="" name="noise_size"/>
+			<text name="NightVisionNoiseStrengthText">
+					Fuerza del Ruido
+			</text>
+			<slider label="" name="noise_strength"/>
+		</panel>
+		<panel label="Extras" name="Extras">
+			<button label="Cargar Efecto" label_selected="Cargar Efecto" name="PPLoadEffect"/>
+			<button label="Guardar Efecto" label_selected="Guardar Efecto" name="PPSaveEffect"/>
+			<combo_box name="PPEffectsCombo"/>
+			<line_editor label="Nombre del Efecto" name="PPEffectNameEditor"/>
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_postcard.xml b/indra/newview/skins/default/xui/es/floater_postcard.xml
index b6aabcf94..c8c7640a2 100644
--- a/indra/newview/skins/default/xui/es/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/es/floater_postcard.xml
@@ -1,54 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="true" height="380" min_height="380" min_width="450"
-     name="Postcard" title="Email Snapshot" width="450">
-	<text bottom="-35" follows="top|left" font="SansSerif" left="12" name="to_label">
-		Recipient&apos;s Email:
+<floater name="Postcard" title="Enviar Foto por Email">
+	<text name="to_label">
+		Email Destinat.:
 	</text>
-	<line_editor bottom_delta="-6" follows="left|top" height="20" left="120" max_length="254"
-	     name="to_form" width="150" />
-	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="12"
-	     name="from_label">
-		Your Email:
+	<text name="from_label">
+		Tu Email:
 	</text>
-	<line_editor bottom_delta="-6" follows="left|top" height="20" left="120" max_length="254"
-	     name="from_form" width="150" />
-	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="12"
-	     name="name_label">
-		Your Name:
+	<text name="name_label">
+		Tu Nombre:
 	</text>
-	<line_editor bottom_delta="-6" follows="left|top" height="20" left="120" max_length="100"
-	     name="name_form" width="150" />
-	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="12"
-	     name="subject_label">
-		Subject:
+	<text name="subject_label">
+		Asunto:
 	</text>
-	<line_editor bottom_delta="-6" follows="left|top" height="20"
-	     label="Type your subject here." left="120" max_length="100"
+	<line_editor label="Escribe el Asunto aquí." left="120" max_length="100"
 	     name="subject_form" width="150" spell_check="true" />
 	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="12"
 	     name="msg_label">
-		Message:
+		Mensaje:
 	</text>
-	<text_editor bottom_delta="-150" follows="left|top|right|bottom" height="140" left="12"
-	     max_length="700" name="msg_form" width="420" spell_check="true">
-		Type your message here.
+	<text_editor name="msg_form">
+		Escribe tu Mensaje aquí.
 	</text_editor>
-	<text bottom_delta="-37" follows="left|bottom" font="SansSerifSmall" left="12"
-	     name="fine_print">
-		If your recipient joins our universe, you&apos;ll get a referral bonus.
+	<text name="fine_print">
+		Si el destinatario se une a nuestro universo, recibirás un bono por referido.
 	</text>
-	<button bottom_delta="-32" follows="right|bottom" height="20" label="Cancel"
-	     name="cancel_btn" right="-10" width="100" />
-	<button bottom_delta="0" follows="right|bottom" height="20" label="Send"
-	     left_delta="-106" name="send_btn" width="100" />
+	<button label="Cancelar" name="cancel_btn" right="-10" width="100" />
+	<button label="Enviar" left_delta="-106" name="send_btn" width="100" />
 	<string name="default_subject">
-    Postcard from [SECOND_LIFE].
+		Tarjeta Postal desde [SECOND_LIFE].
   </string>
 	<string name="default_message">
-		Check this out!
+		¡Mira esto!
 	</string>
 	<string name="upload_message">
-	 "Sending..."
+		"Enviando..."
 	</string>	
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preferences.xml b/indra/newview/skins/default/xui/es/floater_preferences.xml
index ea850207c..cd73a8981 100644
--- a/indra/newview/skins/default/xui/es/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/es/floater_preferences.xml
@@ -1,28 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-666" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" can_tear_off="true" default_tab_group="1" enabled="true"
-     height="510" left="330" min_height="213" min_width="324"
-     mouse_opaque="true" name="Preferences" title="Preferences" width="620">
-	<button bottom="-505" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" label="OK" label_selected="OK" left="335"
-	     mouse_opaque="true" name="OK" scale_image="true" width="90" />
-	<button bottom="-505" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" label="Cancel" label_selected="Cancel"
-	     left_delta="93" mouse_opaque="true" name="Cancel" scale_image="true"
-	     width="90" />
-	<button bottom="-505" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" label="Apply" label_selected="Apply"
-	     left_delta="93" mouse_opaque="true" name="Apply" scale_image="true"
-	     width="90" />
-	<button bottom="-505" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" label="About" label_selected="About" left="9"
-	     mouse_opaque="true" name="About..." scale_image="true" width="90" />
-	<button bottom="-505" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20"
-	     help_url="http://secondlife.com/app/help/technical/preferences.php"
-	     label="Help" label_selected="Help" left_delta="93" mouse_opaque="true"
-	     name="Help" scale_image="true" width="90" />
-	<tab_container bottom="-466" enabled="true" follows="left|top|right|bottom" height="445"
-	     left="0" mouse_opaque="false" name="pref core" tab_group="1"
-	     tab_position="left" tab_width="120" width="620" />
+<floater name="Preferences" title="Preferencias">
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<button label="Aplicar" label_selected="Aplicar" name="Apply"/>
+	<button label="Acerca de" label_selected="Acerca de" name="About..."/>
+	<button label="Ayuda" label_selected="Ayuda" name="Help"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_animation.xml b/indra/newview/skins/default/xui/es/floater_preview_animation.xml
index 8eaf14b06..13a9501d6 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_animation.xml
@@ -1,32 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-366" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="85" left="239" min_height="0"
-     min_width="0" mouse_opaque="true" name="preview_anim" width="300">
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
-	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
-	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-	     select_on_focus="false" width="194" spell_check="true" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
-	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
-		Description:
+<floater name="preview_anim">
+	<text name="desc txt">
+		Descripción:
 	</text>
-	<!--<button bottom="-66" enabled="true" font="SansSerif" halign="center" height="19"
-	     label="Play in World" label_selected="Stop" left="27" mouse_opaque="true"
-	     name="Anim play btn" scale_image="true"
-	     tool_tip="Play this animation so that others can see it." width="96" />
-	<button bottom="-66" enabled="true" font="SansSerif" halign="center" height="19"
-	     label="Play Locally" label_selected="Stop" left="177" mouse_opaque="true"
-	     name="Anim audition btn" scale_image="true"
-	     tool_tip="Play this animation so that only you can see it." width="96" />-->
-	<button bottom="-66" enabled="true" font="SansSerif" halign="center" height="19"
-	     label="Play in World" label_selected="Stop" left="4" mouse_opaque="true"
-	     name="Anim play btn" scale_image="true"
-	     tool_tip="Play this animation so that others can see it." width="96" />
-	<button bottom="-66" enabled="true" font="SansSerif" halign="center" height="19"
-	     label="Play Locally" label_selected="Stop" left_delta="98" mouse_opaque="true"
-	     name="Anim audition btn" scale_image="true"
-	     tool_tip="Play this animation so that only you can see it." width="96" />
+	<button label="Mundo" label_selected="Stop" name="Anim play btn" tool_tip="Reproducir esta animación para que otros puedan verla."/>
+	<button label="Localmente" label_selected="Stop" name="Anim audition btn" tool_tip="Reproducir esta animación de modo que sólo tu puedas verla."/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_classified.xml b/indra/newview/skins/default/xui/es/floater_preview_classified.xml
index 3b116b3fe..7e96aafb2 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_classified.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_classified.xml
@@ -1,9 +1,3 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-311" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="510" left="242" min_height="480"
-     min_width="450" mouse_opaque="true" name="classified_preview"
-     rect_control="PreviewClassifiedRect" title="Classified Information"
-     width="440">
-	<panel bottom="20" follows="bottom|left" height="470" left="0"
-	     name="classified_details_panel" width="440" />
+<floater name="classified_preview" title="Información Clasificados">
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_embedded_texture.xml b/indra/newview/skins/default/xui/es/floater_preview_embedded_texture.xml
index 951708401..181799c47 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_embedded_texture.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_embedded_texture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-338" can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true" height="331" left="201" min_height="120" min_width="300" name="preview_texture" width="300">
-	<button bottom="-325" font="SansSerif" height="20" label="Copy To Inventory" left="105" name="Copy To Inventory" scale_image="true" width="172" />
-	<text bottom="30" font="SansSerifSmall" height="14" left="13" name="dimensions">Dimensions: [WIDTH] x [HEIGHT]</text>
+<floater name="preview_texture">
+	<button label="Copiar al Inventario" name="Copy To Inventory"/>
+	<text name="dimensions">Dimensiones: [WIDTH] x [HEIGHT]</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_event.xml b/indra/newview/skins/default/xui/es/floater_preview_event.xml
index 8aab4676d..ec8c1433d 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_event.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_event.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-311" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="510" left="242" min_height="480"
-     min_width="450" mouse_opaque="true" name="event_preview"
-     rect_control="PreviewEventRect" title="Event Information" width="440">
-	<panel bottom="20" follows="bottom|left" height="470" left="0"
-	     name="event_details_panel" width="440" />
+<floater name="event_preview" title="Información de Eventos">
+	<panel name="event_details_panel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_existing_landmark.xml b/indra/newview/skins/default/xui/es/floater_preview_existing_landmark.xml
index efe3aca47..62886e348 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_existing_landmark.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_existing_landmark.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-311" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="495" left="242" min_height="510"
-     min_width="460" mouse_opaque="true" name="existing_landmark_preview"
-     width="440">
-	<panel bottom="0" follows="bottom|left" height="475" left="0"
-	     name="place_details_panel" width="440" />
+<floater name="existing_landmark_preview">
+	<panel name="place_details_panel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
index c596107a5..c04b3d9b5 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
@@ -1,108 +1,64 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="350" min_height="350" min_width="450"
-     name="gesture_preview" width="450">
-	<string name="step_anim" />
-	<string name="step_sound" />
-	<string name="step_chat" />
-	<string name="step_wait" />
+<floater name="gesture_preview">
 	<string name="stop_txt">
-		Stop
+		Detener
 	</string>
 	<string name="preview_txt">
-		Preview
+		Vista Previa
 	</string>
 	<string name="none_text">
-		-- None --
+		-- Nada --
 	</string>
-	<text bottom="-35" follows="top|left" font="SansSerif" left="16" name="desc_label">
-		Description:
+	<text name="desc_label">
+		Descripción:
 	</text>
-	<line_editor bottom_delta="-6" follows="left|top" height="20" left="100" max_length="254"
-	     name="desc" width="330" spell_check="true" />
 	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="16"
 	     name="trigger_label">
-		Trigger:
+		Disparador:
 	</text>
-	<line_editor bottom_delta="-6" follows="left|top" height="20" left="100" max_length="31"
-	     name="trigger_editor" width="105" />
-	<text bottom_delta="6" follows="top|left" font="SansSerif" left="220"
-	     name="replace_text"
-	     tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture!">
-		Replace with:
+	<text name="replace_text" tool_tip="Reemplaza la palabra disparadora con estas palabras. Por ejemplo, el disparador &apos;Hola&apos; reemplázalo con &apos;Hello&apos; esto hará que en el chat salga &apos;Quiero decir Hello&apos; en vez de &apos;Quiero decir Hola&apos; al ejecutar el gesto.">
+		Reemplazar:
 	</text>
-	<line_editor bottom_delta="-6" follows="left|top" height="20" left="300" max_length="31"
-	     name="replace_editor"
-	     tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture"
-	     width="130" spell_check="true" />
-	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="16"
-	     name="key_label">
-		Shortcut Key:
+	<line_editor name="replace_editor" tool_tip="Reemplaza la palabra disparadora con estas palabras. Por ejemplo, el disparador &apos;Hola&apos; reemplázalo con &apos;Hello&apos; esto hará que en el chat salga &apos;Quiero decir Hello&apos; en vez de &apos;Quiero decir Hola&apos; al ejecutar el gesto."/>
+	<text name="key_label">
+		Atajo Teclado:
 	</text>
-	<combo_box bottom_delta="-6" follows="left|top" height="20" label="None" left="100"
-	     name="modifier_combo" width="50" />
-	<combo_box bottom_delta="0" follows="left|top" height="20" label="None" left_delta="60"
-	     name="key_combo" width="45" />
-	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="16" name="library_label">
-		Library:
+	<combo_box label="Nada" name="modifier_combo"/>
+	<combo_box label="Nada" name="key_combo"/>
+	<text name="library_label">
+		Librería:
 	</text>
-	<text bottom_delta="0" follows="top|left" font="SansSerif" left="220" name="steps_label">
-		Steps:
+	<text name="steps_label">
+		Pasos:
 	</text>
-	<scroll_list bottom_delta="-120" draw_border="true" follows="top|left" height="110"
-	     left="16" multi_select="false" name="library_list" width="100">
-		Animation
-Sound
+	<scroll_list name="library_list">
+		Animación
+Sonidos
 Chat
-Wait
+Esperar
 	</scroll_list>
-	<button bottom_delta="90" follows="top|left" height="20" label="Add &gt;&gt;"
-	     left="130" name="add_btn" width="80" />
-	<button bottom_delta="-30" follows="top|left" height="20" label="Move Up"
-	     left_delta="0" name="up_btn" width="80" />
-	<button bottom_delta="-30" follows="top|left" height="20" label="Move Down"
-	     left_delta="0" name="down_btn" width="80" />
-	<button bottom_delta="-30" follows="top|left" height="20" label="Remove" left_delta="0"
-	     name="delete_btn" width="80" />
-	<scroll_list bottom_delta="0" draw_border="true" follows="top|left" height="110" left="220"
-	     multi_select="false" name="step_list" width="210" />
-	<text bottom_delta="-70" follows="top|left" font="SansSerif" height="60" left="16"
-	     name="help_label">
-		All steps happen simultaneously, 
-unless you add wait steps.
+	<button label="Añadir &gt;&gt;" name="add_btn"/>
+	<button label="Subir" name="up_btn"/>
+	<button label="Bajar" name="down_btn"/>
+	<button label="Quitar" name="delete_btn"/>
+	<scroll_list name="step_list"/>
+	<text name="help_label">
+		Todos los pasos se ejecutan 
+simultáneamente, a menos que 
+agregues un paso de espera.
 	</text>
-	<text bottom_delta="0" follows="top|left" height="60" left="222" name="options_text"
-	     width="205" />
-	<combo_box bottom_delta="20" follows="top|left" height="20" left_delta="10"
-	     name="animation_list" width="100" />
-	<combo_box bottom_delta="0" follows="top|left" height="20" left_delta="0"
-	     name="sound_list" width="100" />
-	<line_editor bottom_delta="0" follows="top|left" height="20" left_delta="0" max_length="127"
-	     name="chat_editor" width="100" spell_check="true" />
-	<radio_group bottom_delta="-20" draw_border="false" follows="top|left" height="40"
-	     left="340" name="animation_trigger_type" width="80">
-		<radio_item bottom_delta="-5" follows="left|top" height="16" left="3" mouse_opaque="true"
-		     width="80" name="start">
-			Start
+	<radio_group name="animation_trigger_type">
+		<radio_item name="start">
+			Iniciar
 		</radio_item>
-		<radio_item bottom_delta="-10" follows="left|top" height="16" left="3" mouse_opaque="true"
-		     width="80" name="stop">
-			Stop
+		<radio_item name="stop">
+			Detener
 		</radio_item>
 	</radio_group>
-	<check_box bottom_delta="25" follows="top|left" height="20"
-	     label="until animations are done" left="232" name="wait_anim_check"
-	     width="100" />
-	<check_box bottom_delta="-20" follows="top|left" height="20" label="time in seconds"
-	     left_delta="0" name="wait_time_check" width="100" />
-	<line_editor bottom_delta="0" follows="top|left" height="20" left_delta="105"
-	     max_length="15" name="wait_time_editor" width="50" />
-	<check_box bottom="7" follows="top|left" height="20" label="Active" left="140"
-	     name="active_check"
-	     tool_tip="Active gestures can be triggered by chatting their trigger phrases or pressing their hot keys.  Gestures usually become inactive when there is a key binding conflict."
-	     width="100" />
-	<button bottom="5" follows="top|left" height="20" label="Preview" left_delta="80"
-	     name="preview_btn" width="80" />
-	<button bottom="5" follows="top|left" height="20" label="Save" left_delta="90"
-	     name="save_btn" width="80" />
+	<check_box label="Hasta que la aninación termine" name="wait_anim_check"/>
+	<check_box height="20" label="tiempo en segundos" name="wait_time_check"/>
+	<line_editor left_delta="125" name="wait_time_editor"/>
+	<check_box label="Activa" name="active_check" tool_tip="Los Gestos activos pueden ser disparados en el chat por sus frases disparadoras o pulsando sus teclas de acceso rápido. Los Gestos, por lo general, se vuelven inactivas cuando hay un conflicto en la combinación de teclas."/>
+	<button label="Vista Previa" name="preview_btn"/>
+	<button label="Guardar" name="save_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_notecard.xml b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
index 5307864c6..1bd4e085d 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
@@ -1,68 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-762" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" follows="left|top" height="377" left="273"
-     min_height="259" min_width="234" mouse_opaque="true"
-     name="preview notecard" title="Note:" width="400">
-	<button bottom="-370" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" label="Get Items" label_selected="Get Items" left_delta="120"
-	     mouse_opaque="false" name="Get Items" scale_image="true" width="100" />
-	<!--<check_box follows="left|bottom" bottom_delta="0" left_delta="110" name="https_chk" label="Saves via HTTPS" />-->
-	<icon bottom="-19" color="1 1 1 1" enabled="true" follows="top|right" height="16"
-	     image_name="icon_lock.tga" left="344" mouse_opaque="true" name="lock"
-	     width="16" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
-	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
-		Description:
+<floater name="preview notecard" title="Nota:">
+	<button label="Obtener Items" label_selected="Obtener Items" name="Get Items"/>
+	<text name="desc txt">
+		Descripción:
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
-	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
-	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-	     select_on_focus="false" width="294" spell_check="true" />
-	<menu_bar bottom="-56" drop_shadow="false" enabled="true" follows="left|top|right"
-	     height="18" left="8" mouse_opaque="false" name="motecard_menu" opaque="false"
-	     tear_off="false" width="220">
-		<menu bottom_delta="16" left="0" drop_shadow="true" enabled="true" height="198" width="150"
-		     mouse_opaque="false" name="Edit" opaque="true" tear_off="false">
-			<menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
-			     mouse_opaque="true" name="Undo" width="139" />
-			<menu_item_call bottom_delta="-50" enabled="false" height="20" label="Redo" left="0"
-			     mouse_opaque="true" name="Redo" width="139" />
-			<menu_item_separator bottom_delta="-58" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator1" width="139" />
-			<menu_item_call bottom_delta="-78" enabled="false" height="20" label="Cut" left="0"
-			     mouse_opaque="true" name="Cut" width="139" />
-			<menu_item_call bottom_delta="-98" enabled="false" height="20" label="Copy" left="0"
-			     mouse_opaque="true" name="Copy" width="139" />
-			<menu_item_call bottom_delta="-118" enabled="false" height="20" label="Paste" left="0"
-			     mouse_opaque="true" name="Paste" width="139" />
-			<menu_item_separator bottom_delta="-126" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator2" width="139" />
-			<menu_item_call bottom_delta="-146" enabled="true" height="20" label="Select All" left="0"
-			     mouse_opaque="true" name="Select All" width="139" />
-			<menu_item_call bottom_delta="-166" enabled="false" height="20" label="Deselect" left="0"
-			     mouse_opaque="true" name="Deselect" width="139" />
-			<menu_item_separator bottom_delta="-174" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator3" width="139" />
-			<menu_item_call bottom_delta="-194" enabled="true" height="20" label="Search / Replace..."
-			     left="0" mouse_opaque="true" name="Search / Replace..." width="139" />
+	<menu_bar name="motecard_menu">
+		<menu name="Edit" label="Editar">
+			<menu_item_call label="Deshacer" name="Undo"/>
+			<menu_item_call label="Rehacer" name="Redo"/>
+			<menu_item_call label="Cortar" name="Cut"/>
+			<menu_item_call label="Copiar" name="Copy"/>
+			<menu_item_call label="Pegar" name="Paste"/>
+			<menu_item_call label="Seleccionar Todo" name="Select All"/>
+			<menu_item_call label="Deseleccionar" name="Deselect"/>
+			<menu_item_call label="Buscar / Reemplazar..." name="Search / Replace..."/>
 		</menu>
 	</menu_bar>
-	<text_editor type="string" length="1" bottom="-344" embedded_items="true" enabled="true"
-	     follows="left|top|right|bottom" font="SansSerif" height="285"
-	     ignore_tab="false" left="4" max_length="65536" mouse_opaque="true"
-	     name="Notecard Editor" width="392" word_wrap="true" spell_check="true">
-		Loading...
+	<text_editor name="Notecard Editor">
+		Cargando...
 	</text_editor>
-	<button bottom="-370" enabled="false" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" label="Save" label_selected="Save" left="9"
-	     mouse_opaque="false" name="Save" scale_image="true" width="100" />
+	<button label="Guardar" label_selected="Guardar" name="Save"/>
 	<string name="no_object">
-		Unable to find object containing this note.
+		Incapaz de hallar el objeto contenido en esta nota.
 	</string>
 	<string name="not_allowed">
-		You are not allowed to view this note.
+		No tienes permiso para ver esta nota.
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_notecard_keep_discard.xml b/indra/newview/skins/default/xui/es/floater_preview_notecard_keep_discard.xml
index 96fd2633d..2858fbc7f 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_notecard_keep_discard.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_notecard_keep_discard.xml
@@ -1,71 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-762" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" follows="left|top" height="377" left="273"
-     min_height="259" min_width="350" mouse_opaque="true"
-     name="preview notecard" title="Note:" width="400">
-	<icon bottom="-19" color="1 1 1 1" enabled="true" follows="top|right" height="16"
-	     image_name="icon_lock.tga" left="344" mouse_opaque="true" name="lock"
-	     width="16" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
-	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
-		Description:
+<floater name="preview notecard" title="Nota:">
+	<text name="desc txt">
+		Descripción:
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
-	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
-	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-	     select_on_focus="false" width="294" spell_check="true" />
-	<menu_bar bottom="-56" drop_shadow="false" enabled="true" follows="left|top|right"
-	     height="18" left="8" mouse_opaque="false" name="motecard_menu" opaque="false"
-	     tear_off="false" width="220">
-		<menu bottom_delta="16" left="0" drop_shadow="true" enabled="true" height="198" width="150"
-		     mouse_opaque="false" name="Edit" opaque="true" tear_off="false">
-			<menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
-			     mouse_opaque="true" name="Undo" width="139" />
-			<menu_item_call bottom_delta="-50" enabled="false" height="20" label="Redo" left="0"
-			     mouse_opaque="true" name="Redo" width="139" />
-			<menu_item_separator bottom_delta="-58" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator1" width="139" />
-			<menu_item_call bottom_delta="-78" enabled="false" height="20" label="Cut" left="0"
-			     mouse_opaque="true" name="Cut" width="139" />
-			<menu_item_call bottom_delta="-98" enabled="false" height="20" label="Copy" left="0"
-			     mouse_opaque="true" name="Copy" width="139" />
-			<menu_item_call bottom_delta="-118" enabled="false" height="20" label="Paste" left="0"
-			     mouse_opaque="true" name="Paste" width="139" />
-			<menu_item_separator bottom_delta="-126" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator2" width="139" />
-			<menu_item_call bottom_delta="-146" enabled="true" height="20" label="Select All" left="0"
-			     mouse_opaque="true" name="Select All" width="139" />
-			<menu_item_call bottom_delta="-166" enabled="false" height="20" label="Deselect" left="0"
-			     mouse_opaque="true" name="Deselect" width="139" />
-			<menu_item_separator bottom_delta="-174" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator3" width="139" />
-			<menu_item_call bottom_delta="-194" enabled="true" height="20" label="Search / Replace..."
-			     left="0" mouse_opaque="true" name="Search / Replace..." width="139" />
+	<menu_bar name="motecard_menu" >
+		<menu name="Edit" label="Editar">
+			<menu_item_call label="Deshacer" name="Undo"/>
+			<menu_item_call label="Rehacer" name="Redo"/>
+			<menu_item_call label="Cortar" name="Cut"/>
+			<menu_item_call label="Copiar" name="Copy"/>
+			<menu_item_call label="Pegar" name="Paste"/>
+			<menu_item_call label="Seleccionar Todo" name="Select All"/>
+			<menu_item_call label="Deseleccionar" name="Deselect"/>
+			<menu_item_call label="Buscar / Reemplazar..." name="Search / Replace..."/>
 		</menu>
 	</menu_bar>
-	<text_editor type="string" length="1" bottom="-344" embedded_items="true" enabled="true"
-	     follows="left|top|right|bottom" font="SansSerif" height="285"
-	     ignore_tab="false" left="4" max_length="65536" mouse_opaque="true"
-	     name="Notecard Editor" width="392" word_wrap="true">
-		Loading...
+	<text_editor name="Notecard Editor">
+		Cargando...
 	</text_editor>
-	<button bottom="-370" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" label="Keep" label_selected="Keep" left="9"
-	     mouse_opaque="true" name="Keep" scale_image="true" width="100" />
-	<button bottom="-370" enabled="false" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" label="Save" label_selected="Save" left="114"
-	     mouse_opaque="false" name="Save" scale_image="true" width="100" />
-	<button bottom="-370" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" label="Discard" label_selected="Discard"
-	     left="219" mouse_opaque="true" name="Discard" scale_image="true"
-	     width="100" />
+	<button label="Mantener" label_selected="Mantener" name="Keep"/>
+	<button label="Guardar" label_selected="Guardar" name="Save"/>
+	<button label="Descartar" label_selected="Descartar" name="Discard"/>
 	<string name="no_object">
-		Unable to find object containing this note.
+		Incapaz de hallar el objeto contenido en esta nota.
 	</string>
 	<string name="not_allowed">
-		You are not allowed to view this note.
+		No tienes permiso para ver esta nota.
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_sound.xml b/indra/newview/skins/default/xui/es/floater_preview_sound.xml
index 0c422f1c8..e390e8075 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_sound.xml
@@ -1,26 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-85" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="85" left="176" min_height="0"
-     min_width="0" mouse_opaque="true" name="preview_sound" width="300">
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
-	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="19" left="95" max_length="127"
-	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-	     select_on_focus="false" width="192" spell_check="true" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
-	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
-		Description:
+<floater name="preview_sound">
+	<text name="desc txt">
+		Descripción:
 	</text>
-	<button bottom="-70" enabled="true" font="SansSerif" halign="center" height="19"
-	     label="Play Locally" label_selected="Play Locally" left="168"
+	<button label="Reproducir Localmente" label_selected="Reproducir Localmente" left="150"
 	     mouse_opaque="true" name="Sound audition btn" scale_image="true"
 	     sound_flags="0" tool_tip="Play this sound so that only you can hear it."
-	     width="120" />
-	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="19"
-	     label="Play in World" label_selected="Play in World" left_delta="-126"
-	     mouse_opaque="true" name="Sound play btn" scale_image="true"
-	     sound_flags="0" tool_tip="Play this sound so that others can hear it."
-	     width="120" />
+	     width="148" />
+	<button label="Reproducir en Mundo" label_selected="Reproducir en Mundo" left_delta="-146" name="Sound play btn" tool_tip="Play this sound so that others can hear it."
+	     width="142" />
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_texture.xml b/indra/newview/skins/default/xui/es/floater_preview_texture.xml
index 9a8681b7e..b76719394 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_texture.xml
@@ -1,88 +1,53 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-331" can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true" enabled="true" height="324" left="300" min_height="150" min_width="300" mouse_opaque="true" name="preview_texture" width="335">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom="-40"
-		drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="15"
-		left="13" mouse_opaque="true" name="desc txt" v_pad="0" width="80">
-			Description:
+<floater name="preview_texture">
+	<text name="desc txt">
+			Descripción:
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-43" enabled="false"
-		follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="false" height="17" left="93" 
-		max_length="127" mouse_opaque="true" name="desc" select_all_on_focus_received="false" select_on_focus="false" 
-		width="229" spell_check="true" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 
-		bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall" h_pad="0" 
-		halign="left" height="16" left="13" mouse_opaque="true" name="uuid txt" v_pad="0" width="80">
+	<text name="uuid txt">
 			UUID:
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0" enabled="false" 
-		follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="false" height="16" left="93" 
-		max_length="127" mouse_opaque="true" name="uuid" select_all_on_focus_received="false" select_on_focus="false" 
-		width="229" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 
-		bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall" h_pad="0" 
-		halign="left" height="16" left="13" mouse_opaque="true" name="uploader txt" v_pad="0" width="80">
-			Uploaded by:
+	<text name="uploader txt">
+			Subida por:
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0" enabled="false" 
-		follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="false" height="16" left="93" 
-		right="-80" max_length="127" mouse_opaque="true" name="uploader" select_all_on_focus_received="false" 
-		select_on_focus="false" width="420" />
-	<button bottom_delta="-1" enabled="true" follows="right|top" font="SansSerifSmall" halign="center" height="18" 
-		label="Profile" right="320" mouse_opaque="true" name="openprofile" scale_image="true" width="60" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 
-		bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall" 
-		h_pad="0" halign="left" height="16" left="13" mouse_opaque="true" name="uploadtime txt" v_pad="0" width="80">
-			Uploaded on:
+	<button label="Perfil" name="openprofile"/>
+	<text name="uploadtime txt">
+			Subida el:
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0" enabled="false" 
-		follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="false" height="16" left="93" 
-		right="-80" max_length="127" mouse_opaque="true" name="uploadtime" select_all_on_focus_received="false" 
-		select_on_focus="false" width="420" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 
-		bottom_delta="-1" drop_shadow_visible="true" enabled="true" follows="right|top" font="SansSerifSmall" 
-		h_pad="50" halign="left" height="16" right="345" mouse_opaque="true" name="alphanote" v_pad="0" width="80">
-			Loading...
+	<text name="alphanote">
+			Cargando...
 	</text>
-	<button bottom="8" enabled="true" follows="left|bottom" font="SansSerif" halign="center" height="20" 
-		label="Keep" label_selected="Keep" left="9" mouse_opaque="true" name="Keep" scale_image="true" width="100" />
-	<button bottom="8" enabled="true" follows="left|bottom" font="SansSerif" halign="center" height="20" 
-		label="Discard" label_selected="Discard" left="114" mouse_opaque="true" name="Discard" scale_image="true" width="100" />
-	<button bottom="8" enabled="true" follows="left|bottom" font="SansSerif" halign="center" height="20" 
-		label="Copy To Inventory" left="9" mouse_opaque="true" name="Copy To Inventory" scale_image="true" width="170" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 
-		bottom="35" drop_shadow_visible="true" enabled="true" follows="left|bottom" font="SansSerifSmall" h_pad="0" 
-		halign="left" height="14" left="13" mouse_opaque="true" name="dimensions" v_pad="0" width="135">
-			Dimensions: [WIDTH] x [HEIGHT]
+	<button label="Mantener" label_selected="Mantener" name="Keep"/>
+	<button label="Descartar" label_selected="Descartar" name="Discard"/>
+	<button label="Copiar al Inventario" name="Copy To Inventory"/>
+	<text name="dimensions">
+			Tamaño: [WIDTH] x [HEIGHT]
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 
-		bottom="35" drop_shadow_visible="true" enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0" 
-		halign="right" height="14" left="86" mouse_opaque="true" name="aspect_ratio" v_pad="0" width="110">
-			Preview Aspect Ratio
+	<text name="aspect_ratio">
+			Aspecto Vista Previa
 	</text>
-	<combo_box allow_text_entry="true" bottom="32" follows="right|bottom" height="20" left="202" max_chars="20" 
-		mouse_opaque="true" enabled="true" width="108" name="combo_aspect_ratio" tool_tip="Preview at a fixed aspect ratio">
-		<combo_item name="Unconstrained" value="Unconstrained">
-			Unconstrained
+	<combo_box name="combo_aspect_ratio" tool_tip="Vista Previa en aspecto fijo">
+		<combo_item name="Unconstrained">
+			Sin restricciones
 		</combo_item>
-		<combo_item name="1:1" value="1:1" tool_tip="Group Insignia or 1st Life Profile">
+		<combo_item name="1:1" tool_tip="Insignia de Grupo o Imagen del Perfil en 1ra. Vida">
 			1:1
 		</combo_item>
-		<combo_item name="4:3" value="4:3" tool_tip="2nd Life Profile">
+		<combo_item name="4:3" tool_tip="Imagen del Perfil en 2da. Vida">
 			4:3
 		</combo_item>
-		<combo_item name="10:7" value="10:7" tool_tip="Classifieds and search listings, landmarks">
+		<combo_item name="10:7" tool_tip="Clasificados y listados de la búsqueda, hitos">
 			10:7
 		</combo_item>
-		<combo_item name="3:2" value="3:2" tool_tip="About land">
+		<combo_item name="3:2" tool_tip="Acerca del Terreno">
 			3:2
 		</combo_item>
-		<combo_item name="16:10" value="16:10">
+		<combo_item name="16:10">
 			16:10
 		</combo_item>
-		<combo_item name="16:9" value="16:9" tool_tip="Profile Picks">
+		<combo_item name="16:9" tool_tip="Imagen Destacados del Perfil">
 			16:9
 		</combo_item>
-		<combo_item name="2:1" value="2:1">
+		<combo_item name="2:1">
 			2:1
 		</combo_item>
 	</combo_box>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_texture_keep_discard.xml b/indra/newview/skins/default/xui/es/floater_preview_texture_keep_discard.xml
index 2c24f4519..b1b1cba03 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_texture_keep_discard.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_texture_keep_discard.xml
@@ -1,29 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-331" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" height="331" left="176" min_height="120"
-     min_width="300" mouse_opaque="true" name="preview_texture" width="300">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
-	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
-		Description:
+<floater name="preview_texture">
+	<text name="desc txt">
+		Descripción:
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
-	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
-	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-	     select_on_focus="false" width="194" spell_check="true" />
-	<button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" label="Keep" label_selected="Keep" left="9"
-	     mouse_opaque="true" name="Keep" scale_image="true" width="100" />
-	<button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" label="Discard" label_selected="Discard"
-	     left="114" mouse_opaque="true" name="Discard" scale_image="true"
-	     width="100" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="30" drop_shadow_visible="true" enabled="true" follows="left|bottom"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
-	     mouse_opaque="true" name="dimensions" v_pad="0" width="163">
-		Dimensions: [WIDTH] x [HEIGHT]
+	<button label="Mantener" label_selected="Mantener" name="Keep"/>
+	<button label="Descartar" label_selected="Descartar" name="Discard"/>
+	<text name="dimensions">
+		Tamaño: [WIDTH] x [HEIGHT]
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_url.xml b/indra/newview/skins/default/xui/es/floater_preview_url.xml
index 055a5fc5b..1edbce078 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_url.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_url.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="495" mouse_opaque="true"
-     name="url_preview" rect_control="PreviewURLRect" title="Place Information"
-     width="440">
-	<panel bottom="0" follows="bottom|left" height="475" left="0"
-	     name="place_details_panel" width="440" />
+<floater name="url_preview" title="Información del lugar">
+	<panel name="place_details_panel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_price_for_listing.xml b/indra/newview/skins/default/xui/es/floater_price_for_listing.xml
index 873102394..d767dded4 100644
--- a/indra/newview/skins/default/xui/es/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/es/floater_price_for_listing.xml
@@ -1,25 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="240" min_height="300" min_width="300"
-     name="price_for_listing" title="Publish Classified Ad" width="320">
-	<text bottom="-200" follows="top|left" font="SansSerif" height="165" left="15"
-	     name="explanation_text">
-		Your classified ad will run for one week from 
-the date it is published. 
+<floater name="price_for_listing" title="Publicar Aviso Clasificado">
+	<text name="explanation_text">
+		Tu aviso clasificado se mantendrá durante una
+semana desde la fecha de su publicación. 
  
-Your ad&apos;s position in the classified listings 
-is determined by how much you choose to pay.
-The highest paid ads go to the top of the list, 
-and appear higher in searches.
+ La posición de tu aviso en el listado de avisos
+ se determina por cuanto decidas pagar.
+ Mientras más pagues por el aviso, mas alto en 
+ la lista y aparecerá en los primeros lugares.
 	</text>
-	<text bottom="50" follows="top|left" font="SansSerif" height="20" left="15"
-	     name="price_text" width="120">
-		Price for Ad ([CURRENCY]):
+	<text name="price_text">
+		Precio por el Aviso ([CURRENCY]):
 	</text>
-	<line_editor bottom_delta="2" follows="top|left" height="20" left="125" max_length="6"
-	     name="price_edit" width="60" />
-	<button bottom="13" follows="top|left" height="20" label="Cancel" left="205"
-	     name="cancel_btn" width="100" />
-	<button bottom_delta="0" follows="top|left" height="20" label="Set Price"
-	     left_delta="-106" name="set_price_btn" width="100" />
+	<button label="Cancelar" name="cancel_btn"/>
+	<button label="Definir Precio" name="set_price_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_radar.xml b/indra/newview/skins/default/xui/es/floater_radar.xml
index d0b67529b..0fb55cb12 100644
--- a/indra/newview/skins/default/xui/es/floater_radar.xml
+++ b/indra/newview/skins/default/xui/es/floater_radar.xml
@@ -1,329 +1,80 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="radar" title="Radar"
-	can_resize="true" can_minimize="true" can_close="true" can_drag_on_left="false"
-	rect_control="FloaterRadarRect" min_width="300"	min_height="300">
+<floater name="radar" title="Radar">
 
-	<scroll_list name="avatar_list"
-		    left="10" right="-10" top="-20" bottom="140" can_resize="true"
-		    column_padding="0" follows="left|top|bottom|right"
-		    draw_heading="true" multi_select="true" search_column="1"
-		    tool_tip="Hold shift or control while clicking to select multiple avatars">
-		<column name="marked" label="Mark" width="12" tool_tip="Marked avatars"/>
-		<column name="avatar_name" label="Name" width="150" tool_tip="Hold shift or control while clicking to select multiple avatars"/>
-		<column name="distance" label="Dist." width="48" tool_tip="Distance from your avatar (red=within chat range, yellow=within shout range, green=within draw distance)"/>
-		<column name="position" label="Pos." width="60" tool_tip="Position (X, Y) within this sim, or general direction (cardinal point) for outside sims"/>
-		<column name="altitude" label="Alt." width="48" tool_tip="Altitude"/>
-    <column name="activity" label="Act." width="24" tool_tip="Activity"/>
-    <column name="client" label="Client" width="80" dynamicwidth="true" tool_tip="Client the avatar is possibly using"/>
+	<scroll_list name="avatar_list" tool_tip="Mantén presionada la tecla Mayús o la tecla Ctrl al  pulsar con el mouse para seleccionar multiples avatares">
+		<column name="marked" label="Marcar" tool_tip="Avatares Marcados"/>
+		<column name="avatar_name" label="Nombre" tool_tip="Mantén presionada la tecla Mayús o la tecla Ctrl al  pulsar con el mouse para seleccionar multiples avatares"/>
+		<column name="distance" label="Dist." tool_tip="Distancia desde tu avatar (rojo=dentro del rango de chat, amarillo=dentro del rango de gritos, verde=dentro de la distancia de dibujo)"/>
+		<column name="position" label="Pos." tool_tip="Posición (X, Y) dentro del sim, o dirección general (punto cardinal) fuera del sim"/>
+		<column name="altitude" label="Alt." tool_tip="Altitud"/>
+		<column name="activity" label="Act." tool_tip="Actividad"/>
+		<column name="client" label="Cliente" tool_tip="Cliente-Visor que el avatar posiblemente esté usando"/>
 	</scroll_list>
 
-	<tab_container border="false" bottom_delta="-130" height="120" left="6" mouse_opaque="false"
-		       name="actions_tab_container" tab_position="top" follows="left|right|bottom">
-		<panel border="true" bottom_delta="-130" follows="left|top|right|bottom" height="255"
-		       label="Avatar" left="1" mouse_opaque="true"
-		     name="actions_tab" width="398">
+	<tab_container name="actions_tab_container">
+		<panel label="Avatar" name="actions_tab">
 			<!-- upper row -->
-			<button
-			       name="profile_btn"
-			       label="Profile"
-			       tool_tip="Show picture, groups, and other information"
-			       left="10"
-			       bottom_delta="-180"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
-			<button
-			       name="track_btn"
-			       label="(Un)Track"
-			       tool_tip="Toggle tracking of this avatar's position"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
-			<button
-			       name="get_key_btn"
-			       label="Get Key"
-			       tool_tip="Copies avatar's key to the clipboard"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
+			<button name="profile_btn" label="Perfil" tool_tip="Mostrar foto, grupos y demás información"/>
+			<button name="track_btn" label="(No)Rastrear" tool_tip="Rastrea la posición del avatar"/>
+			<button name="get_key_btn" label="Obtener Key" tool_tip="Copia la Key del avatar al portapapeles"/>
 			<!-- upper middle row -->
-			<button
-			       name="im_btn"
-			       label="IM"
-			       tool_tip="Open Instant Message session"
-			       left="10"
-			       bottom_delta="-22"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
-			<button
-			       name="offer_btn"
-			       label="Offer TP"
-			       tool_tip="Offer Teleport"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
-			<button
-			       name="teleport_btn"
-			       label="TP to"
-			       tool_tip="Teleport to avatar's position"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />			
+			<button name="im_btn" label="MI" tool_tip="Abre una sesión de Mensaje Instantáneo"/>
+			<button name="offer_btn" label="Ofrecer TP" tool_tip="Ofrecer Teleporte"/>
+			<button name="teleport_btn" label="TP a" tool_tip="Teleportarse a la posición del avatar"/>			
 			<!-- lower middle row-->
-			<button
-			       name="mark_btn"
-			       label="(Un)Mark"
-			       tool_tip="(Un)Mark this avatar in the list"
-			       left="10"
-			       bottom_delta="-22"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
-			<button
-			       name="prev_marked_btn"
-			       label="Prev Marked"
-			       tool_tip="Focus camera on previous marked avatar"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
-			<button
-			       name="next_marked_btn"
-			       label="Next Marked"
-			       tool_tip="Focus camera on next marked avatar"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
+			<button name="mark_btn" label="(No)Marcar" tool_tip="Marca/Desmarca a este avatar de la lista"/>
+			<button name="prev_marked_btn" label="Marcado Ant." tool_tip="Enfoca la cámara en el avatar marcado previo de la lista"/>
+			<button name="next_marked_btn" label="Marcado Sig." tool_tip="Enfoca la cámara en el avatar marcado siguiente de la lista"/>
 			<!-- lower row-->
-			<button
-			       name="focus_btn"
-			       label="Focus"
-			       tool_tip="Focus camera on this avatar in the list"
-			       left="10"
-			       bottom_delta="-22"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
-			<button
-			       name="prev_in_list_btn"
-			       label="Previous"
-			       tool_tip="Focus camera on previous avatar in list"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
-			<button
-			       name="next_in_list_btn"
-			       label="Next"
-			       tool_tip="Focus camera on next avatar in list"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
+			<button name="focus_btn" label="Foco" tool_tip="Enfoca la cámara en este avatar de la lista"/>
+			<button name="prev_in_list_btn" label="Anterior" tool_tip="Enfoca la cámara en el anterior avatar de la lista"/>
+			<button name="next_in_list_btn" label="Siguiente" tool_tip="Enfoca la cámara en el siguiente avatar de la lista"/>
 
 		</panel>
 
-		<panel border="true" bottom_delta="-150" follows="left|top|right|bottom" height="255"
-		       label="Alerts" left="1" mouse_opaque="true"
-		       name="alerts_tab" width="398">
-			<check_box height="16" label="Display alerts in chat"
-				   left="10" bottom_delta="-176" name="radar_alerts" 
-				   width="200" follows="bottom|left"
-				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
-				   initial_value="true" enabled="true" radio_style="false" 
-				   control_name="RadarChatAlerts"
-				   tool_tip="Announce alerts about incoming and outgoing avatars in chat" />
+		<panel label="Alertas" name="alerts_tab">
+			<check_box label="Mostrar Alertas en el chat" name="radar_alerts" tool_tip="Muestra en el chat las alertas de llegada y salida de los avatares" />
 
-			<check_box height="16" label="Avatars entering/exiting the sim"
-				   left="20" bottom_delta="-18" name="alerts_sim"
-				   width="200" follows="bottom|left"
-				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
-				   initial_value="true" enabled="true" radio_style="false"
-				   control_name="RadarAlertSim"
-				   tool_tip="Report avatars entering or exiting the sim" />
+			<check_box label="Avatares entrando/saliendo del sim" name="alerts_sim" tool_tip="Reporta los avatares que entran o salen del sim" />
 
-			<check_box height="16" label="Avatars within/beyond the draw distance"
-				   left="20" bottom_delta="-18" name="alerts_draw"
-				   width="200" follows="bottom|left"
-				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
-				   initial_value="true" enabled="true" radio_style="false"
-				   control_name="RadarAlertDraw"
-				   tool_tip="Report avatars getting within or beyond the draw distance" />
+			<check_box label="Avatare entrando/saliendo de la distancia de dibujo" name="alerts_draw" tool_tip="Reporta los avatares que entran o salen de la distancia de dibujo" />
 
-			<check_box height="16" label="Avatars within/beyond the shout range"
-				   left="20" bottom_delta="-18" name="alerts_chat"
-				   width="200" follows="bottom|left"
-				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
-				   initial_value="true" enabled="true" radio_style="false"
-				   control_name="RadarAlertShoutRange"
-				   tool_tip="Report avatars getting within or beyond the shout range" />
+			<check_box label="Avatares entrando/saliendo del rango de gritos" name="alerts_chat" tool_tip="Reporta los avatares que entran o salen del rango de gritos" />
 
-			<check_box height="16" label="Avatars within/beyond the chat range"
-				   left="20" bottom_delta="-18" name="alerts_chat"
-				   width="200" follows="bottom|left"
-				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
-				   initial_value="true" enabled="true" radio_style="false"
-				   control_name="RadarAlertChatRange"
-				   tool_tip="Report avatars getting within or beyond the chat range" />
+			<check_box label="Avatares entrando/saliendo del rango de chat" name="alerts_chat" tool_tip="Reporta los avatares que entran o salen del rango de chat" />
 		</panel>
 
-		<panel border="true" bottom_delta="-130" follows="left|top|right|bottom" height="255"
-		       label="Moderation" left="1" mouse_opaque="true"
-		       name="land_tab" width="398">
+		<panel label="Moderación" name="land_tab">
 			
 			<!-- Upper row -->
-			<button
-			       name="mute_btn"
-			       label="(Un)Mute"
-			       tool_tip="Mute or unmute this avatar (muted avatars' names are highlighted in red in the list)."
-			       left="10"
-			       bottom_delta="-200"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
-			<button
-			       name="freeze_btn"
-			       label="Freeze"
-			       tool_tip="Freeze the avatar, preventing it from moving"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
-			<button
-			       name="ar_btn"
-			       label="AR"
-			       tool_tip="Report abuse on this avatar"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
+			<button name="mute_btn" label="(No)Ignorar" tool_tip="Ignorar o dejar de ignorar a este avatar (los nombre de los avatares ignorados se resaltan en rojo en la lista)."/>
+			<button name="freeze_btn" label="Congelar" tool_tip="Congelar al avatar, para evitar que se pueda mover"/>
+			<button name="ar_btn" label="AR" tool_tip="Enviar un Reporte de Abuso sobre este avatar"/>
 			<!-- Lower row -->
-			<button
-			       name="eject_btn"
-			       label="Eject"
-			       tool_tip="Eject the avatar from the parcel"
-			       left="10"
-			       bottom_delta="-24"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
+			<button name="eject_btn" label="Expulsar" tool_tip="Expulsar a este avatar de la parcela"/>
 			
-			<button
-			       name="estate_eject_btn"
-			       label="Eject from estate"
-			       tool_tip="Eject this avatar from the estate"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="170"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
+			<button name="estate_eject_btn" label="Expulsar del Estado" tool_tip="Expulsar a este avatar del estado"/>
 		</panel>
 
-		<panel border="true" bottom_delta="-150" follows="left|top|right|bottom" height="255"
-		       label="Options" left="1" mouse_opaque="true"
-		       name="options_tab" width="398">
-			<check_box height="16" label="Update"
-				   left="10" bottom_delta="-180" name="update_enabled_cb" 
-				   width="200" follows="bottom|left"
-				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
-				   initial_value="true" enabled="true" radio_style="false" 
-				   tool_tip="Set whether the avatar list should update" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				   bottom_delta="-24" drop_shadow_visible="true" enabled="true" font="SansSerifSmall" height="18" left="24"
-				   mouse_opaque="false" name="rate" width="30">
-					Rate:
+		<panel label="Opciones" name="options_tab">
+			<check_box label="Actualizar" name="update_enabled_cb" tool_tip="Definir cuando debe ser actualizada la lista de avatares"/>
+			<text name="rate">
+					Frec.:
 			</text>
-			<radio_group draw_border="true" bottom_delta="2" left_delta="44" follows="bottom|left" width="196" height="20"
-				   mouse_opaque="true" name="update_rate" control_name="RadarUpdateRate" enabled="true"
-				   tool_tip="Rate of the radar updates (eats up more FPS when higher)">
-				<radio_item type="string" length="1" bottom_delta="0" height="16" left_delta="4" mouse_opaque="true"
-		     		 	name="high" width="20" follows="bottom|left">
-					High
+			<radio_group name="update_rate" tool_tip="Frecuencia de actualización del radar (consume mas FPS cuando es alta)">
+				<radio_item name="high">
+					Alta
 				</radio_item>
-				<radio_item type="string" length="1" bottom_delta="0" height="16" left_delta="30" mouse_opaque="true"
-		     		 	name="medium" width="25" follows="bottom|left">
-					Medium
+				<radio_item name="medium">
+					Media
 				</radio_item>
-				<radio_item type="string" length="1" bottom_delta="0" height="16" left_delta="35" mouse_opaque="true"
-		     		 	name="low" width="20" follows="bottom|left">
-					Low
+				<radio_item name="low">
+					Baja
 				</radio_item>
 			</radio_group>
-			<check_box height="16" label="Announce even when closed"
-				   left="10" bottom_delta="-24" name="keep_open"
-				   width="200" follows="bottom|left"
-				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
-				   initial_value="true" enabled="true" radio_style="false"
-				   control_name="RadarKeepOpen"
-				   tool_tip="Hides floater instead of closing to still announce in chat" />
-			<check_box height="16" label="Announce keys to HUD"
-				   left="10" bottom_delta="-20" name="radar_chat_keys" 
-				   width="200" follows="bottom|left"
-				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
-				   initial_value="true" enabled="true" radio_style="false" 
-				   control_name="RadarChatKeys"
-				   tool_tip="Set whether to send keys of avatars to LSL scripts" />
-			<button
-			       name="send_keys_btn"
-			       label="Announce now"
-			       tool_tip="Send all keys to HUD now"
-			       left_delta="150"
-			       bottom_delta="-2"
-			       width="100"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
+			<check_box label="Anunciar aun estando cerrado" name="keep_open" tool_tip="Oculta el radar en vez de cerrarlo para seguir enviando los avisos al chat" />
+			<check_box label="Anunciar keys all HUD" name="radar_chat_keys" tool_tip="Definir cuando enviar las keys de los avarares a los scritps LSL" />
+			<button name="send_keys_btn" label="Anunciar Ahora" tool_tip="Envia todas las keys al HUD ahora"/>
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_report_abuse.xml b/indra/newview/skins/default/xui/es/floater_report_abuse.xml
index 95e9ad79c..4715df69b 100644
--- a/indra/newview/skins/default/xui/es/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/es/floater_report_abuse.xml
@@ -1,246 +1,189 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="590" min_height="100" min_width="100"
-     name="floater_report_abuse" title="Report Abuse" width="390">
-	<texture_picker allow_no_texture="true" bottom="-150" default_image_name="None"
-	     follows="left|top" height="114" label="" left="238" mouse_opaque="true"
-	     name="screenshot" width="134" />
-	<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Include screenshot" left="13"
-	     mouse_opaque="true" name="screen_check" width="116" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-48" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="reporter_title" v_pad="0" width="50">
-		Reporter:
+<floater name="floater_report_abuse" title="Reportar Abuso">
+	<texture_picker label="" name="screenshot"/>
+	<check_box label="Incluir captura" name="screen_check"/>
+	<text name="reporter_title">
+		Denunciante:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-48" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="62"
-	     mouse_opaque="true" name="reporter_field" v_pad="0" width="150">
+	<text name="reporter_field">
 		Loremipsum Dolorsitamut
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-64" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="sim_title" v_pad="0" width="60">
-		Region:
+	<text name="sim_title">
+		Región:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-64" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="62"
-	     mouse_opaque="true" name="sim_field" v_pad="0" width="120">
-		Region Name
+	<text name="sim_field">
+		Nombre de la Región
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-80" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="pos_title" v_pad="0" width="50">
-		Position:
+	<text name="pos_title">
+		Posición:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-80" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="62"
-	     mouse_opaque="true" name="pos_field" v_pad="0" width="120">
+	<text name="pos_field">
 		{128.1, 128.1, 15.4}
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="select_object_label" v_pad="0" width="220">
-		Click the button then the object:
+	<text name="select_object_label">
+		Pulsa el botón y luego el objeto:
 	</text>
-	<button bottom_delta="-30" font="SansSerif" halign="center" height="32" label=""
-	     label_selected="" left="16" mouse_opaque="true" name="pick_btn"
-	     tool_tip="Object Picker - Identify an object as the subject of this report"
-	     width="32" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="16" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="53"
-	     mouse_opaque="true" name="object_name_label" v_pad="0" width="60">
-		Name:
+	<button label="" label_selected="" name="pick_btn" tool_tip="Selector de Objetos - Identificar un objeto como el sujeto de la denuncia"/>
+	<text name="object_name_label">
+		Nombre:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="66"
-	     mouse_opaque="true" name="object_name" v_pad="0" width="109">
+	<text name="object_name">
 		Consetetur Sadipscing
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="53"
-	     mouse_opaque="true" name="owner_name_label" v_pad="0" width="60">
-		Owner:
+	<text name="owner_name_label">
+		Propietario:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="66"
-	     mouse_opaque="true" name="owner_name" v_pad="0" width="109">
+	<text name="owner_name">
 		Hendrerit Vulputate
 	</text>
-	<combo_box bottom_delta="-48" follows="left|top" height="20" left="16" mouse_opaque="true"
-	     name="category_combo"
-	     tool_tip="Category -- select the category that best describes this report"
-	     width="356">
-    <combo_item name="Select_category" value="0">
-    Select category
-    </combo_item><combo_item name="Age__Age_play" value="31">
-    Age > Age play
-    </combo_item><combo_item name="Age__Adult_resident_on_Teen_Second_Life" value="32">
-    Age > Adult resident on Teen Second Life
-    </combo_item><combo_item name="Age__Underage_resident_outside_of_Teen_Second_Life" value="33">
-    Age > Underage resident outside of Teen Second Life
-    </combo_item><combo_item name="Assault__Combat_sandbox___unsafe_area" value="34">
-    Assault > Combat sandbox / unsafe area
-    </combo_item><combo_item name="Assault__Safe_area" value="35">
-    Assault > Safe area
-    </combo_item><combo_item name="Assault__Weapons_testing_sandbox" value="36">
-    Assault > Weapons testing sandbox
-    </combo_item><combo_item name="Commerce__Failure_to_deliver_product_or_service" value="38">
-    Commerce > Failure to deliver product or service
-    </combo_item><combo_item name="Disclosure__Real_world_information" value="39">
-    Disclosure > Real world information
-    </combo_item><combo_item name="Disclosure__Remotely_monitoring chat" value="40">
-    Disclosure > Remotely monitoring chat
-    </combo_item><combo_item name="Disclosure__Second_Life_information_chat_IMs" value="41">
-    Disclosure > Second Life information/chat/IMs
-    </combo_item><combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources" value="42">
-    Disturbing the peace > Unfair use of region resources
-    </combo_item><combo_item name="Disturbing_the_peace__Excessive_scripted_objects" value="43">
-    Disturbing the peace > Excessive scripted objects
-    </combo_item><combo_item name="Disturbing_the_peace__Object_littering" value="44">
-    Disturbing the peace > Object littering
-    </combo_item><combo_item name="Disturbing_the_peace__Repetitive_spam" value="45">
-    Disturbing the peace > Repetitive spam
-    </combo_item><combo_item name="Disturbing_the_peace__Unwanted_advert_spam" value="46">
-    Disturbing the peace > Unwanted advert spam
-    </combo_item><combo_item name="Fraud__L$" value="47">
-    Fraud > L$
-    </combo_item><combo_item name="Fraud__Land" value="48">
-    Fraud > Land
-    </combo_item><combo_item name="Fraud__Pyramid_scheme_or_chain_letter" value="49">
-    Fraud > Pyramid scheme or chain letter
-    </combo_item><combo_item name="Fraud__US$" value="50">
-    Fraud > US$
-    </combo_item><combo_item name="Ridiculous3" value="71">
-    Freud > User has taken an interest in their mother
-    </combo_item><combo_item name="Harassment__Advert_farms___visual_spam" value="51">
-    Harassment > Advert farms / visual spam
-    </combo_item><combo_item name="Harassment__Defaming_individuals_or_groups" value="52">
-    Harassment > Defaming individuals or groups
-    </combo_item><combo_item name="Harassment__Impeding_movement" value="53">
-    Harassment > Impeding movement
-    </combo_item><combo_item name="Harassment__Sexual_harassment" value="54">
-    Harassment > Sexual harassment
-    </combo_item><combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS" value="55">
-    Harassment > Solicting/inciting others to violate ToS
-    </combo_item><combo_item name="Harassment__Verbal_abuse" value="56">
-    Harassment > Verbal abuse
-    </combo_item><combo_item name="Ridiculous1" value="69">
-    Harassment > User keeps licking finger and touching me
-    </combo_item><combo_item name="Indecency__Broadly_offensive_content_or_conduct" value="57">
-    Indecency > Broadly offensive content or conduct
-    <!--  58 = deprecated by AO -->
-    </combo_item><combo_item name="Indecency__Inappropriate_avatar_name" value="59">
-    Indecency > Inappropriate avatar name
-    </combo_item><combo_item name="Indecency__Mature_content_in_PG_region" value="60">
-    Indecency > Inappropriate content or conduct in a PG region
-    </combo_item><combo_item name="Indecency__Inappropriate_content_in_Mature_region" value="69">
-    Indecency > Inappropriate content or conduct in a Mature region
-    </combo_item><combo_item name="Intellectual_property_infringement_Content_Removal" value="66">
-    Intellectual property infringement > Content Removal
-    </combo_item><combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" value="37">
-    Intellectual property infringement > CopyBot or Permissions Exploit
-    </combo_item><combo_item name="Intolerance" value="61">
-    Intolerance
-    </combo_item><combo_item name="Land__Abuse_of_sandbox_resources" value="62">
-    Land > Abuse of sandbox resources
-    </combo_item><combo_item name="Land__Encroachment__Objects_textures" value="63">
-    Land > Encroachment > Objects/textures
-    </combo_item><combo_item name="Land__Encroachment__Particles" value="64">
-    Land > Encroachment > Particles
-    </combo_item><combo_item name="Land__Encroachment__Trees_plants" value="65">
-    Land > Encroachment > Trees/plants
-    </combo_item><combo_item name="Ridiculous2" value="70">
-    Land > Encroachment > User won't stay on their side of the car
-    </combo_item><combo_item name="Wagering_gambling" value="67">
-    Wagering/gambling
-    </combo_item>
-    <combo_item name="Other" value="68">
-      Other
-    </combo_item>
-    </combo_box>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="abuser_name_title" v_pad="0" width="180">
-		Abuser name:
+	<combo_box name="category_combo" tool_tip="Categoría -- selecciona la categoría que mejor describe esta denuncia">
+		<combo_item name="Select_category">
+			Seleccionar categoría
+		</combo_item>
+		<combo_item name="Age__Age_play">
+			Edad > Jugar a se niño
+		</combo_item>
+		<combo_item name="Age__Adult_resident_on_Teen_Second_Life">
+			Edad > Residente adulto en Teen Second Life
+		</combo_item>
+		<combo_item name="Age__Underage_resident_outside_of_Teen_Second_Life">
+			Edad > Residente menor de edad fuera de Teen Second Life
+		</combo_item>
+		<combo_item name="Assault__Combat_sandbox___unsafe_area">
+			Ataque > Sandox de Combate / zona no segura
+		</combo_item>
+		<combo_item name="Assault__Safe_area">
+			Ataque > >Zona segura
+		</combo_item>
+		<combo_item name="Assault__Weapons_testing_sandbox">
+			Ataque > Sandbox de prueba de armas
+		</combo_item>
+		<combo_item name="Commerce__Failure_to_deliver_product_or_service">
+			Comercio > Error en la entrega de productos o servicios
+		</combo_item><combo_item name="Disclosure__Real_world_information">
+			Indiscreción > Información del mundo real
+		</combo_item>
+		<combo_item name="Disclosure__Remotely_monitoring chat">
+			Indiscreción > Monitoreo remoto del chat
+		</combo_item>
+		<combo_item name="Disclosure__Second_Life_information_chat_IMs">
+			Indiscreción > Información de Second Life/chat/IMs
+		</combo_item><combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
+			Alterar la Paz > Abuso de los recursos de la región
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
+			Alterar la Paz > Uso excesivo de objetos con scripts
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Object_littering">
+			Alterar la Paz > Objetos basura
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Repetitive_spam">
+			Alterar la Paz > Spam (Mensajes no solicitados) repetitivo
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
+			Alterar la Paz > Publicidad no deseada
+		</combo_item>
+		<combo_item name="Fraud__L$">
+			Fraude > L$
+		</combo_item>
+		<combo_item name="Fraud__Land">
+			Fraude > Terreno
+		</combo_item>
+		<combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
+			Fraude > Esquemas piramidales o cadenas de cartas
+		</combo_item>
+		<combo_item name="Fraud__US$">
+			Fraude > US$
+		</combo_item>
+		<combo_item name="Ridiculous3">
+			Freud > Un usuario a manifestado interes en su madre
+		</combo_item>
+		<combo_item name="Harassment__Advert_farms___visual_spam">
+			Acoso > Anuncios múltiples / spam visual
+		</combo_item>
+		<combo_item name="Harassment__Defaming_individuals_or_groups">
+			Acoso > Difamación de individuos o grupos
+		</combo_item>
+		<combo_item name="Harassment__Impeding_movement">
+			Acoso > Impedir el movimiento
+		</combo_item>
+		<combo_item name="Harassment__Sexual_harassment">
+			Acoso > Acoso sexual
+		</combo_item>
+		<combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
+			Acoso > Pedir/incitar a otros para violar el ToS
+		</combo_item>
+		<combo_item name="Harassment__Verbal_abuse">
+			Acoso > Abuso verbal
+		</combo_item>
+		<combo_item name="Ridiculous1">
+			Acoso > El usuario se lame los dedos y me toca
+		</combo_item>
+		<combo_item name="Indecency__Broadly_offensive_content_or_conduct">
+			Indecencia > En general, contenido o conducta ofensivos
+		<!--  58 = deprecated by AO -->
+		</combo_item><combo_item name="Indecency__Inappropriate_avatar_name">
+			Indecencia > Nombre inapropiado de avatar
+		</combo_item>
+		<combo_item name="Indecency__Mature_content_in_PG_region">
+			Indecencia > Contenido o conducta inapropiados en una región PG
+		</combo_item>
+		<combo_item name="Indecency__Inappropriate_content_in_Mature_region">
+			Indecencia > Contenido o conducta inapropiados en una región Mature
+		</combo_item>
+		<combo_item name="Intellectual_property_infringement_Content_Removal">
+			Infracción de la propiedad Intelectual > Eliminación de contenidos
+		</combo_item>
+		<combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
+			Infracción de la propiedad Intelectual > CopyBot o Exploit (programa malicioso) de permisos
+		</combo_item>
+		<combo_item name="Intolerance">
+			Intolerancia
+		</combo_item>
+		<combo_item name="Land__Abuse_of_sandbox_resources">
+			Terreno > Abuso de los recursos de un sandbox
+		</combo_item>
+		<combo_item name="Land__Encroachment__Objects_textures">
+			Terreno > Invasión > Objetos/texturas
+		</combo_item>
+		<combo_item name="Land__Encroachment__Particles">
+			Terreno > Invasión >  Partículas
+		</combo_item>
+		<combo_item name="Land__Encroachment__Trees_plants">
+			Terreno > Invasión > Árboles/plantas
+		</combo_item>
+		<combo_item name="Ridiculous2">
+			Terreno > Invasión > El usuario no se quiere quedar de su lado del coche
+		</combo_item>
+		<combo_item name="Wagering_gambling">
+			Apuestas/Juego
+		</combo_item>
+		<combo_item name="Other">
+			Otra
+		</combo_item>
+	</combo_box>
+	<text name="abuser_name_title">
+		Nombre del Infractor:
 	</text>
-	<line_editor bevel_style="in" border_style="line"
-	     border_thickness="1" bottom_delta="-18" follows="left|top"
-	     font="SansSerifSmall" height="16" left="16" max_length="32"
-	     mouse_opaque="true" name="abuser_name_edit"
-	     width="180" />
-	<button bottom_delta="-2" font="SansSerif" halign="center" height="20"
-	     label="Choose Resident" label_selected="" left_delta="190"
-	     mouse_opaque="true" name="select_abuser"
-	     tool_tip="Select the name of the abuser from a list" width="160" />
-
-	<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Don't know abuser's name" left="13" visible="false"
-	     mouse_opaque="true" name="omit_abuser_name" width="116" 
-		 tool_tip="Check this if you are unable to provide the abuser's name"/>
-
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="abuser_name_title2" v_pad="0" width="180">
-		Location of Abuse:
+	<button label="Elegir al Residente" label_selected="" name="select_abuser" tool_tip="Elegir de una lista el nombre del infractor"/>
+	<check_box label="No se el nombre del infractor" name="omit_abuser_name" tool_tip="Marca esto si no puedes aportar el nombre del infractor"/>
+	<text name="abuser_name_title2">
+			Localización de la Infracción:
 	</text>
-	<line_editor bevel_style="in" border_style="line"
-	     border_thickness="1" bottom_delta="-18" follows="left|top"
-	     font="SansSerifSmall" height="16" left="16" max_length="256"
-	     mouse_opaque="true" name="abuse_location_edit"
-	     width="356" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="sum_title" v_pad="0" width="180">
-		Summary:
+	<text name="sum_title">
+		Sumario:
 	</text>
-	<line_editor bevel_style="in" border_style="line"
-	     border_thickness="1" bottom_delta="-18" follows="left|top"
-	     font="SansSerifSmall" height="16" left="16" max_length="64"
-	     mouse_opaque="true" name="summary_edit" 
-	     width="356" spell_check="true" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="dscr_title" v_pad="0" width="180">
-		Details:
+	<text name="dscr_title">
+		Detalles:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-32" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="48" left="70"
-	     mouse_opaque="true" name="bug_aviso" v_pad="0" width="308">
-		Please be specific about the date, location, nature of
-abuse, relevant chat/IM text, and select the object
-if possible.
+	<text name="bug_aviso">
+		Por favor, se muy concreto sobre la fecha, la localización,
+la naturaleza de la infracción, el aportar textos relevantes
+del chat o los MI, y, si es posible, selecciona el objeto.	
 	</text>
-	<text_editor bottom_delta="-152" embedded_items="false"
-	     follows="left|top" font="SansSerifSmall" height="146" left="16"
-	     max_length="800" mouse_opaque="false" name="details_edit"
-	     width="356" word_wrap="true" spell_check="true" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="incomplete_title" v_pad="0" width="342">
-		Note: Incomplete reports will not be investigated.
+	<text name="incomplete_title">
+		Nota: Las denuncias incompletas no serán investigadas.
 	</text>
-	<button bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
-	     label="Cancel" label_selected="Cancel" mouse_opaque="true"
-	     name="cancel_btn" right="373" width="150" />
-	<button bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
-	     label="Report Abuse" label_selected="Report Abuse" mouse_opaque="true"
-	     name="send_btn" right="217" width="150" />
+	<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/es/floater_report_bug.xml b/indra/newview/skins/default/xui/es/floater_report_bug.xml
index 83d7a5c46..d90672d20 100644
--- a/indra/newview/skins/default/xui/es/floater_report_bug.xml
+++ b/indra/newview/skins/default/xui/es/floater_report_bug.xml
@@ -1,176 +1,107 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="455" min_height="100" min_width="100"
-     name="bug_reporter" title="Report Bug" width="390">
-	<texture_picker allow_no_texture="true" bottom="-150" default_image_name="None"
-	     follows="left|top" height="114" label="" left="238" mouse_opaque="true"
-	     name="screenshot" width="134" />
-	<check_box bottom_delta="-16" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Include screenshot" left="234"
-	     mouse_opaque="true" name="screen_check" width="116" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-48" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="reporter_title" v_pad="0" width="50">
-		Reporter:
+<floater name="bug_reporter" title="Reportar Fallo">
+	<texture_picker label="" name="screenshot"/>
+	<check_box label="Incluir captura de pantalla" name="screen_check"/>
+	<text name="reporter_title">
+		Informante:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-48" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="62"
-	     mouse_opaque="true" name="reporter_field" v_pad="0" width="120" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-64" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="sim_title" v_pad="0" width="50">
-		Region:
+	<text name="sim_title">
+		Región:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-64" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="62"
-	     mouse_opaque="true" name="sim_field" v_pad="0" width="120" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-80" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="pos_title" v_pad="0" width="50">
-		Position:
+	<text name="pos_title">
+		Posición:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-80" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="62"
-	     mouse_opaque="true" name="pos_field" v_pad="0" width="120" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="select_object_label" v_pad="0" width="200">
-		Click the button then the object:
+	<text name="select_object_label">
+		Haz clic en el botón y en el objeto para seleccionar:
 	</text>
-	<button bottom_delta="-32" font="SansSerif" halign="center" height="32" label=""
-	     label_selected="" left="16" mouse_opaque="true" name="pick_btn"
-	     tool_tip="Object Picker - Identify an object as the subject of this report"
-	     width="32" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="16" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="53"
-	     mouse_opaque="true" name="object_name_label" v_pad="0" width="60">
-		Name:
+	<button label="" label_selected="" name="pick_btn" tool_tip="Selector de Objetos - Identifica un objeto como el sujeto de este reporte"/>
+	<text name="object_name_label">
+		Nombre:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="66"
-	     mouse_opaque="true" name="object_name" v_pad="0" width="109">
+	<text name="object_name">
 		Consetetur Sadipscing
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="53"
-	     mouse_opaque="true" name="owner_name_label" v_pad="0" width="60">
-		Owner:
+	<text name="owner_name_label">
+		Propietario:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="66"
-	     mouse_opaque="true" name="owner_name" v_pad="0" width="109">
+	<text name="owner_name">
 		Hendrerit Vulputate
 	</text>
-	<combo_box bottom_delta="-28" follows="left|top" height="20" left="16" mouse_opaque="true"
-	     name="category_combo"
-	     tool_tip="Category -- select the category that best describes this report"
-	     width="180">
-		<combo_item name="Selectcategory" value="0">
-			Select category
+	<combo_box name="category_combo" tool_tip="Categoría -- Elige la categoría que mejor describe este reporte">
+		<combo_item name="Selectcategory">
+			Elegir categoría
 		</combo_item>
-		<combo_item name="Building" value="9">
-			Building
+		<combo_item name="Building">
+			Construcción
 		</combo_item>
 		<combo_item name="Character" value="8">
-			Character
+			Personaje
 		</combo_item>
-		<combo_item name="Chat/IM" value="3">
-			Chat/IM
+		<combo_item name="Chat/IM">
+			Chat/MI
 		</combo_item>
-		<combo_item name="Documentation" value="10">
-			Documentation
+		<combo_item name="Documentation">
+			Documentación
 		</combo_item>
-		<combo_item name="Exploit" value="22">
+		<combo_item name="Exploit">
 			Exploit
 		</combo_item>
 		<combo_item name="Graphics" value="11">
-			Graphics
+			Gráficos
 		</combo_item>
-		<combo_item name="Inventory" value="12">
-			Inventory
+		<combo_item name="Inventory">
+			Inventario
 		</combo_item>
-		<combo_item name="Lag" value="13">
+		<combo_item name="Lag">
 			Lag
 		</combo_item>
-		<combo_item name="MissingContent" value="21">
-			Missing Content
+		<combo_item name="MissingContent">
+			Contenido Perdido
 		</combo_item>
-		<combo_item name="LindenDollars(L$)" value="14">
+		<combo_item name="LindenDollars(L$)">
 			Linden Dollars (L$)
 		</combo_item>
-		<combo_item name="Permissions" value="15">
-			Permissions
+		<combo_item name="Permissions">
+			Permisos
 		</combo_item>
-		<combo_item name="Physics" value="16">
-			Physics
+		<combo_item name="Physics">
+			Física
 		</combo_item>
-		<combo_item name="Script" value="17">
+		<combo_item name="Script">
 			Script
 		</combo_item>
-		<combo_item name="Sound" value="6">
-			Sound
+		<combo_item name="Sound">
+			Sonidos
 		</combo_item>
-		<combo_item name="Stipends" value="18">
-			Stipends
+		<combo_item name="Stipends">
+			Salario
 		</combo_item>
-		<combo_item name="Userinterface" value="19">
-			User interface
+		<combo_item name="Userinterface">
+			Interfaz de usuario
 		</combo_item>
-		<combo_item name="Miscellaneous" value="20">
-			Miscellaneous
+		<combo_item name="Miscellaneous">
+			Misceláneo
 		</combo_item>
 	</combo_box>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="sum_title" v_pad="0" width="180">
-		Summary:
+	<text name="sum_title">
+		Sumario:
 	</text>
-	<line_editor bevel_style="in" border_style="line"
-	     border_thickness="1" bottom_delta="-16" follows="left|top"
-	     font="SansSerifSmall" height="16" left="16" max_length="64"
-	     mouse_opaque="true" name="summary_edit" 
-	     width="356" spell_check="true" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="dscr_title" v_pad="0" width="342">
-		Details: (Please provide as much information as possible)
+	<text name="dscr_title">
+		Detalles: (Por favor, proporciona toda la información que sea posible)
 	</text>
-	<text_editor bottom_delta="-112" embedded_items="false"
-	     follows="left|top" font="SansSerifSmall" height="112" left="16"
-	     max_length="900" mouse_opaque="false" name="details_edit"
-	     width="356" word_wrap="true" spell_check="true">
-		Steps to reproduce the bug:
+	<text_editor name="details_edit">
+		Pasos para reproducir el fallo:
 
-Observed results:
+Resultados observados:
 
-Expected results:
+Resultados esperados:
 	</text_editor>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-40" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="32" left="16"
-	     mouse_opaque="true" name="bug_aviso" v_pad="0" width="342">
-		Note: Incomplete reports will not be investigated
-If this bug allows you to do something you should not be able 
-to do, especially if it impacts performance or security, please 
-select the &apos;Exploit&apos; category. Thank you!
+	<text name="bug_aviso">
+		Nota: los informes incompletos no serán investigados
+Si el fallo te permite hacer algo que no deberías poder hacer,
+especialmente si éste impacta en el rendimiento o seguridad,
+por favor seleeciona la categoría &apos;Exploit&apos; ¡Gracias!
 	</text>
-	<button bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
-	     label="Cancel" label_selected="Cancel" mouse_opaque="true"
-	     name="cancel_btn" right="380" width="150" />
-	<button bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
-	     label="Report Bug" label_selected="Report Bug" mouse_opaque="true"
-	     name="send_btn" right="224" width="150" />
+	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	<button label="Reportar Fallo" label_selected="Reportar Fallo" name="send_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_rlv_behaviours.xml b/indra/newview/skins/default/xui/es/floater_rlv_behaviours.xml
index c4c9abc3b..127022a1b 100644
--- a/indra/newview/skins/default/xui/es/floater_rlv_behaviours.xml
+++ b/indra/newview/skins/default/xui/es/floater_rlv_behaviours.xml
@@ -1,89 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater 
-  can_close="true"
-  can_drag_on_left="false"
-  can_minimize="true"
-  can_resize="true"
-  height="455"
-  min_height="200"
-  min_width="375"
-  name="rlv_behaviours"
-  title="Active RLV Restrictions"
-  width="350">
-
-  <tab_container
-    follows="top|left|bottom|right"
-    bottom="-445"
-    left="5"
-    height="420"
-    width="338"
-    name="behaviour_tab"
-    tab_position="top">
-    <panel
-      border="true"
-      label="Restrictions"
-      name="behaviour_panel">
-      
-      <scroll_list
-        top_pad="17"
-	height="-30"
-	follows="top|left|bottom|right"
-	draw_border="false"
-	multi_select="false"
-	name="behaviour_list"
-	draw_heading="true"
-	draw_stripes="true"
-	left="2"
-	right="-2">
-	 <column
-	   label="Restriction"
-	   name="behaviour"
-	   width="170" />
-         <column
-	   label="Object Name"
-	   name="issuer"
-	   width="170" />
-      </scroll_list>
-    </panel>
-    <panel
-      border="true"
-      label="Exceptions"
-      name="exception_panel">
-      
-      <scroll_list
-top_pad="17"
-	height="-30"
-	follows="top|left|bottom|right"
-	draw_border="false"
-	multi_select="false"
-	name="exception_list"
-	draw_heading="true"
-	draw_stripes="true"
-	left="2"
-	right="-2">
-	 <column
-	   label="Restriction"
-	   name="behaviour"
-	   width="70" />
-	 <column
-	   label="Option"
-	   name="option"
-	   width="170" />
-         <column
-	   label="Object Name"
-	   name="issuer"
-	   width="170" />
-      </scroll_list>
-    </panel>
-  </tab_container>
-
-  <button
-    follows="bottom|left"
-    height="25"
-    label="Copy to Clipboard"
-    left="10"
-    name="copy_btn"
-    bottom="-440"
-    width="180" />
-
+<floater name="rlv_behaviours" title="Activar Restricciones RLV">
+	<tab_container name="behaviour_tab">
+		<panel label="Restricciones" name="behaviour_panel">
+			<scroll_list name="behaviour_list">
+				<column label="Restricción" name="behaviour"/>
+				<column label="Nombre de Objeto" name="issuer"/>
+			</scroll_list>
+		</panel>
+		<panel label="Excepciones" name="exception_panel">
+			<scroll_list name="exception_list">
+				<column label="Restricción" name="behaviour"/>
+				<column label="Opción" name="option"/>
+				<column label="Nombre de Objeto" name="issuer"/>
+			</scroll_list>
+		</panel>
+	</tab_container>
+	<button label="Copiar al Portapapeles" name="copy_btn"/>
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_rlv_locks.xml b/indra/newview/skins/default/xui/es/floater_rlv_locks.xml
index b2a836a8c..63327dcdf 100644
--- a/indra/newview/skins/default/xui/es/floater_rlv_locks.xml
+++ b/indra/newview/skins/default/xui/es/floater_rlv_locks.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-         height="425" min_height="200" min_width="375" name="rlvLocks" title="Active RLV Locks" width="375"
-         save_rect="true" save_visibility="true" single_instance="true">
-  <scroll_list bottom="-410" left="2" right="-2" draw_border="false" follows="top|left|bottom|right" height="390" multi_select="false"
-               name="lock_list" draw_heading="true" draw_stripes="true" layout="topleft">
-    <column label="Lock Type" name="lock_type" width="110" />
-    <column label="Add / Rem" name="lock_addrem" width="65" />
-    <column label="Lock Target" name="lock_target" width="150" />
-    <column label="Held By" name="lock_origin" width="150" />
-  </scroll_list>
+<floater name="rlvLocks" title="Activar Bloqueos RLV">
+	<scroll_list name="lock_list">
+		<column label="Tipo" name="lock_type"/>
+		<column label="Añadir/Quitar" name="lock_addrem"/>
+		<column label="Destino" name="lock_target"/>
+		<column label="Por" name="lock_origin"/>
+	</scroll_list>
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_script_debug.xml b/indra/newview/skins/default/xui/es/floater_script_debug.xml
index 2abd503be..d063870c5 100644
--- a/indra/newview/skins/default/xui/es/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_debug.xml
@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater bottom="-463" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="233" left="337" min_height="100" min_width="100"
-     mouse_opaque="true" name="script debug floater"
-     rect_control="FloaterScriptDebugRect" title="Script Warning/Error"
-     width="450">
-	<tab_container border="false" bottom="-233" follows="left|top|right|bottom" height="217"
-	     left="1" mouse_opaque="false" name="Preview Tabs" tab_position="bottom"
-	     width="448">
-		<floater bottom="-202" can_close="false" can_drag_on_left="false" can_minimize="true"
-		     can_resize="false" follows="left|top|right|bottom" height="201"
-		     label="Script" left="1" min_height="100" min_width="100"
-		     mouse_opaque="true" name="all_scripts" title="[All scripts]" width="446" />
+<multi_floater name="script debug floater" title="Avisos de Error de Script">
+	<tab_container name="Preview Tabs">
+		<floater label="Script" name="all_scripts" title="[Todos los scripts]"/>
 	</tab_container>
 </multi_floater>
diff --git a/indra/newview/skins/default/xui/es/floater_script_ed_panel.xml b/indra/newview/skins/default/xui/es/floater_script_ed_panel.xml
index 9e5147595..f732f7d28 100644
--- a/indra/newview/skins/default/xui/es/floater_script_ed_panel.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_ed_panel.xml
@@ -1,89 +1,44 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="-550" enabled="true" follows="left|top|right|bottom" height="508"
-     left="0" mouse_opaque="true" name="script panel" width="500" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0">
-	<text_editor type="string" length="1" bottom="-393"
-	     embedded_items="false" enabled="true" follows="left|top|right|bottom"
-	     font="Monospace" height="376" ignore_tab="false" left="4"
-	     max_length="65536" mouse_opaque="true" name="Script Editor" width="492" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0"
-	     word_wrap="true" show_line_numbers="true">
-		Loading...
+<panel name="script panel" >
+	<text_editor name="Script Editor">
+		Cargando...
 	</text_editor>
-  <button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" label="Edit..." label_selected="Edit..." left="230"
-	     mouse_opaque="true" name="Edit_btn" width="128" />
-  <button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" label="Save" label_selected="Save" left="360"
-	     mouse_opaque="true" name="Save_btn" width="128" />
-	<scroll_list background_visible="true" bottom="-457" column_padding="5" draw_border="true"
-	     draw_heading="false" draw_stripes="true" enabled="true"
-	     follows="left|right|bottom" height="60" left="4" mouse_opaque="true"
-	     multi_select="false" name="lsl errors" width="492" />
-	<combo_box allow_text_entry="false" bottom="-499" enabled="true" follows="left|bottom"
-	     height="20" label="Insert..." left="12" max_chars="20" mouse_opaque="true"
-	     name="Insert..." width="128" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0"
-	     bottom="-473" drop_shadow_visible="true" enabled="true"
-	     follows="left|bottom" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="12" left="12" mouse_opaque="true" name="line_col" v_pad="0"
-	     width="128" />
-	<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
-	     height="18" left="8" mouse_opaque="false" name="script_menu" opaque="false"
-	     tear_off="false" width="476">
-		<menu bottom="0" drop_shadow="true" enabled="true" height="62"
-		     left="0" mouse_opaque="false" name="File" opaque="true" tear_off="false"
-		     width="138">
-			<menu_item_call bottom_delta="-30" height="20" label="Save" left="0" mouse_opaque="true"
-			     name="Save" width="138" />
-			<menu_item_separator bottom_delta="-38" height="8" left="0" mouse_opaque="true" name="separator"
-			     width="138" />
-			<menu_item_call bottom_delta="-58" height="20" label="Revert All Changes" left="0"
-			     mouse_opaque="true" name="Revert All Changes" width="138" />
+	<button label="Edición..." label_selected="Edición..." name="Edit_btn"/>
+	<button label="Guardar" label_selected="Guardar" name="Save_btn"/>
+	<combo_box label="Insertar..." name="Insert..."/>
+	<menu_bar name="script_menu">
+		<menu name="File" label="Archivo" >
+			<menu_item_call label="Guardar" name="Save"/>
+			<menu_item_call label="Revertir los Cambios" name="Revert All Changes"/>
 		</menu>
-		<menu bottom="665" drop_shadow="true" enabled="true" height="198"
-		     left="222" mouse_opaque="false" name="Edit" opaque="true" tear_off="false"
-		     width="139">
-			<menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
-			     mouse_opaque="true" name="Undo" width="139" />
-			<menu_item_call bottom_delta="-50" enabled="false" height="20" label="Redo" left="0"
-			     mouse_opaque="true" name="Redo" width="139" />
-			<menu_item_separator bottom_delta="-58" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator" width="139" />
-			<menu_item_call bottom_delta="-78" enabled="false" height="20" label="Cut" left="0"
-			     mouse_opaque="true" name="Cut" width="139" />
-			<menu_item_call bottom_delta="-98" enabled="false" height="20" label="Copy" left="0"
-			     mouse_opaque="true" name="Copy" width="139" />
-			<menu_item_call bottom_delta="-118" enabled="false" height="20" label="Paste" left="0"
-			     mouse_opaque="true" name="Paste" width="139" />
-			<menu_item_separator bottom_delta="-126" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator2" width="139" />
-			<menu_item_call bottom_delta="-146" enabled="true" height="20" label="Select All" left="0"
-			     mouse_opaque="true" name="Select All" width="139" />
-			<menu_item_call bottom_delta="-166" enabled="false" height="20" label="Deselect" left="0"
-			     mouse_opaque="true" name="Deselect" width="139" />
-			<menu_item_separator bottom_delta="-174" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator3" width="139" />
-			<menu_item_call bottom_delta="-194" enabled="true" height="20" label="Search / Replace..."
-			     left="0" mouse_opaque="true" name="Search / Replace..." width="139" />
+		<menu name="Edit" label="Edición">
+			<menu_item_call label="Deshacer" name="Undo"/>
+			<menu_item_call label="Rehacer" 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="Pegar" name="Paste"/>
+			<menu_item_separator label="-----------" name="separator2"/>
+			<menu_item_call label="Seleccionar Todol" name="Select All"/>
+			<menu_item_call label="Deseleccionar" name="Deselect"/>
+			<menu_item_separator label="-----------" name="separator3"/>
+			<menu_item_call label="Buscar / Reemplazar..." name="Search / Replace..."/>
 		</menu>
-		<menu bottom="-18" drop_shadow="true" enabled="true" height="34"
-		     left="0" mouse_opaque="false" name="Help" opaque="true" tear_off="false"
-		     width="112">
-			<menu_item_call bottom="-30" enabled="true" height="20" label="Help..." left="0"
-			     mouse_opaque="true" name="Help..." width="112" />
-			<menu_item_call bottom="-30" enabled="true" height="20" label="LSL Wiki Help..." left="0"
-			     mouse_opaque="true" name="LSL Wiki Help..." width="112" />
+		<menu name="Help" label="Ayuda">
+			<menu_item_call label="Ayuda..." name="Help..."/>
+			<menu_item_call label="Ayuda LSL Wiki..." name="LSL Wiki Help..."/>
 		</menu>
 	</menu_bar>
 	<string name="loading">
-		Loading...
+		Cargando...
 	</string>
 	<string name="can_not_view">
-		You are not allowed to view this script.
+		No tienes permiso para ver este script.
 	</string>
 	<string name="public_objects_can_not_run">
-		Public Objects cannot run scripts
+		Los objetos públicos no pueden ejecutar scripts
 	</string>
 	<string name="script_running">
-		Running
+		Ejecutándose
 	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/floater_script_preview.xml b/indra/newview/skins/default/xui/es/floater_script_preview.xml
index 11735ea8b..1da35e4d4 100644
--- a/indra/newview/skins/default/xui/es/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_preview.xml
@@ -1,23 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-757" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" height="550" left="358" min_height="271"
-     min_width="290" mouse_opaque="true" name="preview lsl text"
-     rect_control="PreviewScriptRect" title="Script: Rotation Script"
-     width="500">
-	<panel bottom="-550" enabled="true" follows="left|top|right|bottom" height="508"
-	     left="1" name="script panel" width="497" border_thickness="0"/>
-	<icon bottom="-19" color="1 1 1 1" enabled="true" follows="top|right" height="16"
-	     image_name="icon_lock.tga" left="444" mouse_opaque="true" name="lock"
-	     width="16" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
-	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
-		Description:
+<floater name="preview lsl text" title="Script: Rotation Script">
+	<panel name="script panel"/>
+	<text name="desc txt">
+		Descripción:
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
-	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
-	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-	     select_on_focus="false" width="394" spell_check="true" />
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_script_queue.xml b/indra/newview/skins/default/xui/es/floater_script_queue.xml
index 90d1ac12e..cd7cefcab 100644
--- a/indra/newview/skins/default/xui/es/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_queue.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-763" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" height="400" left="408" min_height="100"
-     min_width="100" mouse_opaque="true" name="queue" title="Reset Progress"
-     width="300" border_bevel="none" border_thickness="0">
-	<button bottom="-392" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="24" label="Close" label_selected="Close" left="220"
-	     mouse_opaque="true" name="close" width="64" />
-	<scroll_list background_visible="true" bottom="-364" column_padding="5" draw_border="true"
-	     draw_heading="false" draw_stripes="true" enabled="true"
-	     follows="left|top|right|bottom" height="344" left="4" mouse_opaque="true"
-	     multi_select="false" name="queue output" width="292" />
+<floater name="queue" title="Reiniciar Progreso">
+	<button label="Cerrar" label_selected="Cerrar" name="close"/>
+	<scroll_list name="queue output"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml
index 98aad1a6e..9ef5e9719 100644
--- a/indra/newview/skins/default/xui/es/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/es/menu_inventory.xml
@@ -1,97 +1,84 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu name="Popup">
-	  <menu_item_call name="Task Buy" label="Comprar" ></menu_item_call>
-	  <menu_item_call name="Task Open" label="Abrir" ></menu_item_call>
-	  <menu_item_call name="Task Play" label="Reproducir" ></menu_item_call>
-	  <menu_item_call name="Task Properties" label="Propiedades" ></menu_item_call>
-	  <menu_item_call name="Task Rename" label="Renombrar" ></menu_item_call>
-	  <menu_item_call name="Task Remove" label="Borrar" ></menu_item_call>
-	  <menu_item_call name="Empty Trash" label="Vaciar Papelera" ></menu_item_call>
-	  <menu_item_call name="Empty Lost And Found" label="Vaciar Perdidos y Encontrados" ></menu_item_call>
-	  <menu_item_call name="New Folder" label="Carpeta nueva" ></menu_item_call>
-	  <menu_item_call name="New Script" label="Script nuevo" ></menu_item_call>
-	  <menu_item_call  name="New Note" label="Nota nueva" ></menu_item_call>
-	  <menu_item_call name="New Gesture" label="Gesto nuevo" ></menu_item_call>
-	  <menu name="New Clothes" label="Nuevas Ropas">
-			 <menu_item_call name="New Shirt" label="Camisa nueva" ></menu_item_call>
-			 <menu_item_call name="New Pants" label="Pantalones nuevos" ></menu_item_call>
-			 <menu_item_call name="New Shoes" label="Zapatos nuevos" ></menu_item_call>
-			 <menu_item_call name="New Socks" label="Calcetines nuevos" ></menu_item_call>
-			 <menu_item_call name="New Jacket" label="Chaqueta nueva" ></menu_item_call>
-			 <menu_item_call name="New Skirt" label="Falda nueva" ></menu_item_call>
-			 <menu_item_call name="New Gloves" label="Guantes nuevos" ></menu_item_call>
-			 <menu_item_call name="New Undershirt" label="Camiseta nueva" ></menu_item_call>
-			 <menu_item_call name="New Underpants" label="Ropa Interior nueva" ></menu_item_call>
-			 <menu_item_call name="New Tattoo" label="Tatuaje nuevo" ></menu_item_call>
-			 <menu_item_call name="New Alpha" label="Alfa nueva" ></menu_item_call>
-			 <menu_item_call name="New Physics" label="Física nueva" ></menu_item_call>
-	  </menu>
-	  <menu name="New Body Parts" label="Partes de Cuerpo Nuevas" >
-			 <menu_item_call name="New Shape" label="Forma nueva" ></menu_item_call>
-			 <menu_item_call name="New Skin" label="Piel nueva" ></menu_item_call>
-			 <menu_item_call name="New Hair" label="Pelo nuevo" ></menu_item_call>
-			 <menu_item_call name="New Eyes" label="Ojos nuevos" ></menu_item_call>
-	  </menu>
-	  <menu_item_call name="Landmark Open" label="Teleport" ></menu_item_call>
-	  <menu_item_call name="Animation Open" label="Abrir" ></menu_item_call>
-	  <menu_item_call name="Sound Open" label="Abrir"></menu_item_call>
-	  <menu_item_call name="Find Original" label="Encontrar original" ></menu_item_call>
-	  <menu_item_call name="Purge Item" label="Limpiar objeto" ></menu_item_call>
-	  <menu_item_call name="Restore Item" label="Restaurar objeto" ></menu_item_call>
-	  <menu name="Open With..." label="Abrir con...">
-			 <menu_item_call name="Hex Open" label="Editor Hexa" ></menu_item_call>
-			 <menu_item_call name="Open Text" label="Editor de Texto" ></menu_item_call>
-			 <menu_item_call name="Rez" label="Rezear Objeto" ></menu_item_call>
-	  </menu>
-	  <menu_item_call name="Open" label="Abrir" ></menu_item_call>
-	  <menu_item_call name="Properties" label="Propiedades"></menu_item_call>
-	  <menu_item_call name="Rename" label="Renombrar" ></menu_item_call>
-	  <menu_item_call name="Copy Asset UUID" label="Copiar Asset UUID" ></menu_item_call>
-	  <menu_item_call name="Reupload..." label="Resubir..." ></menu_item_call>
-	  <menu_item_call name="Acquire Asset ID" label="Adquirir Asset ID" ></menu_item_call>
-	  <menu_item_separator name="Copy Separator" />
-	  <menu_item_call name="Copy" label="Copiar" ></menu_item_call>
-	  <menu_item_call name="Paste" label="Pegar"></menu_item_call>
-	  <menu_item_call name="Paste As Link" label="Pegar como Link" ></menu_item_call>
-	  <menu_item_call name="Restore to Last Position" label="Restaurar en el mundo" ></menu_item_call>
-	  <menu_item_separator name="Paste Separator" />
-	  <menu_item_call name="Remove Link" label="Borrar Link" ></menu_item_call>
-	  <menu_item_call name="Delete" label="Borrar"></menu_item_call>
-	  <menu_item_separator name="Folder Wearables Separator" />
-	  <menu_item_call name="Wear Items" label="Vestirse objetos" ></menu_item_call>
-	  <menu_item_call name="Add To Outfit" label="Añadir al vestuario" ></menu_item_call>
-	  <menu_item_call name="Replace Outfit" label="Reemplazar Vestuario" ></menu_item_call>
-	  <menu_item_call label="Quitar del Vestuario" name="Remove From Outfit"></menu_item_call>
-	  <menu_item_separator name="Outfit Separator"></menu_item_separator>
-	  <menu_item_separator name="Calling Card Separator" />
-	  <menu_item_call name="Conference Chat Folder" label="Iniciar Conferencia Grupal" ></menu_item_call>
-	  <menu_item_separator name="Sound Separator" />
-	  <menu_item_call name="Sound Play" label="Reproducir" ></menu_item_call>
-	  <menu_item_separator name="Landmark Separator" />
-	  <menu_item_call name="Teleport To Landmark" label="Sobre el hito" ></menu_item_call>
-	  <menu_item_separator name="Animation Separator" />
-	  <menu_item_call name="Animation Play" label="Reproducir en el mundo"></menu_item_call>
-	  <menu_item_call name="Animation Audition" label="Reproducir localmente" ></menu_item_call>
-	  <menu_item_separator name="Send Instant Message Separator" />
-	  <menu_item_call name="Send Instant Message" label="Enviar MI" ></menu_item_call>
-	  <menu_item_call name="Offer Teleport..." label="Ofrecer Teleport..." ></menu_item_call>
-	  <menu_item_call name="Conference Chat" label="Iniciar Conferencia Grupal" ></menu_item_call>
-	  <menu_item_separator name="Gesture Separator" />
-	  <menu_item_call name="Activate" label="Activar" ></menu_item_call>
-	  <menu_item_call name="Deactivate" label="Desactivar" ></menu_item_call>
-	  <menu_item_separator name="Wearable And Object Separator" />
-	  <menu_item_call name="Wearable And Object Wear" label="Vestirse Objeto" ></menu_item_call>
-	  <menu_item_call label="Añadir al Vestuario" name="Wearable Add"></menu_item_call>
-	  <menu_item_call label="&#9650; >Hacia Adelante" name="Wearable Move Forward"></menu_item_call>
-	  <menu_item_call label="&#9660; Hacia Atrás" name="Wearable Move Back"></menu_item_call>
-	  <menu label="Anexar a " name="Attach To"/>
-	  <menu label="Anexar al HUD" name="Attach To HUD"/>
-	  <menu_item_call label="Quitarse" name="Detach From Yourself"></menu_item_call>
-	  <menu_item_call label="Editar" name="Wearable Edit"></menu_item_call>
-	  <menu_item_call label="Quitarse" name="Take Off"></menu_item_call>
-	  <menu_item_separator name="Marketplace Separator" />
-	  <menu_item_call label="Copiar al Merchant Outbox" name="Merchant Copy"/>
-	  <menu_item_call label="Enviar a Marketplace" name="Marketplace Send"/>
-	  <menu_item_call label="--sin opciones--" name="--no options--" />
-	  <!--menu_item_separator name="Wearable Separator" -->	
+	<menu_item_call name="Task Buy" label="Comprar"/>
+	<menu_item_call name="Task Open" label="Abrir"/>
+	<menu_item_call name="Task Play" label="Reproducir"/>
+	<menu_item_call name="Task Properties" label="Propiedades"/>
+	<menu_item_call name="Task Rename" label="Renombrar"/>
+	<menu_item_call name="Task Remove" label="Borrar"/>
+	<menu_item_call name="Empty Trash" label="Vaciar Papelera"/>
+	<menu_item_call name="Empty Lost And Found" label="Vaciar Perdidos y Encontrados"/>
+	<menu_item_call name="New Folder" label="Carpeta nueva"/>
+	<menu_item_call name="New Script" label="Script nuevo"/>
+	<menu_item_call name="New Note" label="Nota nueva"/>
+	<menu_item_call name="New Gesture" label="Gesto nuevo"/>
+	<menu name="New Clothes" label="Nuevas Ropas">
+		<menu_item_call name="New Shirt" label="Camisa nueva"/>
+		<menu_item_call name="New Pants" label="Pantalones nuevos"/>
+		<menu_item_call name="New Shoes" label="Zapatos nuevos"/>
+		<menu_item_call name="New Socks" label="Calcetines nuevos"/>
+		<menu_item_call name="New Jacket" label="Chaqueta nueva"/>
+		<menu_item_call name="New Skirt" label="Falda nueva"/>
+		<menu_item_call name="New Gloves" label="Guantes nuevos"/>
+		<menu_item_call name="New Undershirt" label="Camiseta nueva"/>
+		<menu_item_call name="New Underpants" label="Ropa Interior nueva"/>
+		<menu_item_call name="New Tattoo" label="Tatuaje nuevo"/>
+		<menu_item_call name="New Alpha" label="Alfa nueva"/>
+		<menu_item_call name="New Physics" label="Física nueva"/>
+	</menu>
+	<menu name="New Body Parts" label="Partes de Cuerpo Nuevas">
+		<menu_item_call name="New Shape" label="Forma nueva"/>
+		<menu_item_call name="New Skin" label="Piel nueva"/>
+		<menu_item_call name="New Hair" label="Pelo nuevo"/>
+		<menu_item_call name="New Eyes" label="Ojos nuevos"/>
+	</menu>
+	<menu_item_call name="Landmark Open" label="Teleport"/>
+	<menu_item_call name="Animation Open" label="Abrir"/>
+	<menu_item_call name="Sound Open" label="Abrir"/>
+	<menu_item_call name="Find Original" label="Encontrar original"/>
+	<menu_item_call name="Purge Item" label="Limpiar objeto"/>
+	<menu_item_call name="Restore Item" label="Restaurar objeto"/>
+	<menu name="Open With..." label="Abrir con...">
+		<menu_item_call name="Hex Open" label="Editor Hexa"/>
+		<menu_item_call name="Open Text" label="Editor de Texto"/>
+		<menu_item_call name="Rez" label="Rezear Objeto"/>
+	</menu>
+	<menu_item_call name="Open" label="Abrir"/>
+	<menu_item_call name="Properties" label="Propiedades"/>
+	<menu_item_call name="Rename" label="Renombrar"/>
+	<menu_item_call name="Copy Asset UUID" label="Copiar Asset UUID"/>
+	<menu_item_call name="Reupload..." label="Resubir..."/>
+	<menu_item_call name="Acquire Asset ID" label="Adquirir Asset ID"/>
+	<menu_item_call name="Copy" label="Copiar"/>
+	<menu_item_call name="Paste" label="Pegar"/>
+	<menu_item_call name="Paste As Link" label="Pegar como Link"/>
+	<menu_item_call name="Restore to Last Position" label="Restaurar en el mundo"/>
+	<menu_item_call name="Remove Link" label="Borrar Link"/>
+	<menu_item_call name="Delete" label="Borrar"/>
+	<menu_item_call name="Wear Items" label="Vestirse objetos"/>
+	<menu_item_call name="Add To Outfit" label="Añadir al vestuario"/>
+	<menu_item_call name="Replace Outfit" label="Reemplazar Vestuario"/>
+	<menu_item_call name="Remove From Outfit" label="Quitar del Vestuario"/>
+	<menu_item_call name="Conference Chat Folder" label="Iniciar Conferencia Grupal"/>
+	<menu_item_call name="Sound Play" label="Reproducir"/>
+	<menu_item_call name="Teleport To Landmark" label="Sobre el hito"/>
+	<menu_item_call name="Animation Play" label="Reproducir en el mundo"/>
+	<menu_item_call name="Animation Audition" label="Reproducir localmente" />
+	<menu_item_call name="Send Instant Message" label="Enviar MI"/>
+	<menu_item_call name="Offer Teleport..." label="Ofrecer Teleport..."/>
+	<menu_item_call name="Conference Chat" label="Iniciar Conferencia Grupal"/>
+	<menu_item_call name="Activate" label="Activar"/>
+	<menu_item_call name="Deactivate" label="Desactivar"/>
+	<menu_item_call name="Wearable And Object Wear" label="Vestirse Objeto"/>
+	<menu_item_call name="Wearable Add" label="Añadir al Vestuario"/>
+	<menu_item_call name="Wearable Move Forward" label="&#9650; Hacia Adelante"/>
+	<menu_item_call name="Wearable Move Back" label="&#9660; Hacia Atrás"/>
+	<menu name="Attach To" label="Anexar a"/>
+	<menu name="Attach To HUD" label="Anexar al HUD"/>
+	<menu_item_call name="Detach From Yourself" label="Quitarse"/>
+	<menu_item_call name="Wearable Edit" label="Editar"/>
+	<menu_item_call name="Take Off" label="Quitarse"/>
+	<menu_item_call name="Merchant Copy" label="Copiar al Merchant Outbox"/>
+	<menu_item_call name="Marketplace Send" label="Enviar a Marketplace"/>
+	<menu_item_call name="--no options--" label="--sin opciones--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory.xml b/indra/newview/skins/default/xui/fr/menu_inventory.xml
index 4f1d8f4a4..266109d55 100644
--- a/indra/newview/skins/default/xui/fr/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inventory.xml
@@ -1,75 +1,84 @@
 <?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="Nouvelle gesture" name="New Gesture"/>
-	<menu name="New Clothes">
-		<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 Tee-shirt" name="New Undershirt"/>
-		<menu_item_call label="Nouveaux sous-vêtements" name="New Underpants"/>
+	<menu_item_call name="Task Buy" label="Acheter"/>
+	<menu_item_call name="Task Open" label="Ouvrir"/>
+	<menu_item_call name="Task Play" label="Jouer"/>
+	<menu_item_call name="Task Properties" label="Propriétés"/>
+	<menu_item_call name="Task Rename" label="Renommer"/>
+	<menu_item_call name="Task Remove" label="Supprimer"/>
+	<menu_item_call name="Empty Trash" label="Vider la corbeille"/>
+	<menu_item_call name="Empty Lost And Found" label="Vider les objets trouvés"/>
+	<menu_item_call name="New Folder" label="Nouveau dossier"/>
+	<menu_item_call name="New Script" label="Nouveau script"/>
+	<menu_item_call name="New Note" label="Nouvelle note"/>
+	<menu_item_call name="New Gesture" label="Nouvelle gesture"/>
+	<menu name="New Clothes" label="Nouveaux Vêtements">
+		<menu_item_call name="New Shirt" label="Nouvelle chemise"/>
+		<menu_item_call name="New Pants" label="Nouveau pantalon"/>
+		<menu_item_call name="New Shoes" label="Nouvelles chaussures"/>
+		<menu_item_call name="New Socks" label="Nouvelles chaussettes"/>
+		<menu_item_call name="New Jacket" label="Nouvelle veste"/>
+		<menu_item_call name="New Skirt" label="Nouvelle jupe"/>
+		<menu_item_call name="New Gloves" label="Nouveaux gants"/>
+		<menu_item_call name="New Undershirt" label="Nouveau Tee-shirt"/>
+		<menu_item_call name="New Underpants" label="Nouveaux sous-vêtements"/>
+		<menu_item_call name="New Tattoo" label="Nouveau Tatouage"/>
+		<menu_item_call name="New Alpha" label="Nouvelle Alpha"/>
+		<menu_item_call name="New Physics" label="Nouvelle Physique"/>
 	</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 name="New Body Parts" label="Parties du corps nouvelles">
+		<menu_item_call name="New Shape" label="Nouvelle silhouette"/>
+		<menu_item_call name="New Skin" label="Nouvelle peau"/>
+		<menu_item_call name="New Hair" label="Nouveaux cheveux"/>
+		<menu_item_call name="New Eyes" label="Nouveaux yeux"/>
 	</menu>
-	<menu_item_call bottom_delta="-18" height="18" label="Ajouter" left="0" name="Object Add" width="128">
-		<on_click function="Inventory.DoToSelected" userdata="wear_add" />
-	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" label="Faire un Lien" left="0" name="Paste As Link" width="128">
-		<on_click filter="" function="Inventory.DoToSelected" userdata="paste_link" />
-	</menu_item_call>
-	<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'objet" name="Purge Item"/>
-	<menu_item_call label="Restaurer l'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'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="Enlever l'ensemble" name="Take Off Items"/>
-	<menu_item_call label="Ajouter à l'ensemble" name="Add To Outfit"/>
-	<menu_item_call label="Remplacer l'ensemble" name="Replace Outfit"/>
-	<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="Remettre au dernier emplacement" name="Restore to Last Position"/>
-	<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="Éditer" name="Wearable Edit"/>
-	<menu_item_call label="Porter" name="Wearable Wear"/>
-	<menu_item_call label="Enlever" name="Take Off"/>
-	<menu_item_call label="--aucune option--" name="--no options--"/>
-  <menu_item_call bottom_delta="-18" height="18" label="Porter l'ensemble" left="0" name="Wear Items" width="128">
-    <on_click filter="" function="Inventory.DoToSelected" userdata="wearitems" />
-  </menu_item_call>
-</menu>
\ No newline at end of file
+	<menu_item_call name="Landmark Open" label="Téléporter"/>
+	<menu_item_call name="Animation Open" label="Ouvrir"/>
+	<menu_item_call name="Sound Open" label="Ouvrir"/>
+	<menu_item_call name="Find Original" label="Trouver l'origine"/>
+	<menu_item_call name="Purge Item" label="Purger l'objet"/>
+	<menu_item_call name="Restore Item" label="Restaurer l'objet"/>
+	<menu name="Open With..." label="Ouvrir avec...">
+		<menu_item_call name="Hex Open" label="Hex Editor"/>
+		<menu_item_call name="Open Text" label="Text Editor"/>
+		<menu_item_call name="Rez" label="Rez l'objet"/>
+	</menu>
+	<menu_item_call name="Open" label="Ouvrir"/>
+	<menu_item_call name="Properties" label="Propriétés"/>
+	<menu_item_call name="Rename" label="Renommer"/>
+	<menu_item_call name="Copy Asset UUID" label="Copier l'UUID (identifiant universel unique)"/>
+	<menu_item_call name="Reupload..." label="Reupload..."/>
+	<menu_item_call name="Acquire Asset ID" label="Acquérir Asset ID"/>
+	<menu_item_call name="Copy" label="Copier"/>
+	<menu_item_call name="Paste" label="Coller"/>
+	<menu_item_call name="Paste As Link" label="Faire un Lien"/>
+	<menu_item_call name="Restore to Last Position" label="Remettre au dernier emplacement"/>
+	<menu_item_call name="Remove Link" label="Supprimer Lien"/>
+	<menu_item_call name="Delete" label="Supprimer"/>
+	<menu_item_call name="Wear Items" label="Porter l'ensemble"/>
+	<menu_item_call name="Add To Outfit" label="Ajouter à l'ensemble"/>
+	<menu_item_call name="Replace Outfit" label="Remplacer l'ensemble"/>
+	<menu_item_call name="Remove From Outfit" label="Enlever de l'ensemble"/>
+	<menu_item_call name="Conference Chat Folder" label="Démarrer le chat conférence"/>
+	<menu_item_call name="Sound Play" label="Jouer"/>
+	<menu_item_call name="Teleport To Landmark" label="Au sujet du repère"/>
+	<menu_item_call name="Animation Play" label="Jouer dans le Monde"/>
+	<menu_item_call name="Animation Audition" label="Jouer localement"/>
+	<menu_item_call name="Send Instant Message" label="Envoyer un message instantané"/>
+	<menu_item_call name="Offer Teleport..." label="Offrir de téléporter"/>
+	<menu_item_call name="Conference Chat" label="Démarrer le chat conférence"/>
+	<menu_item_call name="Activate" label="Activer"/>
+	<menu_item_call name="Deactivate" label="Désactiver"/>
+	<menu_item_call name="Wearable And Object Wear" label="Porter"/>
+	<menu_item_call name="Wearable Add" label="Ajouter"/>
+	<menu_item_call name="Wearable Move Forward" label="&#9650; Haut"/>
+	<menu_item_call name="Wearable Move Back" label="&#9660; Bas"/>
+	<menu name="Attach To" label="Attacher à"/>
+	<menu name="Attach To HUD" label="Attacher au HUD"/>
+	<menu_item_call name="Detach From Yourself" label="Détacher de vous"/>
+	<menu_item_call name="Wearable Edit" label="Éditer"/>
+	<menu_item_call name="Take Off" label="Enlever"/>
+	<menu_item_call name="Merchant Copy" label="Copier au Merchant Outbox"/>
+	<menu_item_call name="Marketplace Send" label="Envoyer à Marketplace"/>
+	<menu_item_call name="--no options--" label="--aucune option--"/>
+</menu>
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 1deaf0412..17eb1309d 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -5,7 +5,7 @@
 		D&#xE9;cocher cette option pour passer en mode plein &#xE9;cran.
 	</text_editor>
 	<text name="WindowSizeLabel">
-		Taille de la fen&#xEA;tre :
+		Taille de la fen&#xEA;tre:
 	</text>
 	<combo_box name="windowsize combo">
 		<combo_item name="640x480">
@@ -25,48 +25,48 @@
 		</combo_item>
 	</combo_box>
 	<text name="DisplayResLabel" width="165">
-		R&#xE9;solution de l&apos;affichage :
+		R&#xE9;solution de l'affichage:
 	</text>
 	<text name="AspectRatioLabel1" tool_tip="largeur/hauteur">
-		Rapport hauteur/largeur :
+		Rapport hauteur/largeur:
 	</text>
 	<combo_box name="aspect_ratio" tool_tip="largeur/hauteur">
-		<combo_item length="1" name="4:3(StandardCRT)" type="string">
+		<combo_item name="4:3(StandardCRT)">
 			4:3 (Standard CRT)
 		</combo_item>
-		<combo_item length="1" name="5:4(1280x1024LCD)" type="string">
+		<combo_item name="5:4(1280x1024LCD)">
 			5:4 (1280 x 1024 LCD)
 		</combo_item>
 		<combo_item name="8:5(Widescreen)">
 			8:5 (&#xE9;cran large)
 		</combo_item>
-		<combo_item length="1" name="16:9(Widescreen)" type="string">
+		<combo_item name="16:9(Widescreen)">
 			16:9 (plein &#xE9;cran)
 		</combo_item>
 	</combo_box>
-	<text length="1" name="text" type="string">
-		R&#xE9;solution d&apos;affichage :
+	<text name="text">
+		R&#xE9;solution d'affichage:
 	</text>
-	<text length="1" name="Fullscreen Aspect Ratio:" type="string">
-		Format de plein &#xE9;cran :
+	<text name="Fullscreen Aspect Ratio:">
+		Format de plein &#xE9;cran:
 	</text>
-	<text length="1" name="(width / height)" type="string">
+	<text name="(width / height)">
 		(largeur / hauteur)
 	</text>
-	<text length="1" name="UI Size:" type="string">
-		Taille de l&apos;IU :
+	<text name="UI Size:">
+		Taille de l'IU:
 	</text>
-	<text length="1" name="(meters, lower is faster)" type="string">
+	<text name="(meters, lower is faster)">
 		(mètres, moins = plus rapide)
 	</text>
-	<text length="1" name="text2" type="string">
-		Options d&apos;affichage :
+	<text name="text2">
+		Options d'affichage:
 	</text>
 	<check_box label="Lancer Singularity dans une fen&#xEA;tre (et non pas, PAR la fen&#xEA;tre)" name="windowed mode"/>
 	<check_box label="Auto-d&#xE9;tection du ratio" left="350" name="aspect_auto_detect"/>
 	<check_box label="Utiliser &#xE9;chelle de r&#xE9;solution ind&#xE9;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"/>
+	<check_box label="Montrer l'avatar en vue subjective" name="avfp"/>
+	<spinner label="Distance d'affichage:" name="draw_distance"/>
 	<text name="HigherText">
 		Qualit&#xE9; et
 	</text>
@@ -94,68 +94,51 @@
 	<text name="QualityText2" visible="false"/>
 	<check_box label="Personnaliser" left="395" name="CustomSettings"/>
 	<text name="ShadersText">
-		Effets :
+		Effets:
 	</text>
 	<check_box label="Pla&#xE7;age de relief et brillance" name="BumpShiny"/>
 	<check_box label="Effets de base" name="BasicShaders" tool_tip="D&#xE9;sactiver cette option peut emp&#xEA;cher certains drivers de cartes graphiques de planter."/>
 	<check_box label="Effets atmosph&#xE9;riques" name="WindLightUseAtmosShaders"/>
-	<check_box bottom_delta="-17" control_name="RenderDeferred" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="true" label="D&#xE9;lissage" left_delta="0"
-	     mouse_opaque="true" name="RenderDeferred" radio_style="false"
-	     width="256" />
-<check_box bottom_delta="-17" control_name="RenderDepthOfField"	initial_value="true" label="Profondeur de champ" left_delta="0" name="RenderDepthOfField"/>
-<check_box bottom_delta="-17" control_name="RenderDeferredGI" enabled="true"
-      follows="left|top" font="SansSerifSmall" height="16"
-      initial_value="true" label="Illumination globale (Experimental)" left_delta="0"
-      mouse_opaque="true" name="RenderDeferredGI" radio_style="false"
-      width="256" />
-		<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-17" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12"
-	     left="15" mouse_opaque="true" name="ReflectionDetailText" v_pad="0"
-	     width="128">
-		Reflets :
+	<check_box label="D&#xE9;lissage" name="RenderDeferred" width="256" />
+	<check_box label="Occlusion ambiante" name="UseSSAO"/>
+	<check_box label="Profondeur de champ" name="RenderDepthOfField"/>
+	<check_box label="Illumination globale (Experimental)" name="RenderDeferredGI" width="256"/>
+	<text bottom_delta="-17" name="ReflectionDetailText" width="128">
+		Reflets:
 	</text>
-	<combo_box bottom_delta="-20" control_name="RenderReflectionDetail" enabled = "true" follows="left|top" label="Reflection Detail"
-		 left_delta="-2" mouse_opaque="true" name="ReflectionDetailCombo" width="160" height="16">
-          <combo_item type="string" length="1" name="0">
+	<combo_box bottom_delta="-20" label="Reflection Detail" name="ReflectionDetailCombo">
+		<combo_item name="0">
            Aucun
-           </combo_item>
-		<combo_item type="string" length="1" name="1">
+		</combo_item>
+		<combo_item name="1">
 			Terrain et arbres
 		</combo_item>
-		<combo_item type="string" length="1" name="2">
+		<combo_item name="2">
 			Objets Statiques
 		</combo_item>
-		<combo_item type="string" length="1" name="3">
+		<combo_item name="3">
 			Avatars et objets
 		</combo_item>
-		<combo_item type="string" length="1" name="4">
+		<combo_item name="4">
 			Tout
 		</combo_item>
 	</combo_box>
-<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-      bottom_delta="-17" drop_shadow_visible="true" enabled="true" follows="left|top"
-      font="SansSerifSmall" h_pad="0" halign="left" height="12"
-      left="15" mouse_opaque="true" name="ShadowDetailText" v_pad="0"
-      width="128">
-    Ombres att&#xE9;nu&#xE9;es :
-  </text>
-  <combo_box bottom_delta="-20" control_name="RenderShadowDetail" enabled = "true" follows="left|top" label="Shadow Detail"
-   left_delta="-2" mouse_opaque="true" name="ShadowDetailCombo" width="160" height="16">
-    <combo_item type="string" length="1" name="0" value="0">
-      D&#xE9;sactiv&#xE9;
+	<text bottom_delta="-17" name="ShadowDetailText" width="128">
+		Ombres att&#xE9;nu&#xE9;es:
+	</text>
+	<combo_box bottom_delta="-20" label="Shadow Detail" name="ShadowDetailCombo">
+	<combo_item name="0">
+		D&#xE9;sactiv&#xE9;
     </combo_item>
-    <combo_item type="string" length="1" name="1" value="1">
-      Ombres solaires
+    <combo_item name="1">
+        Ombres solaires
     </combo_item>
-    <combo_item type="string" length="1" name="2" value="2">
-      Ombres des projecteurs
+    <combo_item name="2">
+        Ombres des projecteurs
     </combo_item>
   </combo_box>
-      <text name="AvatarRenderingText">
-		Rendu de l&apos;avatar :
+	<text name="AvatarRenderingText">
+		Rendu de l'avatar:
 	</text>
 	<check_box label="Avatars &#xE9;loign&#xE9;s en 2D" name="AvatarImpostors"/>
 	<check_box label="Acc&#xE9;l&#xE9;ration du rendu" name="AvatarVertexProgram"/>
@@ -166,18 +149,18 @@
 	<text name="DrawDistanceMeterText2">
 		m
 	</text>
-	<slider label="Limite d&apos;affichage :" name="DrawDistance"/>
-	<slider label="Nombre de particules max. :" label_width="143" name="MaxParticleCount"/>
-	<slider label="Qualit&#xE9; post-traitement :" label_width="125" name="RenderPostProcess"/>
+	<slider label="Limite d'affichage:" name="DrawDistance"/>
+	<slider label="Nombre de particules max.:" label_width="143" name="MaxParticleCount"/>
+	<slider label="Qualit&#xE9; post-traitement:" label_width="125" name="RenderPostProcess"/>
 	<text name="MeshDetailText">
-		D&#xE9;tails des rendus :
+		D&#xE9;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"/>
+	<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>
@@ -200,7 +183,7 @@
 		Faible
 	</text>
 	<text name="LightingDetailText">
-		Sources lumineuses :
+		Sources lumineuses:
 	</text>
 	<radio_group name="LightingDetailRadio">
 		<radio_item name="SunMoon">
@@ -211,7 +194,7 @@
 		</radio_item>
 	</radio_group>
 	<text left="380" name="TerrainDetailText">
-		Rendu du terrain :
+		Rendu du terrain:
 	</text>
 	<radio_group name="TerrainDetailRadio">
 		<radio_item name="0">
@@ -221,8 +204,9 @@
 			Elev&#xE9;
 		</radio_item>
 	</radio_group>
-	<button label="Param&#xE8;tres recommand&#xE9;s" name="Defaults"/>
-	<button label="Configuration du matériel" label_selected="Configuration du mat&#xE9;riel" name="GraphicsHardwareButton"/>
+	<button label="Param&#xE8;tres recommand&#xE9;s" left="20" name="Defaults" width="200"/>
+	<!--button label="Advanced" left="130" name="CustomSettingsButton"/-->
+	<button label="Configuration du mat&#xE9;riel" left="240" name="GraphicsHardwareButton" width="220"/>
 	<text name="resolution_format">
 		[RES_X] x [RES_Y]
 	</text>