diff --git a/indra/llcommon/llcursortypes.cpp b/indra/llcommon/llcursortypes.cpp
index 23ede97af3ae81dbd3dab3c31134e423a1969c8d..6751c235f6be8807556a76c0c81209cbea075aad 100644
--- a/indra/llcommon/llcursortypes.cpp
+++ b/indra/llcommon/llcursortypes.cpp
@@ -72,6 +72,9 @@ ECursorType getCursorFromString(const std::string& cursor_string)
cursor_string_table["UI_CURSOR_TOOLPAUSE"] = UI_CURSOR_TOOLPAUSE;
cursor_string_table["UI_CURSOR_TOOLMEDIAOPEN"] = UI_CURSOR_TOOLMEDIAOPEN;
cursor_string_table["UI_CURSOR_PIPETTE"] = UI_CURSOR_PIPETTE;
+ cursor_string_table["UI_CURSOR_TOOLSIT"] = UI_CURSOR_TOOLSIT;
+ cursor_string_table["UI_CURSOR_TOOLBUY"] = UI_CURSOR_TOOLBUY;
+ cursor_string_table["UI_CURSOR_TOOLOPEN"] = UI_CURSOR_TOOLOPEN;
}
std::map<std::string,U32>::const_iterator iter = cursor_string_table.find(cursor_string);
diff --git a/indra/llcommon/llcursortypes.h b/indra/llcommon/llcursortypes.h
index a1b8178bfe65365b4ca81e8881814be50f4b8f49..143c2c64cffba6a1d442e91d1fda329d4ce05e83 100644
--- a/indra/llcommon/llcursortypes.h
+++ b/indra/llcommon/llcursortypes.h
@@ -68,6 +68,9 @@ enum ECursorType {
UI_CURSOR_TOOLPAUSE,
UI_CURSOR_TOOLMEDIAOPEN,
UI_CURSOR_PIPETTE,
+ UI_CURSOR_TOOLSIT,
+ UI_CURSOR_TOOLBUY,
+ UI_CURSOR_TOOLOPEN,
UI_CURSOR_COUNT // Number of elements in this enum (NOT a cursor)
};
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index d48f4ad0f5e3c99b1485442caeecce0156edf8f7..cb62e462713e7f4285ef25a1c76a0934362705f5 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -65,15 +65,19 @@ LLPluginClassMedia::~LLPluginClassMedia()
reset();
}
-bool LLPluginClassMedia::init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug, const std::string &user_data_path, const std::string &language_code)
+bool LLPluginClassMedia::init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug)
{
LL_DEBUGS("Plugin") << "launcher: " << launcher_filename << LL_ENDL;
LL_DEBUGS("Plugin") << "plugin: " << plugin_filename << LL_ENDL;
- LL_DEBUGS("Plugin") << "user_data_path: " << user_data_path << LL_ENDL;
mPlugin = new LLPluginProcessParent(this);
mPlugin->setSleepTime(mSleepTime);
- mPlugin->init(launcher_filename, plugin_filename, debug, user_data_path,language_code);
+
+ // Queue up the media init message -- it will be sent after all the currently queued messages.
+ LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "init");
+ sendMessage(message);
+
+ mPlugin->init(launcher_filename, plugin_filename, debug);
return true;
}
@@ -678,6 +682,20 @@ void LLPluginClassMedia::paste()
sendMessage(message);
}
+void LLPluginClassMedia::setUserDataPath(const std::string &user_data_path)
+{
+ LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "set_user_data_path");
+ message.setValue("path", user_data_path);
+ sendMessage(message);
+}
+
+void LLPluginClassMedia::setLanguageCode(const std::string &language_code)
+{
+ LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "set_language_code");
+ message.setValue("language", language_code);
+ sendMessage(message);
+}
+
LLPluginClassMedia::ETargetType getTargetTypeFromLLQtWebkit(int target_type)
{
// convert a LinkTargetType value from llqtwebkit to an ETargetType
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
index ce49241e84f7dc91a9393a3cb68440560cb7e8cd..6318c67f12673bc84b87a5906c846833cc5cd373 100644
--- a/indra/llplugin/llpluginclassmedia.h
+++ b/indra/llplugin/llpluginclassmedia.h
@@ -51,9 +51,7 @@ class LLPluginClassMedia : public LLPluginProcessParentOwner
// local initialization, called by the media manager when creating a source
virtual bool init(const std::string &launcher_filename,
const std::string &plugin_filename,
- bool debug,
- const std::string &user_data_path,
- const std::string &language_code);
+ bool debug);
// undoes everything init() didm called by the media manager when destroying a source
virtual void reset();
@@ -177,6 +175,10 @@ class LLPluginClassMedia : public LLPluginProcessParentOwner
void paste();
bool canPaste() const { return mCanPaste; };
+
+ // These can be called before init(), and they will be queued and sent before the media init message.
+ void setUserDataPath(const std::string &user_data_path);
+ void setLanguageCode(const std::string &language_code);
///////////////////////////////////
// media browser class functions
diff --git a/indra/llplugin/llpluginprocesschild.cpp b/indra/llplugin/llpluginprocesschild.cpp
index 9b43ec0e3eedee89e4a8caacbdc87fc2d48fd380..ccaf95b36ded8c072865cb1a954041650126dce1 100644
--- a/indra/llplugin/llpluginprocesschild.cpp
+++ b/indra/llplugin/llpluginprocesschild.cpp
@@ -155,8 +155,6 @@ void LLPluginProcessChild::idle(void)
{
setState(STATE_PLUGIN_INITIALIZING);
LLPluginMessage message("base", "init");
- message.setValue("user_data_path", mUserDataPath);
- message.setValue("language_code", mLanguageCode);
sendMessageToPlugin(message);
}
break;
@@ -329,8 +327,6 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message)
if(message_name == "load_plugin")
{
mPluginFile = parsed.getValue("file");
- mUserDataPath = parsed.getValue("user_data_path");
- mLanguageCode = parsed.getValue("language_code");
}
else if(message_name == "shm_add")
{
diff --git a/indra/llplugin/llpluginprocesschild.h b/indra/llplugin/llpluginprocesschild.h
index af76ec1fa53a0c848d2f225bb605ac59705cf3e4..0e5e85406a671fa00f0b33ac1357e5ca17695e8a 100644
--- a/indra/llplugin/llpluginprocesschild.h
+++ b/indra/llplugin/llpluginprocesschild.h
@@ -98,9 +98,6 @@ class LLPluginProcessChild: public LLPluginMessagePipeOwner, public LLPluginInst
std::string mPluginFile;
- std::string mUserDataPath;
- std::string mLanguageCode;
-
LLPluginInstance *mInstance;
typedef std::map<std::string, LLPluginSharedMemory*> sharedMemoryRegionsType;
diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp
index 0ce2c759bace238aa0d9dbab26d64447e0faae67..895c858979026645dfc5632e6707ae2cc7fd773e 100644
--- a/indra/llplugin/llpluginprocessparent.cpp
+++ b/indra/llplugin/llpluginprocessparent.cpp
@@ -98,15 +98,12 @@ void LLPluginProcessParent::errorState(void)
setState(STATE_ERROR);
}
-void LLPluginProcessParent::init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug, const std::string &user_data_path, const std::string &language_code)
+void LLPluginProcessParent::init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug)
{
mProcess.setExecutable(launcher_filename);
mPluginFile = plugin_filename;
mCPUUsage = 0.0f;
- mDebug = debug;
- mUserDataPath = user_data_path;
- mLanguageCode = language_code;
-
+ mDebug = debug;
setState(STATE_INITIALIZED);
}
@@ -363,8 +360,6 @@ void LLPluginProcessParent::idle(void)
{
LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_INTERNAL, "load_plugin");
message.setValue("file", mPluginFile);
- message.setValue("user_data_path", mUserDataPath);
- message.setValue("language_code", mLanguageCode);
sendMessage(message);
}
diff --git a/indra/llplugin/llpluginprocessparent.h b/indra/llplugin/llpluginprocessparent.h
index 23702814c8b9168e1a6804185b3d386d250c76ae..cc6c513615747283dfd71c9e504841168697ffb3 100644
--- a/indra/llplugin/llpluginprocessparent.h
+++ b/indra/llplugin/llpluginprocessparent.h
@@ -61,9 +61,7 @@ class LLPluginProcessParent : public LLPluginMessagePipeOwner
void init(const std::string &launcher_filename,
const std::string &plugin_filename,
- bool debug,
- const std::string &user_data_path,
- const std::string &language_code);
+ bool debug);
void idle(void);
@@ -148,9 +146,6 @@ class LLPluginProcessParent : public LLPluginMessagePipeOwner
std::string mPluginFile;
- std::string mUserDataPath;
- std::string mLanguageCode;
-
LLPluginProcessParentOwner *mOwner;
typedef std::map<std::string, LLPluginSharedMemory*> sharedMemoryRegionsType;
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 35428e422723f8c61bc9c7e43bd63d9e9d1d4b5c..e8e345967309ac3f6ecceba36391a0899f70c846 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -310,7 +310,6 @@ LLUrlEntryAgent::LLUrlEntryAgent()
boost::regex::perl|boost::regex::icase);
mMenuName = "menu_url_agent.xml";
mIcon = "Generic_Person";
- mTooltip = LLTrans::getString("TooltipAgentUrl");
mColor = LLUIColorTable::instance().getColor("AgentLinkColor");
}
@@ -323,6 +322,38 @@ void LLUrlEntryAgent::onAgentNameReceived(const LLUUID& id,
callObservers(id.asString(), first + " " + last);
}
+std::string LLUrlEntryAgent::getTooltip(const std::string &string) const
+{
+ // return a tooltip corresponding to the URL type instead of the generic one
+ std::string url = getUrl(string);
+
+ if (LLStringUtil::endsWith(url, "/mute"))
+ {
+ return LLTrans::getString("TooltipAgentMute");
+ }
+ if (LLStringUtil::endsWith(url, "/unmute"))
+ {
+ return LLTrans::getString("TooltipAgentUnmute");
+ }
+ if (LLStringUtil::endsWith(url, "/im"))
+ {
+ return LLTrans::getString("TooltipAgentIM");
+ }
+ if (LLStringUtil::endsWith(url, "/pay"))
+ {
+ return LLTrans::getString("TooltipAgentPay");
+ }
+ if (LLStringUtil::endsWith(url, "/offerteleport"))
+ {
+ return LLTrans::getString("TooltipAgentOfferTeleport");
+ }
+ if (LLStringUtil::endsWith(url, "/requestfriend"))
+ {
+ return LLTrans::getString("TooltipAgentRequestFriend");
+ }
+ return LLTrans::getString("TooltipAgentUrl");
+}
+
std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCallback &cb)
{
if (!gCacheName)
@@ -346,6 +377,31 @@ std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCa
}
else if (gCacheName->getFullName(agent_id, full_name))
{
+ // customize label string based on agent SLapp suffix
+ if (LLStringUtil::endsWith(url, "/mute"))
+ {
+ return LLTrans::getString("SLappAgentMute") + " " + full_name;
+ }
+ if (LLStringUtil::endsWith(url, "/unmute"))
+ {
+ return LLTrans::getString("SLappAgentUnmute") + " " + full_name;
+ }
+ if (LLStringUtil::endsWith(url, "/im"))
+ {
+ return LLTrans::getString("SLappAgentIM") + " " + full_name;
+ }
+ if (LLStringUtil::endsWith(url, "/pay"))
+ {
+ return LLTrans::getString("SLappAgentPay") + " " + full_name;
+ }
+ if (LLStringUtil::endsWith(url, "/offerteleport"))
+ {
+ return LLTrans::getString("SLappAgentOfferTeleport") + " " + full_name;
+ }
+ if (LLStringUtil::endsWith(url, "/requestfriend"))
+ {
+ return LLTrans::getString("SLappAgentRequestFriend") + " " + full_name;
+ }
return full_name;
}
else
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index c947ef7259cdcd1215230f79ad1206f930408426..84d09687798ef8bed89e66092844d710d1662ea9 100644
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -169,6 +169,7 @@ class LLUrlEntryAgent : public LLUrlEntryBase
public:
LLUrlEntryAgent();
/*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb);
+ /*virtual*/ std::string getTooltip(const std::string &string) const;
private:
void onAgentNameReceived(const LLUUID& id, const std::string& first,
const std::string& last, BOOL is_group);
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index d34083a3844f514dc2de6104326349cc5ea3d32f..57beb71a01329decf3bf54b588a3f23565114baf 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -152,7 +152,7 @@ LLView::~LLView()
//llinfos << "Deleting view " << mName << ":" << (void*) this << llendl;
if (LLView::sIsDrawing)
{
- llwarns << "Deleting view " << mName << " during UI draw() phase" << llendl;
+ lldebugs << "Deleting view " << mName << " during UI draw() phase" << llendl;
}
// llassert(LLView::sIsDrawing == FALSE);
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 924acaf14829cfec84b86973bab60a43c3119d6e..224314a490f4e9f5b26ddf731289e1ab99abb7e4 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -2807,6 +2807,9 @@ const char* cursorIDToName(int id)
case UI_CURSOR_TOOLPAUSE: return "UI_CURSOR_TOOLPAUSE";
case UI_CURSOR_TOOLMEDIAOPEN: return "UI_CURSOR_TOOLMEDIAOPEN";
case UI_CURSOR_PIPETTE: return "UI_CURSOR_PIPETTE";
+ case UI_CURSOR_TOOLSIT: return "UI_CURSOR_TOOLSIT";
+ case UI_CURSOR_TOOLBUY: return "UI_CURSOR_TOOLBUY";
+ case UI_CURSOR_TOOLOPEN: return "UI_CURSOR_TOOLOPEN";
}
llerrs << "cursorIDToName: unknown cursor id" << id << llendl;
@@ -2909,6 +2912,9 @@ void LLWindowMacOSX::setCursor(ECursorType cursor)
case UI_CURSOR_TOOLPLAY:
case UI_CURSOR_TOOLPAUSE:
case UI_CURSOR_TOOLMEDIAOPEN:
+ case UI_CURSOR_TOOLSIT:
+ case UI_CURSOR_TOOLBUY:
+ case UI_CURSOR_TOOLOPEN:
result = setImageCursor(gCursors[cursor]);
break;
@@ -2950,6 +2956,9 @@ void LLWindowMacOSX::initCursors()
initPixmapCursor(UI_CURSOR_TOOLPLAY, 1, 1);
initPixmapCursor(UI_CURSOR_TOOLPAUSE, 1, 1);
initPixmapCursor(UI_CURSOR_TOOLMEDIAOPEN, 1, 1);
+ initPixmapCursor(UI_CURSOR_TOOLSIT, 20, 15);
+ initPixmapCursor(UI_CURSOR_TOOLBUY, 20, 15);
+ initPixmapCursor(UI_CURSOR_TOOLOPEN, 20, 15);
initPixmapCursor(UI_CURSOR_SIZENWSE, 10, 10);
initPixmapCursor(UI_CURSOR_SIZENESW, 10, 10);
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 4be5d06c2b59bc67654a6516a409676d40d284d3..5f778d62083a6f00af39a1779dbe45d19ae34db3 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -46,6 +46,7 @@
#include "llerror.h"
#include "llgl.h"
#include "llstring.h"
+#include "lldir.h"
// System includes
#include <commdlg.h>
@@ -1545,6 +1546,11 @@ void LLWindowWin32::initCursors()
mCursor[ UI_CURSOR_PIPETTE ] = LoadCursor(module, TEXT("TOOLPIPETTE"));
// Color cursors
+ gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "res", "toolbuy.cur");
+
+ mCursor[UI_CURSOR_TOOLSIT] = LoadCursorFromFile(utf8str_to_utf16str(gDirUtilp->getWorkingDir() + gDirUtilp->getDirDelimiter() + "res" + gDirUtilp->getDirDelimiter() + "toolsit.cur").c_str());
+ mCursor[UI_CURSOR_TOOLBUY] = LoadCursorFromFile(utf8str_to_utf16str(gDirUtilp->getWorkingDir() + gDirUtilp->getDirDelimiter() + "res" + gDirUtilp->getDirDelimiter() + "toolbuy.cur").c_str());
+ mCursor[UI_CURSOR_TOOLOPEN] = LoadCursorFromFile(utf8str_to_utf16str(gDirUtilp->getWorkingDir() + gDirUtilp->getDirDelimiter() + "res" + gDirUtilp->getDirDelimiter() + "toolopen.cur").c_str());
mCursor[UI_CURSOR_TOOLPLAY] = loadColorCursor(TEXT("TOOLPLAY"));
mCursor[UI_CURSOR_TOOLPAUSE] = loadColorCursor(TEXT("TOOLPAUSE"));
mCursor[UI_CURSOR_TOOLMEDIAOPEN] = loadColorCursor(TEXT("TOOLMEDIAOPEN"));
diff --git a/indra/media_plugins/example/media_plugin_example.cpp b/indra/media_plugins/example/media_plugin_example.cpp
index f5b077fea037410a80d4643fb11328c8231aacad..49bbca6c521ed3d6c76a0439dea77128e46e86d8 100644
--- a/indra/media_plugins/example/media_plugin_example.cpp
+++ b/indra/media_plugins/example/media_plugin_example.cpp
@@ -119,17 +119,6 @@ void MediaPluginExample::receiveMessage( const char* message_string )
std::string plugin_version = "Example media plugin, Example Version 1.0.0.0";
message.setValue( "plugin_version", plugin_version );
sendMessage( message );
-
- // Plugin gets to decide the texture parameters to use.
- message.setMessage( LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params" );
- message.setValueS32( "default_width", mWidth );
- message.setValueS32( "default_height", mHeight );
- message.setValueS32( "depth", mDepth );
- message.setValueU32( "internalformat", GL_RGBA );
- message.setValueU32( "format", GL_RGBA );
- message.setValueU32( "type", GL_UNSIGNED_BYTE );
- message.setValueBoolean( "coords_opengl", false );
- sendMessage( message );
}
else
if ( message_name == "idle" )
@@ -191,7 +180,20 @@ void MediaPluginExample::receiveMessage( const char* message_string )
else
if ( message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA )
{
- if ( message_name == "size_change" )
+ if ( message_name == "init" )
+ {
+ // Plugin gets to decide the texture parameters to use.
+ LLPluginMessage message( LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params" );
+ message.setValueS32( "default_width", mWidth );
+ message.setValueS32( "default_height", mHeight );
+ message.setValueS32( "depth", mDepth );
+ message.setValueU32( "internalformat", GL_RGBA );
+ message.setValueU32( "format", GL_RGBA );
+ message.setValueU32( "type", GL_UNSIGNED_BYTE );
+ message.setValueBoolean( "coords_opengl", false );
+ sendMessage( message );
+ }
+ else if ( message_name == "size_change" )
{
std::string name = message_in.getValue( "name" );
S32 width = message_in.getValueS32( "width" );
diff --git a/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp b/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
index 26173314a7f8ea52d2802291ea0a0fcb1873b549..a69da3ff5aa83c5bde0c67d973872d72ec20af0e 100644
--- a/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
+++ b/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
@@ -946,33 +946,6 @@ void MediaPluginGStreamer010::receiveMessage(const char *message_string)
message.setValue("plugin_version", getVersion());
sendMessage(message);
-
- // Plugin gets to decide the texture parameters to use.
- message.setMessage(LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params");
- // lame to have to decide this now, it depends on the movie. Oh well.
- mDepth = 4;
-
- mCurrentWidth = 1;
- mCurrentHeight = 1;
- mPreviousWidth = 1;
- mPreviousHeight = 1;
- mNaturalWidth = 1;
- mNaturalHeight = 1;
- mWidth = 1;
- mHeight = 1;
- mTextureWidth = 1;
- mTextureHeight = 1;
-
- message.setValueU32("format", GL_RGBA);
- message.setValueU32("type", GL_UNSIGNED_INT_8_8_8_8_REV);
-
- message.setValueS32("depth", mDepth);
- message.setValueS32("default_width", mWidth);
- message.setValueS32("default_height", mHeight);
- message.setValueU32("internalformat", GL_RGBA8);
- message.setValueBoolean("coords_opengl", true); // true == use OpenGL-style coordinates, false == (0,0) is upper left.
- message.setValueBoolean("allow_downsample", true); // we respond with grace and performance if asked to downscale
- sendMessage(message);
}
else if(message_name == "idle")
{
@@ -1037,7 +1010,36 @@ void MediaPluginGStreamer010::receiveMessage(const char *message_string)
}
else if(message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA)
{
- if(message_name == "size_change")
+ if(message_name == "init")
+ {
+ // Plugin gets to decide the texture parameters to use.
+ LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params");
+ // lame to have to decide this now, it depends on the movie. Oh well.
+ mDepth = 4;
+
+ mCurrentWidth = 1;
+ mCurrentHeight = 1;
+ mPreviousWidth = 1;
+ mPreviousHeight = 1;
+ mNaturalWidth = 1;
+ mNaturalHeight = 1;
+ mWidth = 1;
+ mHeight = 1;
+ mTextureWidth = 1;
+ mTextureHeight = 1;
+
+ message.setValueU32("format", GL_RGBA);
+ message.setValueU32("type", GL_UNSIGNED_INT_8_8_8_8_REV);
+
+ message.setValueS32("depth", mDepth);
+ message.setValueS32("default_width", mWidth);
+ message.setValueS32("default_height", mHeight);
+ message.setValueU32("internalformat", GL_RGBA8);
+ message.setValueBoolean("coords_opengl", true); // true == use OpenGL-style coordinates, false == (0,0) is upper left.
+ message.setValueBoolean("allow_downsample", true); // we respond with grace and performance if asked to downscale
+ sendMessage(message);
+ }
+ else if(message_name == "size_change")
{
std::string name = message_in.getValue("name");
S32 width = message_in.getValueS32("width");
diff --git a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
index e230fcc280e2cbd6e4bc335ca671cc0caab69395..1f88301ca7fb3f666f261474a3e9e8a46e204ce7 100644
--- a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
+++ b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
@@ -859,36 +859,6 @@ void MediaPluginQuickTime::receiveMessage(const char *message_string)
plugin_version += codec.str();
message.setValue("plugin_version", plugin_version);
sendMessage(message);
-
- // Plugin gets to decide the texture parameters to use.
- message.setMessage(LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params");
- #if defined(LL_WINDOWS)
- // Values for Windows
- mDepth = 3;
- message.setValueU32("format", GL_RGB);
- message.setValueU32("type", GL_UNSIGNED_BYTE);
-
- // We really want to pad the texture width to a multiple of 32 bytes, but since we're using 3-byte pixels, it doesn't come out even.
- // Padding to a multiple of 3*32 guarantees it'll divide out properly.
- message.setValueU32("padding", 32 * 3);
- #else
- // Values for Mac
- mDepth = 4;
- message.setValueU32("format", GL_BGRA_EXT);
- #ifdef __BIG_ENDIAN__
- message.setValueU32("type", GL_UNSIGNED_INT_8_8_8_8_REV );
- #else
- message.setValueU32("type", GL_UNSIGNED_INT_8_8_8_8);
- #endif
-
- // Pad texture width to a multiple of 32 bytes, to line up with cache lines.
- message.setValueU32("padding", 32);
- #endif
- message.setValueS32("depth", mDepth);
- message.setValueU32("internalformat", GL_RGB);
- message.setValueBoolean("coords_opengl", true); // true == use OpenGL-style coordinates, false == (0,0) is upper left.
- message.setValueBoolean("allow_downsample", true);
- sendMessage(message);
}
else if(message_name == "idle")
{
@@ -953,7 +923,41 @@ void MediaPluginQuickTime::receiveMessage(const char *message_string)
}
else if(message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA)
{
- if(message_name == "size_change")
+ if(message_name == "init")
+ {
+ // This is the media init message -- all necessary data for initialization should have been received.
+
+ // Plugin gets to decide the texture parameters to use.
+ LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params");
+ #if defined(LL_WINDOWS)
+ // Values for Windows
+ mDepth = 3;
+ message.setValueU32("format", GL_RGB);
+ message.setValueU32("type", GL_UNSIGNED_BYTE);
+
+ // We really want to pad the texture width to a multiple of 32 bytes, but since we're using 3-byte pixels, it doesn't come out even.
+ // Padding to a multiple of 3*32 guarantees it'll divide out properly.
+ message.setValueU32("padding", 32 * 3);
+ #else
+ // Values for Mac
+ mDepth = 4;
+ message.setValueU32("format", GL_BGRA_EXT);
+ #ifdef __BIG_ENDIAN__
+ message.setValueU32("type", GL_UNSIGNED_INT_8_8_8_8_REV );
+ #else
+ message.setValueU32("type", GL_UNSIGNED_INT_8_8_8_8);
+ #endif
+
+ // Pad texture width to a multiple of 32 bytes, to line up with cache lines.
+ message.setValueU32("padding", 32);
+ #endif
+ message.setValueS32("depth", mDepth);
+ message.setValueU32("internalformat", GL_RGB);
+ message.setValueBoolean("coords_opengl", true); // true == use OpenGL-style coordinates, false == (0,0) is upper left.
+ message.setValueBoolean("allow_downsample", true);
+ sendMessage(message);
+ }
+ else if(message_name == "size_change")
{
std::string name = message_in.getValue("name");
S32 width = message_in.getValueS32("width");
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index afde904be652804a3446f7ee60afc6f0631efb61..24c53638d2bd07744e0beb1b5e12b3e3b33d4d35 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -88,10 +88,12 @@ class MediaPluginWebKit :
private:
std::string mProfileDir;
+ std::string mHostLanguage;
enum
{
- INIT_STATE_UNINITIALIZED, // Browser instance hasn't been set up yet
+ INIT_STATE_UNINITIALIZED, // LLQtWebkit hasn't been set up yet
+ INIT_STATE_INITIALIZED, // LLQtWebkit has been set up, but no browser window has been created yet.
INIT_STATE_NAVIGATING, // Browser instance has been set up and initial navigate to about:blank has been issued
INIT_STATE_NAVIGATE_COMPLETE, // initial navigate to about:blank has completed
INIT_STATE_WAIT_REDRAW, // First real navigate begin has been received, waiting for page changed event to start handling redraws
@@ -191,13 +193,6 @@ class MediaPluginWebKit :
if ( mInitState > INIT_STATE_UNINITIALIZED )
return true;
- // not enough information to initialize the browser yet.
- if ( mWidth < 0 || mHeight < 0 || mDepth < 0 ||
- mTextureWidth < 0 || mTextureHeight < 0 )
- {
- return false;
- };
-
// set up directories
char cwd[ FILENAME_MAX ]; // I *think* this is defined on all platforms we use
if (NULL == getcwd( cwd, FILENAME_MAX - 1 ))
@@ -208,12 +203,12 @@ class MediaPluginWebKit :
std::string application_dir = std::string( cwd );
#if LL_DARWIN
- // When running under the Xcode debugger, there's a setting called "Break on Debugger()/DebugStr()" which defaults to being turned on.
- // This causes the environment variable USERBREAK to be set to 1, which causes these legacy calls to break into the debugger.
- // This wouldn't cause any problems except for the fact that the current release version of the Flash plugin has a call to Debugger() in it
- // which gets hit when the plugin is probed by webkit.
- // Unsetting the environment variable here works around this issue.
- unsetenv("USERBREAK");
+ // When running under the Xcode debugger, there's a setting called "Break on Debugger()/DebugStr()" which defaults to being turned on.
+ // This causes the environment variable USERBREAK to be set to 1, which causes these legacy calls to break into the debugger.
+ // This wouldn't cause any problems except for the fact that the current release version of the Flash plugin has a call to Debugger() in it
+ // which gets hit when the plugin is probed by webkit.
+ // Unsetting the environment variable here works around this issue.
+ unsetenv("USERBREAK");
#endif
#if LL_WINDOWS
@@ -254,66 +249,92 @@ class MediaPluginWebKit :
bool result = LLQtWebKit::getInstance()->init( application_dir, component_dir, mProfileDir, native_window_handle );
if ( result )
{
- // create single browser window
- mBrowserWindowId = LLQtWebKit::getInstance()->createBrowserWindow( mWidth, mHeight );
+ mInitState = INIT_STATE_INITIALIZED;
+
+ return true;
+ };
+
+ return false;
+ };
+
+ ////////////////////////////////////////////////////////////////////////////////
+ //
+ bool initBrowserWindow()
+ {
+ // already initialized
+ if ( mInitState > INIT_STATE_INITIALIZED )
+ return true;
+
+ // not enough information to initialize the browser yet.
+ if ( mWidth < 0 || mHeight < 0 || mDepth < 0 ||
+ mTextureWidth < 0 || mTextureHeight < 0 )
+ {
+ return false;
+ };
+
+ // Set up host language before creating browser window
+ if(!mHostLanguage.empty())
+ {
+ LLQtWebKit::getInstance()->setHostLanguage(mHostLanguage);
+ }
+
+ // create single browser window
+ mBrowserWindowId = LLQtWebKit::getInstance()->createBrowserWindow( mWidth, mHeight );
#if LL_WINDOWS
- // Enable plugins
- LLQtWebKit::getInstance()->enablePlugins(true);
+ // Enable plugins
+ LLQtWebKit::getInstance()->enablePlugins(true);
#elif LL_DARWIN
- // Enable plugins
- LLQtWebKit::getInstance()->enablePlugins(true);
+ // Enable plugins
+ LLQtWebKit::getInstance()->enablePlugins(true);
#elif LL_LINUX
- // Enable plugins
- LLQtWebKit::getInstance()->enablePlugins(true);
+ // Enable plugins
+ LLQtWebKit::getInstance()->enablePlugins(true);
#endif
- // Enable cookies
- LLQtWebKit::getInstance()->enableCookies( true );
+ // Enable cookies
+ LLQtWebKit::getInstance()->enableCookies( true );
- // tell LLQtWebKit about the size of the browser window
- LLQtWebKit::getInstance()->setSize( mBrowserWindowId, mWidth, mHeight );
+ // tell LLQtWebKit about the size of the browser window
+ LLQtWebKit::getInstance()->setSize( mBrowserWindowId, mWidth, mHeight );
- // observer events that LLQtWebKit emits
- LLQtWebKit::getInstance()->addObserver( mBrowserWindowId, this );
+ // observer events that LLQtWebKit emits
+ LLQtWebKit::getInstance()->addObserver( mBrowserWindowId, this );
- // append details to agent string
- LLQtWebKit::getInstance()->setBrowserAgentId( "LLPluginMedia Web Browser" );
+ // append details to agent string
+ LLQtWebKit::getInstance()->setBrowserAgentId( "LLPluginMedia Web Browser" );
#if !LL_QTWEBKIT_USES_PIXMAPS
- // don't flip bitmap
- LLQtWebKit::getInstance()->flipWindow( mBrowserWindowId, true );
+ // don't flip bitmap
+ LLQtWebKit::getInstance()->flipWindow( mBrowserWindowId, true );
#endif // !LL_QTWEBKIT_USES_PIXMAPS
-
- // set background color
- // convert background color channels from [0.0, 1.0] to [0, 255];
- LLQtWebKit::getInstance()->setBackgroundColor( mBrowserWindowId, int(mBackgroundR * 255.0f), int(mBackgroundG * 255.0f), int(mBackgroundB * 255.0f) );
-
- // Set state _before_ starting the navigate, since onNavigateBegin might get called before this call returns.
- setInitState(INIT_STATE_NAVIGATING);
-
- // Don't do this here -- it causes the dreaded "white flash" when loading a browser instance.
- // FIXME: Re-added this because navigating to a "page" initializes things correctly - especially
- // for the HTTP AUTH dialog issues (DEV-41731). Will fix at a later date.
- // Build a data URL like this: "data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#RRGGBB%22%3E%3C/body%3E%3C/html%3E"
- // where RRGGBB is the background color in HTML style
- std::stringstream url;
-
- url << "data:text/html,%3Chtml%3E%3Cbody%20bgcolor=%22#";
- // convert background color channels from [0.0, 1.0] to [0, 255];
- url << std::setfill('0') << std::setw(2) << std::hex << int(mBackgroundR * 255.0f);
- url << std::setfill('0') << std::setw(2) << std::hex << int(mBackgroundG * 255.0f);
- url << std::setfill('0') << std::setw(2) << std::hex << int(mBackgroundB * 255.0f);
- url << "%22%3E%3C/body%3E%3C/html%3E";
-
- lldebugs << "data url is: " << url.str() << llendl;
-
- LLQtWebKit::getInstance()->navigateTo( mBrowserWindowId, url.str() );
-// LLQtWebKit::getInstance()->navigateTo( mBrowserWindowId, "about:blank" );
-
- return true;
- };
+
+ // set background color
+ // convert background color channels from [0.0, 1.0] to [0, 255];
+ LLQtWebKit::getInstance()->setBackgroundColor( mBrowserWindowId, int(mBackgroundR * 255.0f), int(mBackgroundG * 255.0f), int(mBackgroundB * 255.0f) );
+
+ // Set state _before_ starting the navigate, since onNavigateBegin might get called before this call returns.
+ setInitState(INIT_STATE_NAVIGATING);
+
+ // Don't do this here -- it causes the dreaded "white flash" when loading a browser instance.
+ // FIXME: Re-added this because navigating to a "page" initializes things correctly - especially
+ // for the HTTP AUTH dialog issues (DEV-41731). Will fix at a later date.
+ // Build a data URL like this: "data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#RRGGBB%22%3E%3C/body%3E%3C/html%3E"
+ // where RRGGBB is the background color in HTML style
+ std::stringstream url;
+
+ url << "data:text/html,%3Chtml%3E%3Cbody%20bgcolor=%22#";
+ // convert background color channels from [0.0, 1.0] to [0, 255];
+ url << std::setfill('0') << std::setw(2) << std::hex << int(mBackgroundR * 255.0f);
+ url << std::setfill('0') << std::setw(2) << std::hex << int(mBackgroundG * 255.0f);
+ url << std::setfill('0') << std::setw(2) << std::hex << int(mBackgroundB * 255.0f);
+ url << "%22%3E%3C/body%3E%3C/html%3E";
+
+ lldebugs << "data url is: " << url.str() << llendl;
+
+ LLQtWebKit::getInstance()->navigateTo( mBrowserWindowId, url.str() );
+// LLQtWebKit::getInstance()->navigateTo( mBrowserWindowId, "about:blank" );
- return false;
- };
+ return true;
+ }
void setVolume(F32 vol);
@@ -676,9 +697,6 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
{
if(message_name == "init")
{
- std::string user_data_path = message_in.getValue("user_data_path"); // n.b. always has trailing platform-specific dir-delimiter
- mProfileDir = user_data_path + "browser_profile";
-
LLPluginMessage message("base", "init_response");
LLSD versions = LLSD::emptyMap();
versions[LLPLUGIN_MESSAGE_CLASS_BASE] = LLPLUGIN_MESSAGE_CLASS_BASE_VERSION;
@@ -690,23 +708,6 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
plugin_version += LLQtWebKit::getInstance()->getVersion();
message.setValue("plugin_version", plugin_version);
sendMessage(message);
-
- // Plugin gets to decide the texture parameters to use.
- mDepth = 4;
-
- message.setMessage(LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params");
- message.setValueS32("default_width", 1024);
- message.setValueS32("default_height", 1024);
- message.setValueS32("depth", mDepth);
- message.setValueU32("internalformat", GL_RGBA);
-#if LL_QTWEBKIT_USES_PIXMAPS
- message.setValueU32("format", GL_BGRA_EXT); // I hope this isn't system-dependant... is it? If so, we'll have to check the root window's pixel layout or something... yuck.
-#else
- message.setValueU32("format", GL_RGBA);
-#endif // LL_QTWEBKIT_USES_PIXMAPS
- message.setValueU32("type", GL_UNSIGNED_BYTE);
- message.setValueBoolean("coords_opengl", true);
- sendMessage(message);
}
else if(message_name == "idle")
{
@@ -771,7 +772,7 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
// std::cerr << "MediaPluginWebKit::receiveMessage: unknown base message: " << message_name << std::endl;
}
}
- else if(message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA_TIME)
+ else if(message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA_TIME)
{
if(message_name == "set_volume")
{
@@ -781,7 +782,50 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
}
else if(message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA)
{
- if(message_name == "size_change")
+ if(message_name == "init")
+ {
+ // This is the media init message -- all necessary data for initialization should have been received.
+ if(initBrowser())
+ {
+
+ // Plugin gets to decide the texture parameters to use.
+ mDepth = 4;
+
+ LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params");
+ message.setValueS32("default_width", 1024);
+ message.setValueS32("default_height", 1024);
+ message.setValueS32("depth", mDepth);
+ message.setValueU32("internalformat", GL_RGBA);
+ #if LL_QTWEBKIT_USES_PIXMAPS
+ message.setValueU32("format", GL_BGRA_EXT); // I hope this isn't system-dependant... is it? If so, we'll have to check the root window's pixel layout or something... yuck.
+ #else
+ message.setValueU32("format", GL_RGBA);
+ #endif // LL_QTWEBKIT_USES_PIXMAPS
+ message.setValueU32("type", GL_UNSIGNED_BYTE);
+ message.setValueBoolean("coords_opengl", true);
+ sendMessage(message);
+ }
+ else
+ {
+ // if initialization failed, we're done.
+ mDeleteMe = true;
+ }
+
+ }
+ else if(message_name == "set_user_data_path")
+ {
+ std::string user_data_path = message_in.getValue("path"); // n.b. always has trailing platform-specific dir-delimiter
+ mProfileDir = user_data_path + "browser_profile";
+
+ // FIXME: Should we do anything with this if it comes in after the browser has been initialized?
+ }
+ else if(message_name == "set_language_code")
+ {
+ mHostLanguage = message_in.getValue("language");
+
+ // FIXME: Should we do anything with this if it comes in after the browser has been initialized?
+ }
+ else if(message_name == "size_change")
{
std::string name = message_in.getValue("name");
S32 width = message_in.getValueS32("width");
@@ -803,29 +847,36 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
mWidth = width;
mHeight = height;
- // initialize (only gets called once)
- initBrowser();
-
- // size changed so tell the browser
- LLQtWebKit::getInstance()->setSize( mBrowserWindowId, mWidth, mHeight );
-
-// std::cerr << "webkit plugin: set size to " << mWidth << " x " << mHeight
-// << ", rowspan is " << LLQtWebKit::getInstance()->getBrowserRowSpan(mBrowserWindowId) << std::endl;
-
- S32 real_width = LLQtWebKit::getInstance()->getBrowserRowSpan(mBrowserWindowId) / LLQtWebKit::getInstance()->getBrowserDepth(mBrowserWindowId);
-
- // The actual width the browser will be drawing to is probably smaller... let the host know by modifying texture_width in the response.
- if(real_width <= texture_width)
+ if(initBrowserWindow())
{
- texture_width = real_width;
+
+ // size changed so tell the browser
+ LLQtWebKit::getInstance()->setSize( mBrowserWindowId, mWidth, mHeight );
+
+ // std::cerr << "webkit plugin: set size to " << mWidth << " x " << mHeight
+ // << ", rowspan is " << LLQtWebKit::getInstance()->getBrowserRowSpan(mBrowserWindowId) << std::endl;
+
+ S32 real_width = LLQtWebKit::getInstance()->getBrowserRowSpan(mBrowserWindowId) / LLQtWebKit::getInstance()->getBrowserDepth(mBrowserWindowId);
+
+ // The actual width the browser will be drawing to is probably smaller... let the host know by modifying texture_width in the response.
+ if(real_width <= texture_width)
+ {
+ texture_width = real_width;
+ }
+ else
+ {
+ // This won't work -- it'll be bigger than the allocated memory. This is a fatal error.
+ // std::cerr << "Fatal error: browser rowbytes greater than texture width" << std::endl;
+ mDeleteMe = true;
+ return;
+ }
}
else
{
- // This won't work -- it'll be bigger than the allocated memory. This is a fatal error.
-// std::cerr << "Fatal error: browser rowbytes greater than texture width" << std::endl;
+ // Setting up the browser window failed. This is a fatal error.
mDeleteMe = true;
- return;
}
+
mTextureWidth = texture_width;
mTextureHeight = texture_height;
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif
new file mode 100644
index 0000000000000000000000000000000000000000..f366026c33150b9ee191c02e133d804ef17ce1c2
Binary files /dev/null and b/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif differ
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif
new file mode 100644
index 0000000000000000000000000000000000000000..e9e6a20cd90f08ac85de08fba05677194f0f3b61
Binary files /dev/null and b/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif differ
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif
new file mode 100644
index 0000000000000000000000000000000000000000..bea3d9d4420de6a61a4f482239ca0f628337c26b
Binary files /dev/null and b/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif differ
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index bdfe0d91425b9ec5d1e50655f7a7ba163f680efe..2384e6c5ba802f2f9b34cc7b2f6eada3625924e8 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -305,7 +305,9 @@ static std::string gLaunchFileOnQuit;
// Used on Win32 for other apps to identify our window (eg, win_setup)
const char* const VIEWER_WINDOW_CLASSNAME = "Second Life";
static const S32 FIRST_RUN_WINDOW_WIDTH = 1024;
-static const S32 FIRST_RUN_WINDOW_HIGHT = 768;
+
+//should account for Windows task bar
+static const S32 FIRST_RUN_WINDOW_HIGHT = 738;
//----------------------------------------------------------------------------
// List of entries from strings.xml to always replace
@@ -2199,10 +2201,12 @@ bool LLAppViewer::initConfiguration()
// Display splash screen. Must be after above check for previous
// crash as this dialog is always frontmost.
- std::ostringstream splash_msg;
- splash_msg << "Loading " << LLTrans::getString("SECOND_LIFE") << "...";
+ std::string splash_msg;
+ LLStringUtil::format_map_t args;
+ args["[APP_NAME]"] = LLTrans::getString("SECOND_LIFE");
+ splash_msg = LLTrans::getString("StartupLoading", args);
LLSplashScreen::show();
- LLSplashScreen::update(splash_msg.str());
+ LLSplashScreen::update(splash_msg);
//LLVolumeMgr::initClass();
LLVolumeMgr* volume_manager = new LLVolumeMgr();
@@ -2384,7 +2388,7 @@ bool LLAppViewer::initWindow()
window_width = FIRST_RUN_WINDOW_WIDTH;//yep hardcoded
window_height = FIRST_RUN_WINDOW_HIGHT;
- //if screen resolution is lower then 1024*768 then show maximized
+ //if screen resolution is lower then first run width/height then show maximized
LLDisplayInfo display_info;
if(display_info.getDisplayWidth() <= FIRST_RUN_WINDOW_WIDTH
|| display_info.getDisplayHeight()<=FIRST_RUN_WINDOW_HIGHT)
@@ -3066,11 +3070,11 @@ bool LLAppViewer::initCache()
if (mPurgeCache)
{
- LLSplashScreen::update("Clearing cache...");
+ LLSplashScreen::update(LLTrans::getString("StartupClearingCache"));
purgeCache();
}
- LLSplashScreen::update("Initializing Texture Cache...");
+ LLSplashScreen::update(LLTrans::getString("StartupInitializingTextureCache"));
// Init the texture cache
// Allocate 80% of the cache size for textures
@@ -3083,7 +3087,7 @@ bool LLAppViewer::initCache()
S64 extra = LLAppViewer::getTextureCache()->initCache(LL_PATH_CACHE, texture_cache_size, read_only);
texture_cache_size -= extra;
- LLSplashScreen::update("Initializing VFS...");
+ LLSplashScreen::update(LLTrans::getString("StartupInitializingVFS"));
// Init the VFS
S64 vfs_size = cache_size - texture_cache_size;
@@ -3852,7 +3856,7 @@ void LLAppViewer::idleShutdown()
S32 finished_uploads = total_uploads - pending_uploads;
F32 percent = 100.f * finished_uploads / total_uploads;
gViewerWindow->setProgressPercent(percent);
- gViewerWindow->setProgressString("Saving your settings...");
+ gViewerWindow->setProgressString(LLTrans::getString("SavingSettings"));
return;
}
@@ -3864,7 +3868,7 @@ void LLAppViewer::idleShutdown()
// Wait for a LogoutReply message
gViewerWindow->setShowProgress(TRUE);
gViewerWindow->setProgressPercent(100.f);
- gViewerWindow->setProgressString("Logging out...");
+ gViewerWindow->setProgressString(LLTrans::getString("LoggingOut"));
return;
}
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 12cff327803560a8ab6c62eab23c6f62aad04994..63d9ed19ad65b801e9b8d761def14f608bc32886 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -480,10 +480,12 @@ bool LLAppViewerWin32::initHardwareTest()
gSavedSettings.setBOOL("ProbeHardwareOnStartup", FALSE);
// Disable so debugger can work
- std::ostringstream splash_msg;
- splash_msg << LLTrans::getString("StartupLoading") << " " << LLAppViewer::instance()->getSecondLifeTitle() << "...";
+ std::string splash_msg;
+ LLStringUtil::format_map_t args;
+ args["[APP_NAME]"] = LLAppViewer::instance()->getSecondLifeTitle();
+ splash_msg = LLTrans::getString("StartupLoading", args);
- LLSplashScreen::update(splash_msg.str());
+ LLSplashScreen::update(splash_msg);
}
if (!restoreErrorTrap())
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index a2322e28b4f4e752792216fdfaf8f7ab47a20d3b..80cf8f1d61f15bf8fb04228ee84f434e371b1f13 100644
--- a/indra/newview/llassetuploadresponders.cpp
+++ b/indra/newview/llassetuploadresponders.cpp
@@ -55,6 +55,7 @@
#include "llviewermenufile.h"
#include "llviewerwindow.h"
#include "lltexlayer.h"
+#include "lltrans.h"
// library includes
#include "lldir.h"
@@ -181,7 +182,7 @@ void LLAssetUploadResponder::uploadFailure(const LLSD& content)
// deal with L$ errors
if (reason == "insufficient funds")
{
- LLFloaterBuyCurrency::buyCurrency("Uploading costs", LLGlobalEconomy::Singleton::getInstance()->getPriceUpload());
+ LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("uploading_costs"), LLGlobalEconomy::Singleton::getInstance()->getPriceUpload());
}
else
{
diff --git a/indra/newview/llfloaterscriptlimits.cpp b/indra/newview/llfloaterscriptlimits.cpp
index 122bdc8bc739b35ce2157642955d7ee7b6551f23..daba3d8460605fc69c403075c1625d8ca3ca5451 100644
--- a/indra/newview/llfloaterscriptlimits.cpp
+++ b/indra/newview/llfloaterscriptlimits.cpp
@@ -110,7 +110,7 @@ BOOL LLFloaterScriptLimits::postBuild()
if(!mTab)
{
- llinfos << "Error! couldn't get scriptlimits_panels, aborting Script Information setup" << llendl;
+ llwarns << "Error! couldn't get scriptlimits_panels, aborting Script Information setup" << llendl;
return FALSE;
}
@@ -214,7 +214,7 @@ void fetchScriptLimitsRegionInfoResponder::result(const LLSD& content)
LLFloaterScriptLimits* instance = LLFloaterReg::getTypedInstance<LLFloaterScriptLimits>("script_limits");
if(!instance)
{
- llinfos << "Failed to get llfloaterscriptlimits instance" << llendl;
+ llwarns << "Failed to get llfloaterscriptlimits instance" << llendl;
}
}
@@ -227,7 +227,7 @@ void fetchScriptLimitsRegionInfoResponder::result(const LLSD& content)
void fetchScriptLimitsRegionInfoResponder::error(U32 status, const std::string& reason)
{
- llinfos << "Error from responder " << reason << llendl;
+ llwarns << "Error from responder " << reason << llendl;
}
void fetchScriptLimitsRegionSummaryResponder::result(const LLSD& content_ref)
@@ -281,26 +281,40 @@ void fetchScriptLimitsRegionSummaryResponder::result(const LLSD& content_ref)
OSMessageBox(nice_llsd.str(), "summary response:", 0);
- llinfos << "summary response:" << *content << llendl;
+ llwarns << "summary response:" << *content << llendl;
#endif
LLFloaterScriptLimits* instance = LLFloaterReg::getTypedInstance<LLFloaterScriptLimits>("script_limits");
if(!instance)
{
- llinfos << "Failed to get llfloaterscriptlimits instance" << llendl;
+ llwarns << "Failed to get llfloaterscriptlimits instance" << llendl;
}
else
{
LLTabContainer* tab = instance->getChild<LLTabContainer>("scriptlimits_panels");
- LLPanelScriptLimitsRegionMemory* panel_memory = (LLPanelScriptLimitsRegionMemory*)tab->getChild<LLPanel>("script_limits_region_memory_panel");
- panel_memory->setRegionSummary(content);
+ if(tab)
+ {
+ LLPanelScriptLimitsRegionMemory* panel_memory = (LLPanelScriptLimitsRegionMemory*)tab->getChild<LLPanel>("script_limits_region_memory_panel");
+ if(panel_memory)
+ {
+ panel_memory->childSetValue("loading_text", LLSD(std::string("")));
+
+ LLButton* btn = panel_memory->getChild<LLButton>("refresh_list_btn");
+ if(btn)
+ {
+ btn->setEnabled(true);
+ }
+
+ panel_memory->setRegionSummary(content);
+ }
+ }
}
}
void fetchScriptLimitsRegionSummaryResponder::error(U32 status, const std::string& reason)
{
- llinfos << "Error from responder " << reason << llendl;
+ llwarns << "Error from responder " << reason << llendl;
}
void fetchScriptLimitsRegionDetailsResponder::result(const LLSD& content_ref)
@@ -383,7 +397,7 @@ result (map)
if(!instance)
{
- llinfos << "Failed to get llfloaterscriptlimits instance" << llendl;
+ llwarns << "Failed to get llfloaterscriptlimits instance" << llendl;
}
else
{
@@ -397,19 +411,19 @@ result (map)
}
else
{
- llinfos << "Failed to get scriptlimits memory panel" << llendl;
+ llwarns << "Failed to get scriptlimits memory panel" << llendl;
}
}
else
{
- llinfos << "Failed to get scriptlimits_panels" << llendl;
+ llwarns << "Failed to get scriptlimits_panels" << llendl;
}
}
}
void fetchScriptLimitsRegionDetailsResponder::error(U32 status, const std::string& reason)
{
- llinfos << "Error from responder " << reason << llendl;
+ llwarns << "Error from responder " << reason << llendl;
}
void fetchScriptLimitsAttachmentInfoResponder::result(const LLSD& content_ref)
@@ -471,7 +485,7 @@ void fetchScriptLimitsAttachmentInfoResponder::result(const LLSD& content_ref)
if(!instance)
{
- llinfos << "Failed to get llfloaterscriptlimits instance" << llendl;
+ llwarns << "Failed to get llfloaterscriptlimits instance" << llendl;
}
else
{
@@ -481,29 +495,46 @@ void fetchScriptLimitsAttachmentInfoResponder::result(const LLSD& content_ref)
LLPanelScriptLimitsAttachment* panel = (LLPanelScriptLimitsAttachment*)tab->getChild<LLPanel>("script_limits_my_avatar_panel");
if(panel)
{
+ panel->childSetValue("loading_text", LLSD(std::string("")));
+
+ LLButton* btn = panel->getChild<LLButton>("refresh_list_btn");
+ if(btn)
+ {
+ btn->setEnabled(true);
+ }
+
panel->setAttachmentDetails(content);
}
else
{
- llinfos << "Failed to get script_limits_my_avatar_panel" << llendl;
+ llwarns << "Failed to get script_limits_my_avatar_panel" << llendl;
}
}
else
{
- llinfos << "Failed to get scriptlimits_panels" << llendl;
+ llwarns << "Failed to get scriptlimits_panels" << llendl;
}
}
}
void fetchScriptLimitsAttachmentInfoResponder::error(U32 status, const std::string& reason)
{
- llinfos << "Error from responder " << reason << llendl;
+ llwarns << "Error from responder " << reason << llendl;
}
///----------------------------------------------------------------------------
// Memory Panel
///----------------------------------------------------------------------------
+LLPanelScriptLimitsRegionMemory::~LLPanelScriptLimitsRegionMemory()
+{
+ if(!mParcelId.isNull())
+ {
+ LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mParcelId, this);
+ mParcelId.setNull();
+ }
+};
+
BOOL LLPanelScriptLimitsRegionMemory::getLandScriptResources()
{
LLSD body;
@@ -544,6 +575,11 @@ void LLPanelScriptLimitsRegionMemory::setParcelID(const LLUUID& parcel_id)
{
if (!parcel_id.isNull())
{
+ if(!mParcelId.isNull())
+ {
+ LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mParcelId, this);
+ mParcelId.setNull();
+ }
LLRemoteParcelInfoProcessor::getInstance()->addObserver(parcel_id, this);
LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(parcel_id);
}
@@ -597,7 +633,7 @@ void LLPanelScriptLimitsRegionMemory::setRegionDetails(LLSD content)
if(!list)
{
- llinfos << "Error getting the scripts_list control" << llendl;
+ llwarns << "Error getting the scripts_list control" << llendl;
return;
}
@@ -734,8 +770,6 @@ void LLPanelScriptLimitsRegionMemory::setRegionDetails(LLSD content)
// save the structure to make object return easier
mContent = content;
-
- childSetValue("loading_text", LLSD(std::string("")));
}
void LLPanelScriptLimitsRegionMemory::setRegionSummary(LLSD content)
@@ -754,7 +788,7 @@ void LLPanelScriptLimitsRegionMemory::setRegionSummary(LLSD content)
}
else
{
- llinfos << "summary doesn't contain memory info" << llendl;
+ llwarns << "summary doesn't contain memory info" << llendl;
return;
}
@@ -772,7 +806,7 @@ void LLPanelScriptLimitsRegionMemory::setRegionSummary(LLSD content)
}
else
{
- llinfos << "summary doesn't contain urls info" << llendl;
+ llwarns << "summary doesn't contain urls info" << llendl;
return;
}
@@ -919,8 +953,6 @@ void LLPanelScriptLimitsRegionMemory::clearList()
// static
void LLPanelScriptLimitsRegionMemory::onClickRefresh(void* userdata)
{
- llinfos << "LLPanelRegionGeneralInfo::onClickRefresh" << llendl;
-
LLFloaterScriptLimits* instance = LLFloaterReg::getTypedInstance<LLFloaterScriptLimits>("script_limits");
if(instance)
{
@@ -930,6 +962,13 @@ void LLPanelScriptLimitsRegionMemory::onClickRefresh(void* userdata)
LLPanelScriptLimitsRegionMemory* panel_memory = (LLPanelScriptLimitsRegionMemory*)tab->getChild<LLPanel>("script_limits_region_memory_panel");
if(panel_memory)
{
+ //To stop people from hammering the refesh button and accidentally dosing themselves - enough requests can crash the viewer!
+ //turn the button off, then turn it on when we get a response
+ LLButton* btn = panel_memory->getChild<LLButton>("refresh_list_btn");
+ if(btn)
+ {
+ btn->setEnabled(false);
+ }
panel_memory->clearList();
panel_memory->StartRequestChain();
@@ -969,7 +1008,6 @@ void LLPanelScriptLimitsRegionMemory::showBeacon()
// static
void LLPanelScriptLimitsRegionMemory::onClickHighlight(void* userdata)
{
- llinfos << "LLPanelRegionGeneralInfo::onClickHighlight" << llendl;
LLFloaterScriptLimits* instance = LLFloaterReg::getTypedInstance<LLFloaterScriptLimits>("script_limits");
if(instance)
{
@@ -1075,7 +1113,6 @@ void LLPanelScriptLimitsRegionMemory::returnObjects()
// static
void LLPanelScriptLimitsRegionMemory::onClickReturn(void* userdata)
{
- llinfos << "LLPanelRegionGeneralInfo::onClickReturn" << llendl;
LLFloaterScriptLimits* instance = LLFloaterReg::getTypedInstance<LLFloaterScriptLimits>("script_limits");
if(instance)
{
@@ -1178,6 +1215,12 @@ void LLPanelScriptLimitsAttachment::setAttachmentDetails(LLSD content)
setAttachmentSummary(content);
childSetValue("loading_text", LLSD(std::string("")));
+
+ LLButton* btn = getChild<LLButton>("refresh_list_btn");
+ if(btn)
+ {
+ btn->setEnabled(true);
+ }
}
BOOL LLPanelScriptLimitsAttachment::postBuild()
@@ -1218,7 +1261,7 @@ void LLPanelScriptLimitsAttachment::setAttachmentSummary(LLSD content)
}
else
{
- llinfos << "attachment details don't contain memory summary info" << llendl;
+ llwarns << "attachment details don't contain memory summary info" << llendl;
return;
}
@@ -1236,7 +1279,7 @@ void LLPanelScriptLimitsAttachment::setAttachmentSummary(LLSD content)
}
else
{
- llinfos << "attachment details don't contain urls summary info" << llendl;
+ llwarns << "attachment details don't contain urls summary info" << llendl;
return;
}
@@ -1267,16 +1310,23 @@ void LLPanelScriptLimitsAttachment::setAttachmentSummary(LLSD content)
// static
void LLPanelScriptLimitsAttachment::onClickRefresh(void* userdata)
-{
- llinfos << "Refresh clicked" << llendl;
-
+{
LLFloaterScriptLimits* instance = LLFloaterReg::getTypedInstance<LLFloaterScriptLimits>("script_limits");
if(instance)
{
LLTabContainer* tab = instance->getChild<LLTabContainer>("scriptlimits_panels");
LLPanelScriptLimitsAttachment* panel_attachments = (LLPanelScriptLimitsAttachment*)tab->getChild<LLPanel>("script_limits_my_avatar_panel");
+ LLButton* btn = panel_attachments->getChild<LLButton>("refresh_list_btn");
+
+ //To stop people from hammering the refesh button and accidentally dosing themselves - enough requests can crash the viewer!
+ //turn the button off, then turn it on when we get a response
+ if(btn)
+ {
+ btn->setEnabled(false);
+ }
panel_attachments->clearList();
panel_attachments->requestAttachmentDetails();
+
return;
}
else
diff --git a/indra/newview/llfloaterscriptlimits.h b/indra/newview/llfloaterscriptlimits.h
index 0cba4d72f2f5adce3b627013ca54bd3151d75f7b..3c32b9f701b5f2f8db192f23ee6f5d35f5e08394 100644
--- a/indra/newview/llfloaterscriptlimits.h
+++ b/indra/newview/llfloaterscriptlimits.h
@@ -153,10 +153,7 @@ class LLPanelScriptLimitsRegionMemory : public LLPanelScriptLimitsInfo, LLRemote
mParcelMemoryMax(0),
mParcelMemoryUsed(0) {};
- ~LLPanelScriptLimitsRegionMemory()
- {
- LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mParcelId, this);
- };
+ ~LLPanelScriptLimitsRegionMemory();
// LLPanel
virtual BOOL postBuild();
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 0de41ee591149e629ecdcb362e5c65153a9618d9..f74d912842a6ca31cd42425dc10ac0e3fc332d0c 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -186,7 +186,7 @@ LLFolderView::LLFolderView(const Params& p)
mNeedsAutoRename(FALSE),
mDebugFilters(FALSE),
mSortOrder(LLInventoryFilter::SO_FOLDERS_BY_NAME), // This gets overridden by a pref immediately
- mFilter( new LLInventoryFilter(p.name) ),
+ mFilter( new LLInventoryFilter(p.title) ),
mShowSelectionContext(FALSE),
mShowSingleSelection(FALSE),
mArrangeGeneration(0),
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index 38255b3cea270dcf8387ea803a58319873c08976..42390dfd1766d2f333e873f31b660d2d014ac16f 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -93,8 +93,9 @@ class LLFolderView : public LLFolderViewFolder, public LLEditMenuHandler
public:
struct Params : public LLInitParam::Block<Params, LLFolderViewFolder::Params>
{
- Mandatory<LLPanel*> parent_panel;
- Optional<LLUUID> task_id;
+ Mandatory<LLPanel*> parent_panel;
+ Optional<LLUUID> task_id;
+ Optional<std::string> title;
};
LLFolderView(const Params&);
virtual ~LLFolderView( void );
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index aeac3841f992e73f349d57176d9cadae9b8b34cc..7f93a357decc0de926629e6cdbc2a303c70451d0 100644
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -54,6 +54,7 @@
#include "llgroupactions.h"
#include "llnotificationsutil.h"
#include "lluictrlfactory.h"
+#include "lltrans.h"
#include <boost/regex.hpp>
#if LL_MSVC
@@ -1062,6 +1063,24 @@ void LLGroupMgr::processGroupRoleDataReply(LLMessageSystem* msg, void** data)
msg->getU64("RoleData","Powers",powers,i);
msg->getU32("RoleData","Members",member_count,i);
+ //there are 3 predifined roles - Owners, Officers, Everyone
+ //there names are defined in lldatagroups.cpp
+ //lets change names from server to localized strings
+ if(name == "Everyone")
+ {
+ name = LLTrans::getString("group_role_everyone");
+ }
+ else if(name == "Officers")
+ {
+ name = LLTrans::getString("group_role_officers");
+ }
+ else if(name == "Owners")
+ {
+ name = LLTrans::getString("group_role_owners");
+ }
+
+
+
lldebugs << "Adding role data: " << name << " {" << role_id << "}" << llendl;
LLGroupRoleData* rd = new LLGroupRoleData(role_id,name,title,desc,powers,member_count);
group_data->mRoles[role_id] = rd;
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 8097985ade6dc4c78a9b5d4a3638ef5cc88917b0..ec83a1fd6d3849cb3bbc85a1229c5fc29c992821 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -118,6 +118,7 @@ BOOL LLInventoryPanel::postBuild()
0);
LLFolderView::Params p;
p.name = getName();
+ p.title = getLabel();
p.rect = folder_rect;
p.parent_panel = this;
p.tool_tip = p.name;
diff --git a/indra/newview/llpanellandmarkinfo.cpp b/indra/newview/llpanellandmarkinfo.cpp
index 56d52ccc6517c745274db073d98a40d5359aec4a..143a64d08b1f1b4d678a7c5e0f66f625a02cc17c 100644
--- a/indra/newview/llpanellandmarkinfo.cpp
+++ b/indra/newview/llpanellandmarkinfo.cpp
@@ -383,22 +383,41 @@ std::string LLPanelLandmarkInfo::getFullFolderName(const LLViewerInventoryCatego
if (cat)
{
name = cat->getName();
-
- // translate category name, if it's right below the root
- // FIXME: it can throw notification about non existent string in strings.xml
- if (cat->getParentUUID().notNull() && cat->getParentUUID() == gInventory.getRootFolderID())
- {
- LLTrans::findString(name, "InvFolder " + name);
- }
+ parent_id = cat->getParentUUID();
+ bool is_under_root_category = parent_id == gInventory.getRootFolderID();
// we don't want "My Inventory" to appear in the name
- while ((parent_id = cat->getParentUUID()).notNull() && parent_id != gInventory.getRootFolderID())
+ while ((parent_id = cat->getParentUUID()).notNull())
{
cat = gInventory.getCategory(parent_id);
llassert(cat);
if (cat)
{
- name = cat->getName() + "/" + name;
+ if (is_under_root_category || cat->getParentUUID() == gInventory.getRootFolderID())
+ {
+ std::string localized_name;
+ if (is_under_root_category)
+ {
+ // translate category name, if it's right below the root
+ // FIXME: it can throw notification about non existent string in strings.xml
+ bool is_found = LLTrans::findString(localized_name, "InvFolder " + name);
+ name = is_found ? localized_name : name;
+ }
+ else
+ {
+ // FIXME: it can throw notification about non existent string in strings.xml
+ bool is_found = LLTrans::findString(localized_name, "InvFolder " + cat->getName());
+
+ // add translated category name to folder's full name
+ name = (is_found ? localized_name : cat->getName()) + "/" + name;
+ }
+
+ break;
+ }
+ else
+ {
+ name = cat->getName() + "/" + name;
+ }
}
}
}
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 45a8dc4cbee855f94f9bf081bde786c9943c2703..879fbba9cd043fff6a4b4dd02ff84c619199807b 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -656,9 +656,6 @@ void LLLandmarksPanel::initListCommandsHandlers()
mListCommands->childSetAction(OPTIONS_BUTTON_NAME, boost::bind(&LLLandmarksPanel::onActionsButtonClick, this));
mListCommands->childSetAction(TRASH_BUTTON_NAME, boost::bind(&LLLandmarksPanel::onTrashButtonClick, this));
- mListCommands->getChild<LLButton>(ADD_BUTTON_NAME)->setHeldDownCallback(boost::bind(&LLLandmarksPanel::onAddButtonHeldDown, this));
- static const LLSD add_landmark_command("add_landmark");
- mListCommands->childSetAction(ADD_BUTTON_NAME, boost::bind(&LLLandmarksPanel::onAddAction, this, add_landmark_command));
LLDragAndDropButton* trash_btn = mListCommands->getChild<LLDragAndDropButton>(TRASH_BUTTON_NAME);
trash_btn->setDragAndDropHandler(boost::bind(&LLLandmarksPanel::handleDragAndDropToTrash, this
@@ -676,6 +673,8 @@ void LLLandmarksPanel::initListCommandsHandlers()
mGearLandmarkMenu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_places_gear_landmark.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
mGearFolderMenu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_places_gear_folder.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
mMenuAdd = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_place_add_button.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
+
+ mListCommands->childSetAction(ADD_BUTTON_NAME, boost::bind(&LLLandmarksPanel::showActionMenu, this, mMenuAdd, ADD_BUTTON_NAME));
}
@@ -713,11 +712,6 @@ void LLLandmarksPanel::onActionsButtonClick()
showActionMenu(menu,OPTIONS_BUTTON_NAME);
}
-void LLLandmarksPanel::onAddButtonHeldDown()
-{
- showActionMenu(mMenuAdd,ADD_BUTTON_NAME);
-}
-
void LLLandmarksPanel::showActionMenu(LLMenuGL* menu, std::string spawning_view_name)
{
if (menu)
@@ -777,6 +771,12 @@ void LLLandmarksPanel::onAddAction(const LLSD& userdata) const
"category"), gInventory.findCategoryUUIDForType(
LLFolderType::FT_LANDMARK));
}
+ else
+ {
+ //in case My Landmarks tab is completely empty (thus cannot be determined as being selected)
+ menu_create_inventory_item(mLandmarksInventoryPanel->getRootFolder(), NULL, LLSD("category"),
+ gInventory.findCategoryUUIDForType(LLFolderType::FT_LANDMARK));
+ }
}
}
@@ -917,7 +917,7 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const
return false;
}
}
- else if (!root_folder_view)
+ else if (!root_folder_view && "category" != command_name)
{
return false;
}
@@ -953,7 +953,8 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const
// ... but except Received folder
return !isReceivedFolderSelected();
}
- else return false;
+ //"Add a folder" is enabled by default (case when My Landmarks is empty)
+ else return true;
}
else if("create_pick" == command_name)
{
diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h
index f1ce1a18b56447357f00dec3528f6315e018ed71..2b46ba99333e43c16b80f0552be9d0c5f45d4931 100644
--- a/indra/newview/llpanellandmarks.h
+++ b/indra/newview/llpanellandmarks.h
@@ -121,7 +121,6 @@ class LLLandmarksPanel : public LLPanelPlacesTab, LLRemoteParcelInfoObserver
void updateListCommands();
void onActionsButtonClick();
void showActionMenu(LLMenuGL* menu, std::string spawning_view_name);
- void onAddButtonHeldDown();
void onTrashButtonClick() const;
void onAddAction(const LLSD& command_name) const;
void onClipboardAction(const LLSD& command_name) const;
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index dedd1afcdeb5dd70823061f4ab1617ce2ad8694a..9e92ee337fdcd602b3278000e444549eb8b287b5 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -609,7 +609,7 @@ void LLTaskInvFVBridge::performAction(LLFolderView* folder, LLInventoryModel* mo
{
if (price > 0 && price > gStatusBar->getBalance())
{
- LLFloaterBuyCurrency::buyCurrency("This costs", price);
+ LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("this_costs"), price);
}
else
{
@@ -1575,6 +1575,7 @@ void LLPanelObjectInventory::reset()
LLRect dummy_rect(0, 1, 1, 0);
LLFolderView::Params p;
p.name = "task inventory";
+ p.title = "task inventory";
p.task_id = getTaskUUID();
p.parent_panel = this;
p.tool_tip= p.name;
diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp
index 82bbcaf38bee989a14dbc23c0bfe8a53adb09792..f0dc493ebee14f0a580c1b49212d6e530666a353 100644
--- a/indra/newview/llpanelpick.cpp
+++ b/indra/newview/llpanelpick.cpp
@@ -72,10 +72,6 @@
#define XML_BTN_ON_TXTR "edit_icon"
#define XML_BTN_SAVE "save_changes_btn"
-#define SAVE_BTN_LABEL "[WHAT]"
-#define LABEL_PICK = "Pick"
-#define LABEL_CHANGES = "Changes"
-
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
@@ -148,8 +144,6 @@ BOOL LLPanelPickInfo::postBuild()
{
mSnapshotCtrl = getChild<LLTextureCtrl>(XML_SNAPSHOT);
- childSetLabelArg(XML_BTN_SAVE, SAVE_BTN_LABEL, std::string("Pick"));
-
childSetAction("teleport_btn", boost::bind(&LLPanelPickInfo::onClickTeleport, this));
childSetAction("show_on_map_btn", boost::bind(&LLPanelPickInfo::onClickMap, this));
childSetAction("back_btn", boost::bind(&LLPanelPickInfo::onClickBack, this));
diff --git a/indra/newview/llpanelplaceprofile.cpp b/indra/newview/llpanelplaceprofile.cpp
index 9e5f9da0ea609f2f0cb143b431e0a4e31f6596c5..cdd79b1559208107990db46617f76fa59c74ba0b 100644
--- a/indra/newview/llpanelplaceprofile.cpp
+++ b/indra/newview/llpanelplaceprofile.cpp
@@ -569,7 +569,7 @@ void LLPanelPlaceProfile::onForSaleBannerClick()
{
if(parcel->getSalePrice() - gStatusBar->getBalance() > 0)
{
- LLFloaterBuyCurrency::buyCurrency("Buying selected land ", parcel->getSalePrice());
+ LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("buying_selected_land"), parcel->getSalePrice());
}
else
{
diff --git a/indra/newview/llplacesinventorypanel.cpp b/indra/newview/llplacesinventorypanel.cpp
index f1e450a083a5c2fcfb557e8cf41f8b71cad0a2f1..ed0fb54051f12d2266d2218a95a3dba094523732 100644
--- a/indra/newview/llplacesinventorypanel.cpp
+++ b/indra/newview/llplacesinventorypanel.cpp
@@ -92,6 +92,7 @@ BOOL LLPlacesInventoryPanel::postBuild()
0);
LLPlacesFolderView::Params p;
p.name = getName();
+ p.title = getLabel();
p.rect = folder_rect;
p.parent_panel = this;
mFolders = (LLFolderView*)LLUICtrlFactory::create<LLPlacesFolderView>(p);
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 025dd6029a8fc26a4111b1444f7225c0e9caa624..d4d6a74f0c665d6c1416efd5da91174131287d68 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1040,7 +1040,7 @@ bool idle_startup()
if(STATE_LOGIN_PROCESS_RESPONSE == LLStartUp::getStartupState())
{
std::ostringstream emsg;
- emsg << "Login failed.\n";
+ emsg << LLTrans::getString("LoginFailed") << "\n";
if(LLLoginInstance::getInstance()->authFailure())
{
LL_INFOS("LLStartup") << "Login failed, LLLoginInstance::getResponse(): "
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp
index 6cd8a78b25354976d1f344c336ffb57ab258b388..43913f3632636b49c22c072d6ed6fcdade4ecbe8 100644
--- a/indra/newview/lltextureview.cpp
+++ b/indra/newview/lltextureview.cpp
@@ -660,8 +660,9 @@ struct compare_decode_pair
struct KillView
{
- void operator()(LLView* viewp) const
+ void operator()(LLView* viewp)
{
+ viewp->getParent()->removeChild(viewp);
viewp->die();
}
};
@@ -676,8 +677,12 @@ void LLTextureView::draw()
for_each(mTextureBars.begin(), mTextureBars.end(), KillView());
mTextureBars.clear();
- delete mGLTexMemBar;
- mGLTexMemBar = 0;
+ if (mGLTexMemBar)
+ {
+ removeChild(mGLTexMemBar);
+ mGLTexMemBar->die();
+ mGLTexMemBar = 0;
+ }
typedef std::multiset<decode_pair_t, compare_decode_pair > display_list_t;
display_list_t display_image_list;
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 2f4a69a53c4fb021c156d9fa6ab4b4ec63bc4b9d..d15db536e6c2e53ddd61463217b23fe83d247cda 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -412,24 +412,24 @@ ECursorType cursor_from_object(LLViewerObject* object)
case CLICK_ACTION_SIT:
if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->isSitting())) // not already sitting?
{
- cursor = UI_CURSOR_HAND;
+ cursor = UI_CURSOR_TOOLSIT;
}
break;
case CLICK_ACTION_BUY:
- cursor = UI_CURSOR_HAND;
+ cursor = UI_CURSOR_TOOLBUY;
break;
case CLICK_ACTION_OPEN:
// Open always opens the parent.
if (parent && parent->allowOpen())
{
- cursor = UI_CURSOR_HAND;
+ cursor = UI_CURSOR_TOOLOPEN;
}
break;
case CLICK_ACTION_PAY:
if ((object && object->flagTakesMoney())
|| (parent && parent->flagTakesMoney()))
{
- cursor = UI_CURSOR_HAND;
+ cursor = UI_CURSOR_TOOLBUY;
}
break;
case CLICK_ACTION_ZOOM:
@@ -964,7 +964,7 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
}
}
}
-
+
// Avoid showing tip over media that's displaying unless it's for sale
// also check the primary node since sometimes it can have an action even though
@@ -972,9 +972,9 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
bool needs_tip = (!is_media_displaying ||
for_sale) &&
- (has_media ||
- needs_tooltip(nodep) ||
- needs_tooltip(LLSelectMgr::getInstance()->getPrimaryHoverNode()));
+ (has_media ||
+ needs_tooltip(nodep) ||
+ needs_tooltip(LLSelectMgr::getInstance()->getPrimaryHoverNode()));
if (show_all_object_tips || needs_tip)
{
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 64dcd62a6a0e1f260036c9e01004334193e48578..b9509a98f5052b01f40f00f65389effad31bc0d4 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1258,8 +1258,9 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
{
LLPluginClassMedia* media_source = new LLPluginClassMedia(owner);
media_source->setSize(default_width, default_height);
- std::string language_code = LLUI::getLanguage();
- if (media_source->init(launcher_name, plugin_name, gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins"), user_data_path, language_code))
+ media_source->setUserDataPath(user_data_path);
+ media_source->setLanguageCode(LLUI::getLanguage());
+ if (media_source->init(launcher_name, plugin_name, gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins")))
{
return media_source;
}
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index bc3b8ac9d6c950177ee115bf0995980d9c86ac1f..1d58daba2ce5047a8d98b7ec1c80276f3113e8ad 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -103,6 +103,7 @@
#include "llfloatercamera.h"
#include "lluilistener.h"
#include "llappearancemgr.h"
+#include "lltrans.h"
using namespace LLVOAvatarDefines;
@@ -3272,7 +3273,7 @@ void handle_buy_object(LLSaleInfo sale_info)
if (price > 0 && price > gStatusBar->getBalance())
{
- LLFloaterBuyCurrency::buyCurrency("This object costs", price);
+ LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("this_object_costs"), price);
return;
}
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 84b270f8cc7a8b24ff2875b458eaf71159566dfd..00762894cda7e04ecca7cbaeb28600f0cbd0b62c 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -1001,7 +1001,7 @@ void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType asset_ty
if (balance < expected_upload_cost)
{
// insufficient funds, bail on this upload
- LLFloaterBuyCurrency::buyCurrency("Uploading costs", expected_upload_cost);
+ LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("uploading_costs"), expected_upload_cost);
return;
}
}
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index b90e3dcda45b9f6ef9b74f5892ea104ad7fd68fd..eed3f252319ddf01b0274abd0ca873f70241f50f 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -272,7 +272,7 @@ void give_money(const LLUUID& uuid, LLViewerRegion* region, S32 amount, BOOL is_
}
else
{
- LLFloaterBuyCurrency::buyCurrency("Giving", amount);
+ LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("giving"), amount);
}
}
@@ -1500,7 +1500,9 @@ void inventory_offer_handler(LLOfferInfo* info)
std::string typestr = ll_safe_string(LLAssetType::lookupHumanReadable(info->mType));
if (!typestr.empty())
{
- args["OBJECTTYPE"] = typestr;
+ // human readable matches string name from strings.xml
+ // lets get asset type localized name
+ args["OBJECTTYPE"] = LLTrans::getString(typestr);
}
else
{
@@ -4484,11 +4486,13 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
std::string ammount = desc.substr(marker_pos + marker.length(),desc.length() - marker.length() - marker_pos);
//reform description
- std::string paid_you = LLTrans::getString("paid_you_ldollars");
- std::string new_description = base_name + paid_you + ammount;
+ LLStringUtil::format_map_t str_args;
+ str_args["NAME"] = base_name;
+ str_args["AMOUNT"] = ammount;
+ std::string new_description = LLTrans::getString("paid_you_ldollars", str_args);
+
args["MESSAGE"] = new_description;
-
args["NAME"] = name;
LLSD payload;
payload["from_id"] = from_id;
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index d0a1a31ebdcaa0876e4c673d74e3a88e5f3cd0ba..adac4b9b40f63c9f0a74ac53bd53d7435a6c0bfd 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1124,7 +1124,7 @@ BOOL LLViewerWindow::handleActivate(LLWindow *window, BOOL activated)
{
// if we're in world, show a progress bar to hide reloading of textures
llinfos << "Restoring GL during activate" << llendl;
- restoreGL("Restoring...");
+ restoreGL(LLTrans::getString("ProgressRestoring"));
}
else
{
@@ -1384,7 +1384,7 @@ LLViewerWindow::LLViewerWindow(
if (NULL == mWindow)
{
- LLSplashScreen::update("Shutting down...");
+ LLSplashScreen::update(LLTrans::getString("ShuttingDown"));
#if LL_LINUX || LL_SOLARIS
llwarns << "Unable to create window, be sure screen is set at 32-bit color and your graphics driver is configured correctly. See README-linux.txt or README-solaris.txt for further information."
<< llendl;
@@ -4758,7 +4758,7 @@ void LLViewerWindow::restartDisplay(BOOL show_progress_bar)
stopGL();
if (show_progress_bar)
{
- restoreGL("Changing Resolution...");
+ restoreGL(LLTrans::getString("ProgressChangingResolution"));
}
else
{
@@ -4845,7 +4845,7 @@ BOOL LLViewerWindow::changeDisplaySettings(BOOL fullscreen, LLCoordScreen size,
llinfos << "Restoring GL during resolution change" << llendl;
if (show_progress_bar)
{
- restoreGL("Changing Resolution...");
+ restoreGL(LLTrans::getString("ProgressChangingResolution"));
}
else
{
diff --git a/indra/newview/res/toolbuy.cur b/indra/newview/res/toolbuy.cur
new file mode 100644
index 0000000000000000000000000000000000000000..7fd552a78e97ad980e6138a25ec9ede085731112
Binary files /dev/null and b/indra/newview/res/toolbuy.cur differ
diff --git a/indra/newview/res/toolopen.cur b/indra/newview/res/toolopen.cur
new file mode 100644
index 0000000000000000000000000000000000000000..1562f5bc95517983e4cc60ca02ba599b7c48c180
Binary files /dev/null and b/indra/newview/res/toolopen.cur differ
diff --git a/indra/newview/res/toolsit.cur b/indra/newview/res/toolsit.cur
new file mode 100644
index 0000000000000000000000000000000000000000..a1f99cfe6d4b0ee3bb726d6b49b4d5f9acb2c84a
Binary files /dev/null and b/indra/newview/res/toolsit.cur differ
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
index 38291e45c933417911212e67d2d4b758bd2287c7..7a965cf57e50bc3cf38a666484781fdf6db88996 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc
@@ -2,19 +2,12 @@
//
#include "resource.h"
-#ifdef IDC_STATIC
-#undef IDC_STATIC
-#endif
-#define IDC_STATIC (-1)
-#include "winresrc.h"
-
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
-// Commented out because it only compiles if you have MFC installed.
-//#include "winres.h"
+#include "winres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -34,18 +27,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// TEXTINCLUDE
//
-1 TEXTINCLUDE
+1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE
+2 TEXTINCLUDE
BEGIN
"#include ""winres.h""\r\n"
"\0"
END
-3 TEXTINCLUDE
+3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
@@ -84,9 +77,8 @@ END
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
+GUIDELINES DESIGNINFO
BEGIN
-
"SPLASHSCREEN", DIALOG
BEGIN
LEFTMARGIN, 7
@@ -127,6 +119,9 @@ TOOLPIPETTE CURSOR "toolpipette.cur"
TOOLPLAY CURSOR "toolplay.cur"
TOOLPAUSE CURSOR "toolpause.cur"
TOOLMEDIAOPEN CURSOR "toolmediaopen.cur"
+TOOLOPEN CURSOR "toolopen.cur"
+TOOLSIT CURSOR "toolsit.cur"
+TOOLBUY CURSOR "toolbuy.cur"
/////////////////////////////////////////////////////////////////////////////
//
@@ -134,8 +129,8 @@ TOOLMEDIAOPEN CURSOR "toolmediaopen.cur"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,200030
- PRODUCTVERSION 2,0,0,200030
+ FILEVERSION 2,0,0,3422
+ PRODUCTVERSION 2,0,0,3422
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -166,12 +161,6 @@ BEGIN
END
END
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml
index 9bda1397bc918952ce3f56eeeae217037bab388f..6e7d16aa798bede7baaec1540bd45650ab11135f 100644
--- a/indra/newview/skins/default/xui/da/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_about_land.xml
@@ -84,9 +84,9 @@ Gå til 'Verden' > 'Om land' eller vælg en anden parcel
<text name="GroupText">
Leyla Linden
</text>
- <button label="Vælg..." label_selected="Vælg..." name="Set..."/>
+ <button label="Vælg" name="Set..."/>
<check_box label="Tillad dedikering til gruppe" name="check deed" tool_tip="En gruppe administrator kan dedikere denne jord til gruppen, så det vil blive støttet af gruppen's jord tildeling."/>
- <button label="Dedikér..." label_selected="Dedikér..." name="Deed..." tool_tip="Du kan kun dedikere jord, hvis du er en administrator i den valgte gruppe."/>
+ <button label="Dedikér" name="Deed..." tool_tip="Du kan kun dedikere jord, hvis du er en administrator i den valgte gruppe."/>
<check_box label="Ejer bidrager ved dedikering" name="check contrib" tool_tip="Når land dedikeres til gruppe, kan den tidligere bidrage med nok land til at dække krav."/>
<text name="For Sale:">
Til salg:
@@ -97,7 +97,7 @@ Gå til 'Verden' > 'Om land' eller vælg en anden parcel
<text name="For Sale: Price L$[PRICE].">
Pris: L$[PRICE] (L$[PRICE_PER_SQM]/m²).
</text>
- <button label="Sælg land..." label_selected="Sælg land..." name="Sell Land..."/>
+ <button label="Sælg land" name="Sell Land..."/>
<text name="For sale to">
Til salg til: [BUYER]
</text>
@@ -126,13 +126,13 @@ Gå til 'Verden' > 'Om land' eller vælg en anden parcel
<text name="DwellText">
0
</text>
- <button label="Køb land..." label_selected="Køb land..." name="Buy Land..."/>
+ <button label="Køb land" name="Buy Land..."/>
<button label="Script Info" name="Scripts..."/>
- <button label="Køb til gruppe..." label_selected="Køb til gruppe..." name="Buy For Group..."/>
- <button label="Køb adgang..." label_selected="Køb adgang..." name="Buy Pass..." tool_tip="Giver adgang til midlertidig adgang til dette område."/>
- <button label="Efterlad land..." label_selected="Efterlad land..." name="Abandon Land..."/>
- <button label="Kræv tilbage..." label_selected="Kræv tilbage..." name="Reclaim Land..."/>
- <button label="Linden salg..." label_selected="Linden salg..." name="Linden Sale..." tool_tip="Land skal være ejet, indholdsrating sat og ikke allerede på auktion."/>
+ <button label="Køb til gruppe" name="Buy For Group..."/>
+ <button label="Køb adgang" name="Buy Pass..." tool_tip="Giver adgang til midlertidig adgang til dette område."/>
+ <button label="Efterlad land" name="Abandon Land..."/>
+ <button label="Kræv tilbage" name="Reclaim Land..."/>
+ <button label="Linden salg" name="Linden Sale..." tool_tip="Land skal være ejet, indholdsrating sat og ikke allerede på auktion."/>
</panel>
<panel label="REGLER" name="land_covenant_panel">
<panel.string name="can_resell">
@@ -231,7 +231,7 @@ Gå til 'Verden' > 'Om land' eller vælg en anden parcel
[COUNT]
</text>
<button label="Vis" label_selected="Vis" name="ShowOwner"/>
- <button label="Returnér..." label_selected="Returnér..." name="ReturnOwner..." tool_tip="Returnér objekter til deres ejere."/>
+ <button label="Returnér" name="ReturnOwner..." tool_tip="Returnér objekter til deres ejere."/>
<text name="Set to group:">
Sat til gruppe:
</text>
@@ -239,7 +239,7 @@ Gå til 'Verden' > 'Om land' eller vælg en anden parcel
[COUNT]
</text>
<button label="Vis" label_selected="Vis" name="ShowGroup"/>
- <button label="Returnér..." label_selected="Returnér..." name="ReturnGroup..." tool_tip="Returnér objekter til deres ejere."/>
+ <button label="Returnér" name="ReturnGroup..." tool_tip="Returnér objekter til deres ejere."/>
<text name="Owned by others:">
Ejet af andre:
</text>
@@ -247,7 +247,7 @@ Gå til 'Verden' > 'Om land' eller vælg en anden parcel
[COUNT]
</text>
<button label="Vis" label_selected="Vis" name="ShowOther"/>
- <button label="Returnér..." label_selected="Returnér..." name="ReturnOther..." tool_tip="Returnér objekter til deres ejere."/>
+ <button label="Returnér" name="ReturnOther..." tool_tip="Returnér objekter til deres ejere."/>
<text name="Selected / sat upon:">
Valgt/siddet på:
</text>
@@ -261,7 +261,7 @@ Gå til 'Verden' > 'Om land' eller vælg en anden parcel
Objekt ejere:
</text>
<button label="Gentegn liste" label_selected="Gentegn liste" name="Refresh List" tool_tip="Refresh Object List"/>
- <button label="Returnér objekter..." label_selected="Returnér objekter..." name="Return objects..."/>
+ <button label="Returnér objekter" name="Return objects..."/>
<name_list name="owner list">
<name_list.columns label="Type" name="type"/>
<name_list.columns label="Navn" name="name"/>
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 2764befeac0e2136e571a5e49d1b0fcb5071970c..33977e9f1a6989fbe20d290ca5001f96ec2a2cbc 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -275,7 +275,7 @@ Leyla Linden </text>
left_pad="4"
right="-10"
name="Set..."
- width="50"
+ width="90"
top_delta="-2"/>
<check_box
enabled="false"
@@ -407,7 +407,7 @@ Leyla Linden </text>
name="Cancel Land Sale"
left_pad="5"
top_pad="-25"
- width="155" />
+ width="180" />
<text
type="string"
length="1"
@@ -486,10 +486,10 @@ Leyla Linden </text>
height="23"
label="Buy Land"
layout="topleft"
- left_delta="82"
+ left_delta="52"
name="Buy Land..."
top_pad="7"
- width="100" />
+ width="130" />
<button
enabled="true"
follows="left|top"
@@ -499,7 +499,7 @@ Leyla Linden </text>
left="10"
name="Scripts..."
top_pad="1"
- width="100" />
+ width="150" />
<button
enabled="false"
follows="left|top"
@@ -516,11 +516,11 @@ Leyla Linden </text>
height="23"
label="Buy Pass"
layout="topleft"
- left_delta="-105"
+ left_delta="-135"
name="Buy Pass..."
tool_tip="A pass gives you temporary access to this land."
top_delta="0"
- width="100" />
+ width="130" />
<button
follows="left|top"
height="23"
@@ -1056,7 +1056,7 @@ Leyla Linden </text>
left="10"
name="Autoreturn"
top_pad="0"
- width="294">
+ width="310">
Auto return other Residents' objects (minutes, 0 for off):
</text>
<line_editor
diff --git a/indra/newview/skins/default/xui/en/floater_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
index 1ffedde29b01bc3076698a61656cc6702d19ead3..9dff4abe2cb290732f36c99a1b880858721172cf 100644
--- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
@@ -218,14 +218,14 @@ Maximum animation length is [MAX_LENGTH] seconds.
increment="1"
initial_value="0"
label="In(%)"
- label_width="49"
+ label_width="70"
layout="topleft"
top_pad="5"
- left="30"
+ left="15"
max_val="100"
name="loop_in_point"
tool_tip="Sets point in animation that looping returns to"
- width="115" />
+ width="130" />
<spinner
bottom_delta="0"
follows="left|top"
@@ -238,8 +238,8 @@ Maximum animation length is [MAX_LENGTH] seconds.
max_val="100"
name="loop_out_point"
tool_tip="Sets point in animation that ends a loop"
- label_width="49"
- width="115" />
+ label_width="60"
+ width="120" />
<text
type="string"
length="1"
@@ -256,10 +256,10 @@ Maximum animation length is [MAX_LENGTH] seconds.
<combo_box
height="23"
layout="topleft"
- left_pad="0"
+ left_pad="20"
name="hand_pose_combo"
tool_tip="Controls what hands do during animation"
- width="150">
+ width="130">
<combo_box.item
label="Spread"
name="Spread"
@@ -328,9 +328,9 @@ Maximum animation length is [MAX_LENGTH] seconds.
</text>
<combo_box
height="23"
- width="150"
+ width="130"
layout="topleft"
- left_pad="0"
+ left_pad="20"
name="emote_combo"
tool_tip="Controls what face does during animation">
<combo_box.item
@@ -409,9 +409,9 @@ Maximum animation length is [MAX_LENGTH] seconds.
</text>
<combo_box
height="23"
- width="150"
+ width="130"
layout="topleft"
- left_pad="0"
+ left_pad="20"
name="preview_base_anim"
tool_tip="Use this to test your animation behavior while your avatar performs common actions.">
<combo_box.item
@@ -433,27 +433,27 @@ Maximum animation length is [MAX_LENGTH] seconds.
increment="0.01"
initial_value="0"
label="Ease In (sec)"
- label_width="110"
+ label_width="140"
layout="topleft"
left="10"
max_val="10"
name="ease_in_time"
tool_tip="Amount of time (in seconds) over which animations blends in"
top_pad="10"
- width="200" />
+ width="210" />
<spinner
follows="left|top"
height="23"
increment="0.01"
initial_value="0"
label="Ease Out (sec)"
- label_width="110"
+ label_width="140"
layout="topleft"
top_pad="0"
max_val="10"
name="ease_out_time"
tool_tip="Amount of time (in seconds) over which animations blends out"
- width="200" />
+ width="210" />
<button
follows="top|right"
height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 015a2e91ff5682454aa37afd93f6994fc83df099..e70a0512d610758800bff2451665e50748704415 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -59,9 +59,9 @@
height="28"
layout="topleft"
min_height="28"
- width="100"
+ width="105"
top_delta="0"
- min_width="100"
+ min_width="54"
name="speak_panel"
user_resize="false">
<talk_button
@@ -73,11 +73,13 @@
left="0"
name="talk"
top="5"
- width="100">
+ width="105">
<speak_button
+ halign="left"
name="speak_btn"
label="Speak"
label_selected="Speak"
+ pad_left="12"
/>
<show_button>
<show_button.init_callback
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index 15517fb8059f59b75528cf8e90befc9445fb8cd6..08ee0306dd35fb6256e1f144cd5916583de2448b 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -183,7 +183,7 @@
<button
follows="bottom|left"
height="23"
- label="Save [WHAT]"
+ label="Save Pick"
layout="topleft"
name="save_changes_btn"
left="0"
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
index 7c0ce9e62e4e102e2ca3d0f080d7f6077157bf7f..d14712a7faa60397588210e230ad045bd006aceb 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -95,6 +95,7 @@
follows="top|left"
font="SansSerif"
left="10"
+ name="nearby_media"
width="100">
Nearby Media
</text>
@@ -105,6 +106,7 @@
font="SansSerif"
top_pad="15"
left="10"
+ name="show"
width="40">
Show:
</text>
@@ -130,7 +132,7 @@
<combo_box.item
label="On other Avatars"
value="4"
- ame="OnOthers" />
+ name="OnOthers" />
</combo_box>
<scroll_list
name="media_list"
@@ -179,6 +181,7 @@
top_pad="5"
height="30"
left="10"
+ name="media_controls_panel"
right="-10">
<layout_stack
name="media_controls"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 48fa5dd44f221db29b25e4160a3631adedb8ff88..2a46311fceb60d879e6aca685bcb8fbf19bf227a 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -14,7 +14,14 @@
<!-- starting up -->
<string name="StartupDetectingHardware">Detecting hardware...</string>
- <string name="StartupLoading">Loading</string>
+ <string name="StartupLoading">Loading [APP_NAME]...</string>
+ <string name="StartupClearingCache">Clearing cache...</string>
+ <string name="StartupInitializingTextureCache">Initializing Texture Cache...</string>
+ <string name="StartupInitializingVFS">Initializing VFS...</string>
+
+ <!-- progress -->
+ <string name="ProgressRestoring">Restoring...</string>
+ <string name="ProgressChangingResolution">Changing Resolution...</string>
<!-- Legacy strings, almost never used -->
<string name="Fullbright">Fullbright (Legacy)</string> <!-- used in the Build > materials dropdown-->
@@ -40,11 +47,15 @@
<string name="LoginConnectingToRegion">Connecting to region...</string>
<string name="LoginDownloadingClothing">Downloading clothing...</string>
<string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string>
+ <string name="LoginFailed">Login failed.</string>
<string name="Quit">Quit</string>
<string name="create_account_url">http://join.secondlife.com/</string>
<!-- Disconnection -->
<string name="AgentLostConnection">This region may be experiencing trouble. Please check your connection to the Internet.</string>
+ <string name="SavingSettings">Saving your settings...</string>
+ <string name="LoggingOut">Logging out...</string>
+ <string name="ShuttingDown">Shutting down...</string>
<!-- Tooltip, lltooltipview.cpp -->
@@ -68,6 +79,12 @@
<string name="TooltipHttpUrl">Click to view this web page</string>
<string name="TooltipSLURL">Click to view this location's information</string>
<string name="TooltipAgentUrl">Click to view this Resident's profile</string>
+ <string name="TooltipAgentMute">Click to mute this Resident</string>
+ <string name="TooltipAgentUnmute">Click to unmute this Resident</string>
+ <string name="TooltipAgentIM">Click to IM this Resident</string>
+ <string name="TooltipAgentPay">Click to Pay this Resident</string>
+ <string name="TooltipAgentOfferTeleport">Click to offer a teleport request to this Resident</string>
+ <string name="TooltipAgentRequestFriend">Click to send a friend request to this Resident</string>
<string name="TooltipGroupUrl">Click to view this group's description</string>
<string name="TooltipEventUrl">Click to view this event's description</string>
<string name="TooltipClassifiedUrl">Click to view this classified</string>
@@ -84,6 +101,14 @@
<string name="SLurlLabelTeleport">Teleport to</string>
<string name="SLurlLabelShowOnMap">Show Map for</string>
+ <!-- label strings for secondlife:///app/agent SLapps -->
+ <string name="SLappAgentMute">Mute</string>
+ <string name="SLappAgentUnmute">Unmute</string>
+ <string name="SLappAgentIM">IM</string>
+ <string name="SLappAgentPay">Pay</string>
+ <string name="SLappAgentOfferTeleport">Offer Teleport to </string>
+ <string name="SLappAgentRequestFriend">Friend Request </string>
+
<!-- ButtonToolTips, llfloater.cpp -->
<string name="BUTTON_CLOSE_DARWIN">Close (⌘W)</string>
<string name="BUTTON_CLOSE_WIN">Close (Ctrl+W)</string>
@@ -134,6 +159,7 @@
<string name="AssetErrorUnknownStatus">Unknown status</string>
<!-- Asset Type human readable names: these will replace variable [TYPE] in notification FailedToFindWearable* -->
+ <!-- Will also replace [OBJECTTYPE] in notifications: UserGiveItem, ObjectGiveItem -->
<string name="texture">texture</string>
<string name="sound">sound</string>
<string name="calling card">calling card</string>
@@ -158,6 +184,7 @@
<string name="simstate">simstate</string>
<string name="favorite">favorite</string>
<string name="symbolic link">link</string>
+ <string name="symbolic folder link">folder link</string>
<!-- llvoavatar. Displayed in the avatar chat bubble -->
<string name="AvatarEditingAppearance">(Editing Appearance)</string>
@@ -3016,6 +3043,16 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
[SOURCES] have said something new
</string>"
- <string name="paid_you_ldollars">"paid you L$"</string>"
+ <!-- Financial operations strings -->
+ <string name="paid_you_ldollars">[NAME] paid you L$[AMOUNT]</string>
+ <string name="giving">Giving</string>
+ <string name="uploading_costs">Uploading costs</string>
+ <string name="this_costs">This costs</string>
+ <string name="buying_selected_land">Buying selected land</string>
+ <string name="this_object_costs">This object costs"</string>
+
+ <string name="group_role_everyone">Everyone</string>
+ <string name="group_role_officers">Officers</string>
+ <string name="group_role_owners">Owners</string>
</strings>
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
index 46531c5e5866b417f990411d42ba0d4dcea2da2e..006a82eab6e2fa333b6c37f6f534f2c94ba84f67 100644
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floaterland" title="ACERCA DEL TERRENO">
+ <floater.string name="maturity_icon_general">
+ "Parcel_PG_Dark"
+ </floater.string>
+ <floater.string name="maturity_icon_moderate">
+ "Parcel_M_Dark"
+ </floater.string>
+ <floater.string name="maturity_icon_adult">
+ "Parcel_R_Dark"
+ </floater.string>
<floater.string name="Minutes">
[MINUTES] minutos
</floater.string>
@@ -15,7 +24,7 @@
<tab_container name="landtab">
<panel label="GENERAL" name="land_general_panel">
<panel.string name="new users only">
- Sólo usuarios nuevos
+ Sólo nuevos Residentes
</panel.string>
<panel.string name="anyone">
Cualquiera
@@ -84,9 +93,9 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s
<text name="GroupText">
Leyla Linden
</text>
- <button label="Configurar..." label_selected="Configurar..." name="Set..."/>
+ <button label="Configurar" name="Set..."/>
<check_box label="Permitir transferir al grupo" name="check deed" tool_tip="Un oficial del grupo puede transferir este terreno al grupo. El terreno será apoyado por el grupo en sus asignaciones de terreno."/>
- <button label="Transferir..." label_selected="Transferir..." name="Deed..." tool_tip="Sólo si es usted un oficial del grupo seleccionado puede transferir terreno."/>
+ <button label="Transferir" name="Deed..." tool_tip="Sólo si es usted un oficial del grupo seleccionado puede transferir terreno."/>
<check_box label="El propietario hace una contribución transfiriendo" name="check contrib" tool_tip="Cuando el terreno se transfiere al grupo, el antiguo propietario contribuye con una asignación suficiente de terreno."/>
<text name="For Sale:">
En venta:
@@ -97,7 +106,7 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s
<text name="For Sale: Price L$[PRICE].">
Precio: [PRICE] L$ ([PRICE_PER_SQM] L$/m²).
</text>
- <button label="Vender el terreno..." label_selected="Vender el terreno..." name="Sell Land..."/>
+ <button label="Vender el terreno" name="Sell Land..."/>
<text name="For sale to">
En venta a: [BUYER]
</text>
@@ -107,7 +116,7 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s
<text name="Selling with no objects in parcel." width="216">
Los objetos no se incluyen en la venta.
</text>
- <button bottom="-245" font="SansSerifSmall" label="Cancelar la venta del terreno" label_selected="Cancelar la venta del terreno" left="275" name="Cancel Land Sale" width="165"/>
+ <button bottom="-245" font="SansSerifSmall" label="Cancelar la venta del terreno" label_selected="Cancelar la venta del terreno" left="275" name="Cancel Land Sale"/>
<text name="Claimed:">
Reclamada:
</text>
@@ -126,13 +135,13 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s
<text name="DwellText">
0
</text>
- <button label="Comprar terreno..." label_selected="Comprar terreno..." left="130" name="Buy Land..." width="125"/>
+ <button label="Comprar terreno" left="130" name="Buy Land..." width="125"/>
<button label="Información del script" name="Scripts..."/>
- <button label="Comprar para el grupo..." label_selected="Comprar para el grupo..." name="Buy For Group..."/>
- <button label="Comprar un pase..." label_selected="Comprar un pase..." left="130" name="Buy Pass..." tool_tip="Un pase le da acceso temporal a este terreno." width="125"/>
- <button label="Abandonar el terreno..." label_selected="Abandonar el terreno..." name="Abandon Land..."/>
- <button label="Reclamar el terreno..." label_selected="Reclamar el terreno..." name="Reclaim Land..."/>
- <button label="Venta Linden..." label_selected="Venta Linden..." name="Linden Sale..." tool_tip="El terreno debe estar en propiedad, con contenido, y no estar en subasta."/>
+ <button label="Comprar para el grupo" name="Buy For Group..."/>
+ <button label="Comprar un pase" left="130" name="Buy Pass..." tool_tip="Un pase le da acceso temporal a este terreno." width="125"/>
+ <button label="Abandonar el terreno" name="Abandon Land..."/>
+ <button label="Reclamar el terreno" name="Reclaim Land..."/>
+ <button label="Venta Linden" name="Linden Sale..." tool_tip="El terreno debe estar en propiedad, con contenido, y no estar en subasta."/>
</panel>
<panel label="CONTRATO" name="land_covenant_panel">
<panel.string name="can_resell">
@@ -231,7 +240,7 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s
[COUNT]
</text>
<button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-135" width="60"/>
- <button label="Devolver..." label_selected="Devolver..." name="ReturnOwner..." right="-10" tool_tip="Devolver los objetos a sus propietarios." width="119"/>
+ <button label="Devolver" name="ReturnOwner..." right="-10" tool_tip="Devolver los objetos a sus propietarios." width="119"/>
<text left="14" name="Set to group:" width="180">
Del grupo:
</text>
@@ -239,7 +248,7 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s
[COUNT]
</text>
<button label="Mostrar" label_selected="Mostrar" name="ShowGroup" right="-135" width="60"/>
- <button label="Devolver..." label_selected="Devolver..." name="ReturnGroup..." right="-10" tool_tip="Devolver los objetos a sus propietarios." width="119"/>
+ <button label="Devolver" name="ReturnGroup..." right="-10" tool_tip="Devolver los objetos a sus propietarios." width="119"/>
<text left="14" name="Owned by others:" width="128">
Propiedad de otros:
</text>
@@ -247,7 +256,7 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s
[COUNT]
</text>
<button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-135" width="60"/>
- <button label="Devolver..." label_selected="Devolver..." name="ReturnOther..." right="-10" tool_tip="Devolver los objetos a sus propietarios." width="119"/>
+ <button label="Devolver" name="ReturnOther..." right="-10" tool_tip="Devolver los objetos a sus propietarios." width="119"/>
<text left="14" name="Selected / sat upon:" width="193">
Seleccionados / con gente sentada:
</text>
@@ -262,7 +271,7 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s
Propietarios de los objetos:
</text>
<button label="Actualizar la lista" label_selected="Actualizar la lista" left="158" name="Refresh List" tool_tip="Refresh Object List"/>
- <button label="Devolver los objetos..." label_selected="Devolver los objetos..." left="270" name="Return objects..." width="164"/>
+ <button label="Devolver los objetos" left="270" name="Return objects..." width="164"/>
<name_list name="owner list">
<name_list.columns label="Tipo" name="type"/>
<name_list.columns label="Nombre" name="name"/>
@@ -307,17 +316,17 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda.
</text>
<check_box label="Editar el terreno" name="edit land check" tool_tip="Si se marca, cualquiera podrá modificar su terreno. Mejor dejarlo desmarcado, pues usted siempre puede modificar su terreno."/>
<check_box label="Volar" name="check fly" tool_tip="Si se marca, los residentes podrán volar en su terreno. Si no, sólo podrán volar al cruzarlo o hasta que aterricen en él."/>
- <text left="162" name="allow_label2">
+ <text name="allow_label2">
Crear objetos:
</text>
<check_box label="Todos los residentes" left="255" name="edit objects check"/>
<check_box label="El grupo" left="385" name="edit group objects check"/>
- <text left="162" name="allow_label3">
+ <text name="allow_label3">
Dejar objetos:
</text>
<check_box label="Todos los residentes" left="255" name="all object entry check"/>
<check_box label="El grupo" left="385" name="group object entry check"/>
- <text left="162" name="allow_label4">
+ <text name="allow_label4">
Ejecutar scripts:
</text>
<check_box label="Todos los residentes" left="255" name="check other scripts"/>
@@ -424,6 +433,9 @@ los media:
<panel.string name="access_estate_defined">
(Definido por el Estado)
</panel.string>
+ <panel.string name="allow_public_access">
+ Permitir el acceso público ([MATURITY])
+ </panel.string>
<panel.string name="estate_override">
Una o más de esta opciones está configurada a nivel del estado
</panel.string>
diff --git a/indra/newview/skins/default/xui/es/floater_animation_preview.xml b/indra/newview/skins/default/xui/es/floater_animation_preview.xml
index 2fc18e55f61d8e41a841a792dd739bd5d61c12a3..a40d53a8a87477c31ce88dc521f615b9d2e9b8c7 100644
--- a/indra/newview/skins/default/xui/es/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_animation_preview.xml
@@ -115,14 +115,14 @@ La duración máxima de una animación es de [MAX_LENGTH] segundos.
<text name="description_label">
Descripción:
</text>
- <spinner label="Prioridad:" label_width="72" name="priority" tool_tip="Controla qué otras animaciones pueden ser anuladas por ésta" width="110"/>
- <check_box label="Bucle:" left="8" name="loop_check" tool_tip="Hace esta animación en bucle"/>
- <spinner label="Empieza(%)" label_width="65" left="65" name="loop_in_point" tool_tip="Indica el punto en el que la animación vuelve a empezar" width="116"/>
- <spinner label="Acaba(%)" label_width="50" left="185" name="loop_out_point" tool_tip="Indica el punto en el que la animación acaba el bucle"/>
+ <spinner label="Prioridad:" name="priority" tool_tip="Controla qué otras animaciones pueden ser anuladas por ésta"/>
+ <check_box label="Bucle:" name="loop_check" tool_tip="Hace esta animación en bucle"/>
+ <spinner label="Empieza(%)" name="loop_in_point" tool_tip="Indica el punto en el que la animación vuelve a empezar"/>
+ <spinner label="Acaba(%)" name="loop_out_point" tool_tip="Indica el punto en el que la animación acaba el bucle"/>
<text name="hand_label">
Posición de las manos
</text>
- <combo_box left_delta="120" name="hand_pose_combo" tool_tip="Controla qué hacen las manos durante la animación" width="164">
+ <combo_box name="hand_pose_combo" tool_tip="Controla qué hacen las manos durante la animación">
<combo_box.item label="Extendidas" name="Spread"/>
<combo_box.item label="Relajadas" name="Relaxed"/>
<combo_box.item label="Ambas señalan" name="PointBoth"/>
@@ -140,7 +140,7 @@ La duración máxima de una animación es de [MAX_LENGTH] segundos.
<text name="emote_label">
Expresión
</text>
- <combo_box left_delta="120" name="emote_combo" tool_tip="Controla qué hace la cara durante la animación" width="164">
+ <combo_box name="emote_combo" tool_tip="Controla qué hace la cara durante la animación">
<combo_box.item label="(ninguno)" name="[None]"/>
<combo_box.item label="Aaaaah" name="Aaaaah"/>
<combo_box.item label="Con miedo" name="Afraid"/>
@@ -162,17 +162,17 @@ La duración máxima de una animación es de [MAX_LENGTH] segundos.
<combo_box.item label="Guiño" name="Wink"/>
<combo_box.item label="Preocupación" name="Worry"/>
</combo_box>
- <text name="preview_label" width="250">
+ <text name="preview_label">
Vista previa mientras
</text>
- <combo_box left_delta="120" name="preview_base_anim" tool_tip="Compruebe cómo se comporta su animación a la vez que el avatar realiza acciones comunes." width="130">
+ <combo_box name="preview_base_anim" tool_tip="Compruebe cómo se comporta su animación a la vez que el avatar realiza acciones comunes.">
<combo_box.item label="De pie" name="Standing"/>
<combo_box.item label="Caminando" name="Walking"/>
<combo_box.item label="Sentado/a" name="Sitting"/>
<combo_box.item label="Volando" name="Flying"/>
</combo_box>
- <spinner label="Combinar (sec)" label_width="125" name="ease_in_time" tool_tip="Tiempo (en segundos) en el que se combinan las animaciones" width="192"/>
- <spinner bottom_delta="-20" label="Dejar de combinar (sec)" label_width="125" left="10" name="ease_out_time" tool_tip="Tiempo (en segundos) en el que dejan de combinarse las animaciones" width="192"/>
+ <spinner label="Combinar (sec)" name="ease_in_time" tool_tip="Tiempo (en segundos) en el que se combinan las animaciones"/>
+ <spinner label="Dejar de combinar (sec)" name="ease_out_time" tool_tip="Tiempo (en segundos) en el que dejan de combinarse las animaciones"/>
<button bottom_delta="-32" name="play_btn" tool_tip="Ejecutar tu animación"/>
<button name="pause_btn" tool_tip="Pausar tu animación"/>
<button label="" name="stop_btn" tool_tip="Parar la repetición de la animación"/>
@@ -180,8 +180,7 @@ La duración máxima de una animación es de [MAX_LENGTH] segundos.
<text name="bad_animation_text">
No se ha podido leer el archivo de la animación.
-Recomendamos usar archivos BVH exportados de
-Poser 4.
+Recomendamos usar archivos BVH exportados de Poser 4.
</text>
<button label="Subir ([AMOUNT] L$)" name="ok_btn"/>
<button label="Cancelar" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_land.xml b/indra/newview/skins/default/xui/es/floater_buy_land.xml
index 496e719c6dccce6cb8a04eeca2f197433d1aed3a..9a0a566a55b5bc802474c819f0c31028aff33eed 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_land.xml
@@ -41,8 +41,8 @@ Inténtelo seleccionando un área más pequeña.
El área seleccionada no tiene terreno público.
</floater.string>
<floater.string name="not_owned_by_you">
- Se ha seleccionado terreno propiedad de otro.
-Inténtelo seleccionando un área más pequeña.
+ Está seleccionado un terreno propiedad de otro Residente.
+Prueba a seleccionar un área más pequeña.
</floater.string>
<floater.string name="processing">
Procesando su compra...
diff --git a/indra/newview/skins/default/xui/es/floater_camera.xml b/indra/newview/skins/default/xui/es/floater_camera.xml
index 40c56037062d7ae368e1e2cbff868fded9e592b4..787c37e12c491c21f0dd384fa4e343957e1c1d19 100644
--- a/indra/newview/skins/default/xui/es/floater_camera.xml
+++ b/indra/newview/skins/default/xui/es/floater_camera.xml
@@ -9,6 +9,18 @@
<floater.string name="move_tooltip">
Mover la cámara arriba y abajo, izquierda y derecha
</floater.string>
+ <floater.string name="orbit_mode_title">
+ Orbital
+ </floater.string>
+ <floater.string name="pan_mode_title">
+ Panorámica
+ </floater.string>
+ <floater.string name="avatar_view_mode_title">
+ Posición de tu cámara
+ </floater.string>
+ <floater.string name="free_mode_title">
+ Centrar el objeto
+ </floater.string>
<panel name="controls">
<joystick_track name="cam_track_stick" tool_tip="Mueve la cámara arriba y abajo, a izquierda y derecha"/>
<panel name="zoom" tool_tip="Hacer zoom con la cámara en lo enfocado">
diff --git a/indra/newview/skins/default/xui/es/floater_event.xml b/indra/newview/skins/default/xui/es/floater_event.xml
index 81909e997ce403abbc804113c7987a8d6132c472..4bc52217966f2c0443ef3c29229ba53f78ee0829 100644
--- a/indra/newview/skins/default/xui/es/floater_event.xml
+++ b/indra/newview/skins/default/xui/es/floater_event.xml
@@ -9,6 +9,18 @@
<floater.string name="dont_notify">
No notificar
</floater.string>
+ <floater.string name="moderate">
+ Moderado
+ </floater.string>
+ <floater.string name="adult">
+ Adulto
+ </floater.string>
+ <floater.string name="general">
+ General
+ </floater.string>
+ <floater.string name="unknown">
+ desconocida
+ </floater.string>
<layout_stack name="layout">
<layout_panel name="profile_stack">
<text name="event_name">
@@ -21,12 +33,21 @@
Organizado por:
</text>
<text initial_value="(obteniendo)" name="event_runby"/>
+ <text name="event_date_label">
+ Fecha:
+ </text>
<text name="event_date">
10/10/2010
</text>
+ <text name="event_duration_label">
+ Duración:
+ </text>
<text name="event_duration">
1 hora
</text>
+ <text name="event_covercharge_label">
+ Entrada:
+ </text>
<text name="event_cover">
Gratis
</text>
@@ -36,6 +57,9 @@
<text name="event_location" value="SampleParcel, Name Long (145, 228, 26)"/>
<text name="rating_label" value="Calificación:"/>
<text name="rating_value" value="desconocida"/>
+ <expandable_text name="event_desc">
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+ </expandable_text>
</layout_panel>
<layout_panel name="button_panel">
<button name="create_event_btn" tool_tip="Crear el evento"/>
diff --git a/indra/newview/skins/default/xui/es/floater_god_tools.xml b/indra/newview/skins/default/xui/es/floater_god_tools.xml
index b604f7f46f18be83df640228280b47d94a965014..73187f208b3e5eea16897dfc0e5de55efef390ae 100644
--- a/indra/newview/skins/default/xui/es/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_god_tools.xml
@@ -2,7 +2,7 @@
<floater name="godtools floater" title="HERRAMIENTAS DE DIOS">
<tab_container name="GodTools Tabs">
<panel label="Red" name="grid">
- <button label="Expulsar a todos los usuarios" label_selected="Expulsar a todos los usuarios" name="Kick all users"/>
+ <button label="Expulsar a todos los Residentes" label_selected="Expulsar a todos los Residentes" name="Kick all users"/>
<button label="Vaciar los caches de visibilidad del mapa de la región" label_selected="Vaciar los caches de visibilidad del mapa de la región" name="Flush This Region's Map Visibility Caches"/>
</panel>
<panel label="Región" name="region">
diff --git a/indra/newview/skins/default/xui/es/floater_im.xml b/indra/newview/skins/default/xui/es/floater_im.xml
index e6b01a49464fd8541f55e76691ed837d496b0f63..3850b94fd67fd4ad678c88caa565b49148ef99fe 100644
--- a/indra/newview/skins/default/xui/es/floater_im.xml
+++ b/indra/newview/skins/default/xui/es/floater_im.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<multi_floater name="im_floater" title="Mensaje Instantáneo">
<string name="only_user_message">
- Usted es el único usuario en esta sesión.
+ Eres el único Residente en esta sesión.
</string>
<string name="offline_message">
[FIRST] [LAST] no está conectado.
@@ -31,7 +31,7 @@
Un moderador del grupo le ha desactivado el chat de texto.
</string>
<string name="add_session_event">
- No se ha podido añadir usuarios a la sesión de chat con [RECIPIENT].
+ No es posible añadir Residentes a la sesión de chat con [RECIPIENT].
</string>
<string name="message_session_event">
No se ha podido enviar su mensaje a la sesión de chat con [RECIPIENT].
diff --git a/indra/newview/skins/default/xui/es/floater_moveview.xml b/indra/newview/skins/default/xui/es/floater_moveview.xml
index 1269943879dd8be9fc505b5a76cf852079675261..7cb41d3f5bf402489d385552d7310da1d1f46246 100644
--- a/indra/newview/skins/default/xui/es/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/es/floater_moveview.xml
@@ -18,6 +18,15 @@
<string name="fly_back_tooltip">
Volar hacia atrás (cursor abajo o S)
</string>
+ <string name="walk_title">
+ Caminar
+ </string>
+ <string name="run_title">
+ Correr
+ </string>
+ <string name="fly_title">
+ Volar
+ </string>
<panel name="panel_actions">
<button label="" label_selected="" name="turn left btn" tool_tip="Girar a la izq. (cursor izq. o A)"/>
<button label="" label_selected="" name="turn right btn" tool_tip="Girar a la der. (cursor der. o D)"/>
@@ -30,6 +39,5 @@
<button label="" name="mode_walk_btn" tool_tip="Modo de caminar"/>
<button label="" name="mode_run_btn" tool_tip="Modo de correr"/>
<button label="" name="mode_fly_btn" tool_tip="Modo de volar"/>
- <button label="Dejar de volar" name="stop_fly_btn" tool_tip="Dejar de volar"/>
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_publish_classified.xml b/indra/newview/skins/default/xui/es/floater_publish_classified.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5eed89d52237a1f8c9d0fa8baf01e309b4e6c4a9
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_publish_classified.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="publish_classified" title="Publicación de clasificados">
+ <text name="explanation_text">
+ Tu anuncio clasificado se mostrará durante una semana a partir del dÃa en que se publicó.
+
+Recuerda, no se reembolsarán las cantidades abonadas por clasificados.
+ </text>
+ <spinner label="Precio por el anuncio:" name="price_for_listing" tool_tip="Precio por publicarlo." value="50"/>
+ <text name="l$_text" value="L$"/>
+ <text name="more_info_text">
+ Más información (enlace a ayuda de clasificados)
+ </text>
+ <button label="Publicar" name="publish_btn"/>
+ <button label="Cancelar" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_water.xml b/indra/newview/skins/default/xui/es/floater_water.xml
index 99968601375b7d2e715d37fecbf712a7334b41de..2c1f6cfbfb9a2b478a10a8344bcc372c0d8a56ad 100644
--- a/indra/newview/skins/default/xui/es/floater_water.xml
+++ b/indra/newview/skins/default/xui/es/floater_water.xml
@@ -7,7 +7,7 @@
<button label="Guardar" label_selected="Guardar" name="WaterSavePreset"/>
<button label="Borrar" label_selected="Borrar" name="WaterDeletePreset"/>
<tab_container name="Water Tabs">
- <panel label="Configuraciones" name="Settings">
+ <panel label="CONFIGURACIÓN" name="Settings">
<text name="BHText">
Color del agua
</text>
@@ -55,7 +55,7 @@
</text>
<button label="?" left="640" name="WaterBlurMultiplierHelp"/>
</panel>
- <panel label="Imagen" name="Waves">
+ <panel label="IMAGEN" name="Waves">
<text name="BHText">
Sentido de la onda grande
</text>
diff --git a/indra/newview/skins/default/xui/es/floater_windlight_options.xml b/indra/newview/skins/default/xui/es/floater_windlight_options.xml
index 0697f05553f7e42670f19f0438b284b25718d9f3..9bc37509513cd0d5c2416091129acd74b9e5262a 100644
--- a/indra/newview/skins/default/xui/es/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/es/floater_windlight_options.xml
@@ -6,9 +6,9 @@
<button label="Nuevo" label_selected="Nuevo" name="WLNewPreset"/>
<button label="Guardar" label_selected="Guardar" name="WLSavePreset"/>
<button label="Borrar" label_selected="Borrar" name="WLDeletePreset"/>
- <button font="SansSerifSmall" width="150" left_delta="90" label="Editor del ciclo de un dÃa" label_selected="Editor del ciclo de un dÃa" name="WLDayCycleMenuButton"/>
+ <button font="SansSerifSmall" label="Editor del ciclo de un dÃa" label_selected="Editor del ciclo de un dÃa" left_delta="90" name="WLDayCycleMenuButton" width="150"/>
<tab_container name="WindLight Tabs">
- <panel label="Atmósfera" name="Atmosphere">
+ <panel label="ATMÓSFERA" name="Atmosphere">
<text name="BHText">
Coloración
</text>
@@ -62,7 +62,7 @@
</text>
<button label="?" name="WLMaxAltitudeHelp"/>
</panel>
- <panel label="Iluminación" name="Lighting">
+ <panel label="LUZ" name="Lighting">
<text name="SLCText">
Color del Sol y de la Luna
</text>
@@ -118,11 +118,11 @@
</text>
<button label="?" name="WLStarBrightnessHelp"/>
</panel>
- <panel label="Nubes" name="Clouds">
+ <panel label="NUBES" name="Clouds">
<text name="WLCloudColorText">
Color de las nubes
</text>
- <button label="?" name="WLCloudColorHelp" left="190" />
+ <button label="?" left="190" name="WLCloudColorHelp"/>
<text name="BHText">
R
</text>
@@ -138,7 +138,7 @@
<text name="WLCloudColorText2">
Posición/Densidad de las nubes
</text>
- <button label="?" name="WLCloudDensityHelp" left="190"/>
+ <button label="?" left="190" name="WLCloudDensityHelp"/>
<text name="BHText5">
X
</text>
@@ -156,12 +156,12 @@
Altitud de las nubes
</text>
<button label="?" name="WLCloudScaleHelp"/>
- <text name="WLCloudDetailText" font="SansSerifSmall">
+ <text font="SansSerifSmall" name="WLCloudDetailText">
Detalle de las nubes
(Posición/Densidad)
</text>
<button label="?" name="WLCloudDetailHelp"/>
- <text name="BHText8" bottom="-113">
+ <text bottom="-113" name="BHText8">
X
</text>
<text name="BHText9">
@@ -182,7 +182,7 @@
<button label="?" name="WLCloudScrollYHelp"/>
<check_box label="Bloquear" name="WLCloudLockY"/>
<check_box label="Incluir nubes clásicas" name="DrawClassicClouds"/>
- <button label="?" name="WLClassicCloudsHelp" left="618"/>
+ <button label="?" left="618" name="WLClassicCloudsHelp"/>
</panel>
</tab_container>
<string name="WLDefaultSkyNames">
diff --git a/indra/newview/skins/default/xui/es/floater_world_map.xml b/indra/newview/skins/default/xui/es/floater_world_map.xml
index a8dc05703c0b89cd3cb0cac309984f2d06fd3820..38a12002f5d10dc96ae97c9c5960f66462cb9bc5 100644
--- a/indra/newview/skins/default/xui/es/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/es/floater_world_map.xml
@@ -5,22 +5,37 @@
Leyenda
</text>
</panel>
- <panel>
+ <panel name="layout_panel_2">
+ <button name="Show My Location" tool_tip="Centrar el mapa en la posición de mi avatar"/>
<text name="me_label">
Yo
</text>
<text name="person_label">
Persona
</text>
+ <text name="infohub_label">
+ Punto de Info
+ </text>
+ <text name="land_sale_label">
+ Venta de terreno
+ </text>
<text name="by_owner_label">
por el propietario
</text>
<text name="auction_label">
subasta de terreno
</text>
+ <button name="Go Home" tool_tip="Teleportar a mi Base"/>
+ <text name="Home_label">
+ Base
+ </text>
+ <text name="events_label">
+ Eventos:
+ </text>
<text name="pg_label">
General
</text>
+ <check_box initial_value="verdadero" name="event_mature_chk"/>
<text name="mature_label">
Moderado
</text>
@@ -28,7 +43,28 @@
Adulto
</text>
</panel>
- <panel>
+ <panel name="layout_panel_3">
+ <text name="find_on_map_label">
+ Encontrar en el mapa
+ </text>
+ </panel>
+ <panel name="layout_panel_4">
+ <combo_box label="Amigos online" name="friend combo" tool_tip="Ver a los amigos en el mapa">
+ <combo_box.item label="Mis amigos conectados" name="item1"/>
+ </combo_box>
+ <combo_box label="Mis hitos" name="landmark combo" tool_tip="Hito a ver en el mapa">
+ <combo_box.item label="Mis hitos" name="item1"/>
+ </combo_box>
+ <search_editor label="Regiones alfabéticamente" name="location" tool_tip="Escribe el nombre de una región"/>
+ <button label="Encontrar" name="DoSearch" tool_tip="Buscar una región"/>
<button name="Clear" tool_tip="Limpia las marcas y actualiza el mapa"/>
+ <button label="Teleportar" name="Teleport" tool_tip="Teleportar a la localización seleccionada"/>
+ <button label="Copiar la SLurl" name="copy_slurl" tool_tip="Copiar la SLurl de esta posición para usarla en una web."/>
+ <button label="Ver lo elegido" name="Show Destination" tool_tip="Centrar el mapa en la localización seleccionada"/>
+ </panel>
+ <panel name="layout_panel_5">
+ <text name="zoom_label">
+ Zoom
+ </text>
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/es/menu_object.xml b/indra/newview/skins/default/xui/es/menu_object.xml
index 18b6363bbb34d85af6ab233fa855203222d4cc57..1677b9461ee1b4ac69de082c12ac1e8383242efa 100644
--- a/indra/newview/skins/default/xui/es/menu_object.xml
+++ b/indra/newview/skins/default/xui/es/menu_object.xml
@@ -5,6 +5,7 @@
<menu_item_call label="Construir" name="Build"/>
<menu_item_call label="Abrir" name="Open"/>
<menu_item_call label="Sentarse aquÃ" name="Object Sit"/>
+ <menu_item_call label="Levantarme" name="Object Stand Up"/>
<menu_item_call label="Perfil del objeto" name="Object Inspect"/>
<menu_item_call label="Acercar el zoom" name="Zoom In"/>
<context_menu label="Ponerme â–¶" name="Put On">
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index f99bb277cbae049bf9645e0e1724c02716a10960..db1cc1caead970f8865882db5169b9afcb27cccd 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -106,7 +106,7 @@ Asegúrate de que tu conexión a internet está funcionando adecuadamente.
</notification>
<notification name="FriendsAndGroupsOnly">
Quienes no sean tus amigos no sabrán que has elegido ignorar sus llamadas y mensajes instantáneos.
- <usetemplate name="okbutton" yestext="SÃ"/>
+ <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="GrantModifyRights">
Al conceder permisos de modificación a otro Residente, le estás permitiendo cambiar, borrar o tomar CUALQUIER objeto que tengas en el mundo. Sé MUY cuidadoso al conceder este permiso.
@@ -443,7 +443,6 @@ El objeto debe de haber sido borrado o estar fuera de rango ('out of range&
<notification name="UnsupportedHardware">
Debes saber que tu ordenador no cumple los requisitos mÃnimos para la utilización de [APP_NAME]. Puede que experimentes un rendimiento muy bajo. Desafortunadamente, [SUPPORT_SITE] no puede dar asistencia técnica a sistemas con una configuración no admitida.
-MINSPECS
¿Ir a [_URL] para más información?
<url name="url" option="0">
http://secondlife.com/support/sysreqs.php?lang=es
@@ -1309,8 +1308,8 @@ Esta actualización no es obligatoria, pero te sugerimos instalarla para mejorar
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
<notification name="ConfirmKick">
- ¿DE VERDAD quiere expulsar a todos los usuarios de este grid?
- <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Expulsar a todos los usuarios"/>
+ ¿Quieres realmente expulsar a todos los Residentes de la cuadrÃcula?
+ <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Expulsar a todos los Residentes"/>
</notification>
<notification name="MuteLinden">
Lo sentimos, pero no puedes ignorar a un Linden.
@@ -1351,7 +1350,7 @@ Se ocultará el chat y los mensajes instantáneos (éstos recibirán tu Respue
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="KickUser">
- ¿Con qué mensaje se expulsará a este usuario?
+ ¿Con qué mensaje quieres expulsar a este Residente?
<form name="form">
<input name="message">
Un administrador le ha desconectado.
@@ -1371,7 +1370,7 @@ Se ocultará el chat y los mensajes instantáneos (éstos recibirán tu Respue
</form>
</notification>
<notification name="FreezeUser">
- ¿Con qué mensaje se congelará a este usuario?
+ ¿Con qué mensaje quieres congelar a este Residente?
<form name="form">
<input name="message">
Ha sido usted congelado. No puede moverse o escribir en el chat. Un administrador contactará con usted a través de un mensaje instantáneo (MI).
@@ -1381,7 +1380,7 @@ Se ocultará el chat y los mensajes instantáneos (éstos recibirán tu Respue
</form>
</notification>
<notification name="UnFreezeUser">
- ¿Con qué mensaje se descongelará a este usuario?
+ ¿Con qué mensaje quieres congelar a este Residente?
<form name="form">
<input name="message">
Ya no está usted congelado.
@@ -1401,7 +1400,7 @@ Se ocultará el chat y los mensajes instantáneos (éstos recibirán tu Respue
</form>
</notification>
<notification name="OfferTeleportFromGod">
- ¿Convocar a este usuario a su posición?
+ ¿Obligar a este Residente a ir a tu localización?
<form name="form">
<input name="message">
Ven conmigo a [REGION]
@@ -1431,11 +1430,11 @@ Se ocultará el chat y los mensajes instantáneos (éstos recibirán tu Respue
</form>
</notification>
<notification label="Cambiar un estado Linden" name="ChangeLindenEstate">
- Va a hacer cambios en un estado propiedad de Linden (mainland, grid teen, orientación, etc.).
+ Estás a punto de cambiar un estado propiedad de Linden (continente, teen grid, orientación, etc.).
-Esto es EXTREMADAMENTE PELIGROSO, porque puede afectar radicalmente al funcionamiento de los usuarios. En mainland, se cambiarán miles de regiones, y se provocará un colapso en el espacio del servidor.
+Esto es EXTREMADAMENTE PELIGROSO porque puede afectar en gran manera la experiencia de los Residentes. En el Continente, cambiará miles de regiones y hará que se trastorne el servidor.
-¿Proceder?
+¿Continuar?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
<notification label="Cambiar el acceso a un estado Linden" name="ChangeLindenAccess">
@@ -2424,14 +2423,6 @@ Si no confias en este objeto y en su creador, deberÃas rehusar esta petición.
<button name="Ignore" text="Ignorar"/>
</form>
</notification>
- <notification name="ScriptToast">
- El '[TITLE]' de [FIRST] [LAST] está esperando una respuesta del usuario.
- <form name="form">
- <button name="Open" text="Abrir el diálogo"/>
- <button name="Ignore" text="Ignorar"/>
- <button name="Block" text="Ignorar"/>
- </form>
- </notification>
<notification name="BuyLindenDollarSuccess">
¡Gracias por tu pago!
@@ -2557,7 +2548,7 @@ Por tu seguridad, serán bloqueadas durante unos segundos.
</notification>
<notification name="ConfirmCloseAll">
¿Seguro que quieres cerrar todos los MI?
- <usetemplate name="okcancelignore" notext="Cancelar" yestext="OK"/>
+ <usetemplate ignoretext="Confirmar antes de cerrar todos los MIs" name="okcancelignore" notext="Cancelar" yestext="OK"/>
</notification>
<notification name="AttachmentSaved">
Se ha guardado el adjunto.
diff --git a/indra/newview/skins/default/xui/es/panel_classified_info.xml b/indra/newview/skins/default/xui/es/panel_classified_info.xml
index d46eadde486863e710c41f5712182c8751893e46..f583cf29575c31fa8d1dc5356510e1768fb0b9da 100644
--- a/indra/newview/skins/default/xui/es/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/es/panel_classified_info.xml
@@ -3,16 +3,46 @@
<panel.string name="l$_price">
[PRICE] L$
</panel.string>
+ <panel.string name="click_through_text_fmt">
+ [TELEPORT] teleportes, [MAP] mapa, [PROFILE] perfil
+ </panel.string>
+ <panel.string name="date_fmt">
+ [day,datetime,slt]/[mthnum,datetime,slt]/[year,datetime,slt]
+ </panel.string>
+ <panel.string name="auto_renew_on">
+ Activada
+ </panel.string>
+ <panel.string name="auto_renew_off">
+ Desactivada
+ </panel.string>
<text name="title" value="Información del clasificado"/>
<scroll_container name="profile_scroll">
<panel name="scroll_content_panel">
<text_editor name="classified_name" value="[nombre]"/>
+ <text name="classified_location_label" value="Localización:"/>
<text_editor name="classified_location" value="[cargando...]"/>
+ <text name="content_type_label" value="Tipo de contenido:"/>
<text_editor name="content_type" value="[tipo de contenido]"/>
+ <text name="category_label" value="CategorÃa:"/>
<text_editor name="category" value="[categorÃa]"/>
- <check_box label="Renovar automáticamente cada semana" name="auto_renew"/>
- <text_editor name="price_for_listing" tool_tip="Precio por publicarlo."/>
- <text_editor name="classified_desc" value="[descripción]"/>
+ <text name="creation_date_label" value="Fecha de creación:"/>
+ <text_editor name="creation_date" tool_tip="Fecha de creación" value="[date]"/>
+ <text name="price_for_listing_label" value="Precio por publicarlo:"/>
+ <text_editor name="price_for_listing" tool_tip="Precio por publicarlo." value="[price]"/>
+ <layout_stack name="descr_stack">
+ <layout_panel name="clickthrough_layout_panel">
+ <text name="click_through_label" value="Clics:"/>
+ <text_editor name="click_through_text" tool_tip="Información sobre Click through" value="[clicks]"/>
+ </layout_panel>
+ <layout_panel name="price_layout_panel">
+ <text name="auto_renew_label" value="Renovación:"/>
+ <text name="auto_renew" value="Activada"/>
+ </layout_panel>
+ <layout_panel name="descr_layout_panel">
+ <text name="classified_desc_label" value="Descripción:"/>
+ <text_editor name="classified_desc" value="[description]"/>
+ </layout_panel>
+ </layout_stack>
</panel>
</scroll_container>
<panel name="buttons">
diff --git a/indra/newview/skins/default/xui/es/panel_edit_classified.xml b/indra/newview/skins/default/xui/es/panel_edit_classified.xml
index e612104b3f79029947ad1000f61a791194b9cfa5..7afa50c0a246333e8220dad258f207323de9306e 100644
--- a/indra/newview/skins/default/xui/es/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_classified.xml
@@ -3,12 +3,20 @@
<panel.string name="location_notice">
(se actualizará tras guardarlo)
</panel.string>
+ <string name="publish_label">
+ Publicar
+ </string>
+ <string name="save_label">
+ Guardar
+ </string>
<text name="title">
Editar el clasificado
</text>
<scroll_container name="profile_scroll">
<panel name="scroll_content_panel">
- <icon label="" name="edit_icon" tool_tip="Pulsa para elegir una imagen"/>
+ <panel name="snapshot_panel">
+ <icon label="" name="edit_icon" tool_tip="Pulsa para elegir una imagen"/>
+ </panel>
<text name="Name:">
TÃtulo:
</text>
@@ -22,12 +30,19 @@
cargando...
</text>
<button label="Configurarlo en esta localización" name="set_to_curr_location_btn"/>
+ <text name="category_label" value="CategorÃa:"/>
+ <text name="content_type_label" value="Tipo de contenido:"/>
+ <icons_combo_box label="Contenido general" name="content_type">
+ <icons_combo_box.item label="Contenido moderado" name="mature_ci" value="Moderado"/>
+ <icons_combo_box.item label="Contenido general" name="pg_ci" value="General"/>
+ </icons_combo_box>
+ <text name="price_for_listing_label" value="Precio por publicarlo:"/>
<spinner label="L$" name="price_for_listing" tool_tip="Precio por publicarlo." value="50"/>
<check_box label="Renovar automáticamente cada semana" name="auto_renew"/>
</panel>
</scroll_container>
<panel label="bottom_panel" name="bottom_panel">
- <button label="Guardar" name="save_changes_btn"/>
+ <button label="[LABEL]" name="save_changes_btn"/>
<button label="Cancelar" name="cancel_btn"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
index c3d5b017ad7b53e26208eff556e6298c9f90f4ed..7d4db6a630c22eb0fb771ef1e907ee25205b334e 100644
--- a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
@@ -13,7 +13,7 @@
<layout_panel name="share_btn_panel">
<button label="Compartir" name="share_btn"/>
</layout_panel>
- <layout_panel name="share_btn_panel">
+ <layout_panel name="pay_btn_panel">
<button label="Pagar" name="pay_btn"/>
</layout_panel>
<layout_panel name="call_btn_panel">
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml
index 03c449da93393c06a6120cdf2f188de8b555a874..55e3df5a0a7e2c2b13f3041f7420a3cda6e62145 100644
--- a/indra/newview/skins/default/xui/es/panel_people.xml
+++ b/indra/newview/skins/default/xui/es/panel_people.xml
@@ -7,6 +7,8 @@
<string name="no_friends" value="No hay amigos"/>
<string name="people_filter_label" value="Filtrar a la gente"/>
<string name="groups_filter_label" value="Filtrar a los grupos"/>
+ <string name="no_filtered_groups_msg" value="[secondlife:///app/search/groups Intenta encontrar el grupo con una búsqueda]"/>
+ <string name="no_groups_msg" value="[secondlife:///app/search/groups Intenta encontrar grupos a los que unirte.]"/>
<filter_editor label="Filtrar" name="filter_input"/>
<tab_container name="tabs">
<panel label="CERCANÃA" name="nearby_panel">
diff --git a/indra/newview/skins/default/xui/es/panel_place_profile.xml b/indra/newview/skins/default/xui/es/panel_place_profile.xml
index 2c873ef464cecb84fcb856c2a46e4af836b0cd73..6fe7895d4591371a941bc615d8c5d5ca14992d49 100644
--- a/indra/newview/skins/default/xui/es/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/es/panel_place_profile.xml
@@ -70,10 +70,17 @@
<accordion_tab name="region_information_tab" title="Región">
<panel name="region_information_panel">
<text name="region_name_label" value="Región:"/>
+ <text name="region_name" value="Mooseland"/>
<text name="region_type_label" value="Tipo:"/>
+ <text name="region_type" value="Moose"/>
<text name="region_rating_label" value="Calificación:"/>
+ <text name="region_rating" value="Adulto"/>
<text name="region_owner_label" value="Propietario:"/>
+ <text name="region_owner" value="moose Van Moose"/>
<text name="region_group_label" value="Grupo:"/>
+ <text name="region_group">
+ The Mighty Moose of mooseville soundvillemoose
+ </text>
<button label="Región/Estado" name="region_info_btn"/>
</panel>
</accordion_tab>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
index 17e3b45beb48b1ba021992dd125cb610e99eb1fb..a7e5429adcbfee2e8bfeaacde493362a843cf972 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Chat de texto" name="chat">
<text name="font_size">
- Font size:
+ Tamaño de la fuente:
</text>
<radio_group name="chat_font_size">
<radio_item label="Disminuir" name="radio" value="0"/>
@@ -9,7 +9,7 @@
<radio_item label="Aumentar" name="radio3" value="2"/>
</radio_group>
<text name="font_colors">
- Font colors:
+ Colores de la fuente:
</text>
<color_swatch label="Usted" name="user"/>
<text name="text_box1">
diff --git a/indra/newview/skins/default/xui/es/panel_region_estate.xml b/indra/newview/skins/default/xui/es/panel_region_estate.xml
index 53d05cf2c906900e3f69755ed93171aa41ba9b20..c51c3815d1146fcc5b7419c6331cf9cb1ef695fe 100644
--- a/indra/newview/skins/default/xui/es/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_estate.xml
@@ -39,7 +39,7 @@
</string>
<button label="?" name="abuse_email_address_help"/>
<button label="Aplicar" name="apply_btn"/>
- <button label="Echar usuarios del estado..." name="kick_user_from_estate_btn"/>
+ <button label="Expulsar a un Residente del Estado..." name="kick_user_from_estate_btn"/>
<button label="Enviar un mensaje al estado..." name="message_estate_btn"/>
<text name="estate_manager_label">
Administradores del estado:
diff --git a/indra/newview/skins/default/xui/es/panel_region_general.xml b/indra/newview/skins/default/xui/es/panel_region_general.xml
index ca8da6ccaf42aa1e7edc8e22f507ddf643a8302e..54b60b276c06253ff20dc7725f6426e15ef54509 100644
--- a/indra/newview/skins/default/xui/es/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_general.xml
@@ -19,35 +19,26 @@
desconocido
</text>
<check_box label="No permitir modificar el terreno" name="block_terraform_check"/>
- <button label="?" name="terraform_help"/>
<check_box label="Prohibir volar" name="block_fly_check"/>
- <button label="?" name="fly_help"/>
<check_box label="Permitir el daño" name="allow_damage_check"/>
- <button label="?" name="damage_help"/>
<check_box label="Impedir los 'empujones'" name="restrict_pushobject"/>
- <button label="?" name="restrict_pushobject_help"/>
<check_box label="Permitir la reventa del terreno" name="allow_land_resell_check"/>
- <button label="?" name="land_resell_help"/>
<check_box label="Permitir unir/dividir el terreno" name="allow_parcel_changes_check"/>
- <button label="?" name="parcel_changes_help"/>
- <check_box label="Bloquear el mostrar el terreno en la búsqueda." name="block_parcel_search_check" tool_tip="Permitir que la gente vea esta región y sus parcelas en los resultados de la búsqueda."/>
- <button label="?" name="parcel_search_help"/>
- <spinner label="Nº máximo de avatares" name="agent_limit_spin" label_width="120" width="180"/>
- <button label="?" name="agent_limit_help"/>
- <spinner label="Plus de objetos" name="object_bonus_spin" label_width="120" width="180"/>
- <button label="?" name="object_bonus_help"/>
+ <check_box label="Bloquear el mostrar el terreno en
+la búsqueda." name="block_parcel_search_check" tool_tip="Permitir que la gente vea esta región y sus parcelas en los resultados de la búsqueda."/>
+ <spinner label="Nº máximo de avatares" label_width="120" name="agent_limit_spin" width="180"/>
+ <spinner label="Plus de objetos" label_width="120" name="object_bonus_spin" width="180"/>
<text label="Calificación" name="access_text">
Calificación:
</text>
- <combo_box label="'Mature'" name="access_combo">
- <combo_box.item label="'Adult'" name="Adult"/>
- <combo_box.item label="'Mature'" name="Mature"/>
- <combo_box.item label="'PG'" name="PG"/>
- </combo_box>
- <button label="?" name="access_help"/>
+ <icons_combo_box label="'Mature'" name="access_combo">
+ <icons_combo_box.item label="'Adult'" name="Adult" value="42"/>
+ <icons_combo_box.item label="'Mature'" name="Mature" value="21"/>
+ <icons_combo_box.item label="'PG'" name="PG" value="13"/>
+ </icons_combo_box>
<button label="Aplicar" name="apply_btn"/>
- <button label="Teleportar a su Base a un usuario..." name="kick_btn"/>
- <button label="Teleportar a su Base a todos los usuarios..." name="kick_all_btn"/>
- <button label="Enviar un mensaje a toda la región..." name="im_btn" width="250" />
+ <button label="Teleportar a su Base a un Residente..." name="kick_btn"/>
+ <button label="Teleportar a sus Bases a todos los Residentes..." name="kick_all_btn"/>
+ <button label="Enviar un mensaje a toda la región..." name="im_btn" width="250"/>
<button label="Administrar el Punto de Teleporte..." name="manage_telehub_btn" width="210"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_general_layout.xml b/indra/newview/skins/default/xui/es/panel_region_general_layout.xml
index 89ad5549c8662f97f92ed3b106dd20eb6c2d5b34..9ff88e2f79c7467e563e4cb9dead31e22c01dd5f 100644
--- a/indra/newview/skins/default/xui/es/panel_region_general_layout.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_general_layout.xml
@@ -36,8 +36,8 @@
<combo_box.item label="General" name="PG"/>
</combo_box>
<button label="Aplicar" name="apply_btn"/>
- <button label="Teleportar a su Base a un usuario..." name="kick_btn"/>
- <button label="Teleportar a sus Bases a todos los usuarios..." name="kick_all_btn"/>
+ <button label="Teleportar a su Base a un Residente..." name="kick_btn"/>
+ <button label="Teleportar a sus Bases a todos los Residentes..." name="kick_all_btn"/>
<button label="Enviar un mensaje a toda la región..." name="im_btn"/>
<button label="Administrar el Punto de Teleporte..." name="manage_telehub_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_texture.xml b/indra/newview/skins/default/xui/es/panel_region_texture.xml
index 83c22d20ebdaa45898cd0edf6254e9acd86aee8d..047e8f2f30605b4538c5ba6cebfbfcaeadeb95ba 100644
--- a/indra/newview/skins/default/xui/es/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_texture.xml
@@ -25,16 +25,16 @@
Rangos de la elevación de la textura
</text>
<text name="height_text_lbl6">
- Suroeste
+ Noroeste
</text>
<text name="height_text_lbl7">
- Noroeste
+ Noreste
</text>
<text name="height_text_lbl8">
- Sureste
+ Suroeste
</text>
<text name="height_text_lbl9">
- Noreste
+ Sureste
</text>
<spinner label="Baja" name="height_start_spin_0"/>
<spinner label="Baja" name="height_start_spin_1"/>
diff --git a/indra/newview/skins/default/xui/es/panel_status_bar.xml b/indra/newview/skins/default/xui/es/panel_status_bar.xml
index d4404fd9b53e03e7fbe3f3e8b4efd2474eb6f2d5..1afa68106ef99448086e5e65b9bec17a25477618 100644
--- a/indra/newview/skins/default/xui/es/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_status_bar.xml
@@ -22,7 +22,7 @@
[AMT] L$
</panel.string>
<button label="" label_selected="" name="buycurrency" tool_tip="Mi saldo"/>
- <button label="Comprar L$" name="buyL" tool_tip="Pulsa para comprar más L$"/>
+ <button label="Comprar" name="buyL" tool_tip="Pulsa para comprar más L$"/>
<text name="TimeText" tool_tip="Hora actual (PacÃfico)">
24:00 AM PST
</text>
diff --git a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
index 0cd3b40ca6c3a9c7ebc9777a637294822a71a11b..923201e4f30cabbf3afda608c999d462552840c9 100644
--- a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
@@ -38,16 +38,41 @@
</panel.string>
<text name="title" value="Perfil del objeto"/>
<text name="where" value="(en el mundo)"/>
- <panel label="">
+ <panel label="" name="properties_panel">
+ <text name="Name:">
+ Nombre:
+ </text>
+ <text name="Description:">
+ Descripción:
+ </text>
<text name="CreatorNameLabel">
Creador:
</text>
<text name="Creator Name">
Erica Linden
</text>
+ <text name="Owner:">
+ Propietario:
+ </text>
+ <text name="Owner Name">
+ Erica Linden
+ </text>
<text name="Group_label">
Grupo:
</text>
+ <button name="button set group" tool_tip="Elige un grupo con el que compartir los permisos de este objeto"/>
+ <name_box initial_value="Cargando..." name="Group Name Proxy"/>
+ <button label="Transferir" label_selected="Transferir" name="button deed" tool_tip="La transferencia entrega este objeto con los permisos del próximo propietario. Los objetos compartidos por el grupo pueden ser transferidos por un oficial del grupo."/>
+ <text name="label click action">
+ Pulsa para:
+ </text>
+ <combo_box name="clickaction">
+ <combo_box.item label="Tocarlo (por defecto)" name="Touch/grab(default)"/>
+ <combo_box.item label="Sentarme en el objeto" name="Sitonobject"/>
+ <combo_box.item label="Comprar el objeto" name="Buyobject"/>
+ <combo_box.item label="Pagar el objeto" name="Payobject"/>
+ <combo_box.item label="Abrir" name="Open"/>
+ </combo_box>
<panel name="perms_inv">
<text name="perm_modify">
Puedes modificar este objeto
@@ -55,20 +80,27 @@
<text name="Anyone can:">
Cualquiera:
</text>
- <check_box label="Copiarlo" name="checkbox allow everyone copy"/>
- <check_box label="Moverlo" name="checkbox allow everyone move"/>
+ <check_box label="Copiar" name="checkbox allow everyone copy"/>
+ <check_box label="Mover" name="checkbox allow everyone move"/>
<text name="GroupLabel">
Grupo:
</text>
- <check_box label="Compartir" name="checkbox share with group" tool_tip="Permite que todos los miembros del grupo compartan tus permisos de modificación en este objeto. Debes transferirlo para activar las restricciones según los roles."/>
+ <check_box label="Compartir" name="checkbox share with group" tool_tip="Permite que todos los miembros del grupo compartan tus permisos de modificación de este objeto. Debes transferirlo para activar las restricciones según los roles."/>
<text name="NextOwnerLabel">
Próximo propietario:
</text>
- <check_box label="Modificarlo" name="checkbox next owner can modify"/>
- <check_box label="Copiarlo" name="checkbox next owner can copy"/>
- <check_box label="Transferirlo" name="checkbox next owner can transfer" tool_tip="El próximo propietario puede dar o revender este objeto"/>
+ <check_box label="Modificar" name="checkbox next owner can modify"/>
+ <check_box label="Copiar" name="checkbox next owner can copy"/>
+ <check_box label="Transferir" name="checkbox next owner can transfer" tool_tip="El próximo propietario puede dar o revender este objeto"/>
</panel>
<check_box label="En venta" name="checkbox for sale"/>
+ <combo_box name="sale type">
+ <combo_box.item label="Copiar" name="Copy"/>
+ <combo_box.item label="Contenidos" name="Contents"/>
+ <combo_box.item label="Original" name="Original"/>
+ </combo_box>
+ <spinner label="Precio: L$" name="Edit Cost"/>
+ <check_box label="Mostrar en la búsqueda" name="search_check" tool_tip="Permitir que la gente vea este objeto en los resultados de la búsqueda"/>
<text name="B:">
B:
</text>
@@ -92,5 +124,6 @@
<button label="Abrir" name="open_btn"/>
<button label="Pagar" name="pay_btn"/>
<button label="Comprar" name="buy_btn"/>
+ <button label="Detalles" name="details_btn"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 619094bbfa86fddca35b119926e78569007cb16d..6aca1439aad1c1551008317ec87d43e0a7b28cab 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -164,6 +164,7 @@
Pulsa para ejecutar el comando secondlife://
</string>
<string name="CurrentURL" value="URL actual: [CurrentURL]"/>
+ <string name="TooltipPrice" value="[PRICE] L$"/>
<string name="SLurlLabelTeleport">
Teleportarse a
</string>
@@ -737,6 +738,9 @@
<string name="invalid">
inválido/a
</string>
+ <string name="NewWearable">
+ Nuevo [WEARABLE_ITEM]
+ </string>
<string name="next">
Siguiente
</string>
@@ -1435,6 +1439,9 @@
<string name="PanelContentsNewScript">
Script nuevo
</string>
+ <string name="BusyModeResponseDefault">
+ El Residente al que has enviado un mensaje ha solicitado que no se le moleste porque está en modo ocupado. Podrá ver tu mensaje más adelante, ya que éste aparecerá en su panel de MI.
+ </string>
<string name="MuteByName">
(por el nombre)
</string>
diff --git a/indra/newview/skins/default/xui/es/teleport_strings.xml b/indra/newview/skins/default/xui/es/teleport_strings.xml
index 0a605277f29fc48fa2aaf5c87d4b767b36534116..7e7ed6202fda04c7da198af99d12401e16c4dc08 100644
--- a/indra/newview/skins/default/xui/es/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/es/teleport_strings.xml
@@ -60,6 +60,9 @@ Vuelva a intentarlo en un momento.
<message name="completing">
Completando el teleporte.
</message>
+ <message name="completed_from">
+ Teleporte realizado desde [T_SLURL]
+ </message>
<message name="resolving">
Especificando el destino.
</message>
diff --git a/indra/newview/skins/default/xui/fr/panel_place_profile.xml b/indra/newview/skins/default/xui/fr/panel_place_profile.xml
index f2bdb3d745ab89b5e992605afd573ab6acf90715..598e94166e88fe3e175145342f99f299f1b418d0 100644
--- a/indra/newview/skins/default/xui/fr/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_place_profile.xml
@@ -18,16 +18,16 @@
<string name="all_residents_text" value="Tous les résidents"/>
<string name="group_text" value="Groupe"/>
<string name="can_resell">
- Le terrain acheté dans cette région peut être revendu.
+ Le terrain acheté dans la région peut être revendu.
</string>
<string name="can_not_resell">
- Le terrain acheté dans cette région ne peut pas être revendu.
+ Le terrain acheté dans la région ne peut pas être revendu.
</string>
<string name="can_change">
- Le terrain acheté dans cette région peut être fusionné ou divisé.
+ Le terrain acheté dans la région peut être fusionné ou divisé.
</string>
<string name="can_not_change">
- Le terrain acheté dans cette région ne peut pas être fusionné ou divisé.
+ Le terrain acheté dans la région ne peut être fusionné ou divisé.
</string>
<string name="server_update_text">
Les informations sur le lieu ne sont pas disponibles sans mise à jour du serveur.
diff --git a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
index cd1d0c48868cdee1e2ad5f0f7da286bdd4b1996e..a30306d116ad3ddf62942895d9872398e01ebe21 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
@@ -70,13 +70,12 @@ toutes les parcelles du domaine.
Le terrain acheté dans cette région peut être revendu.
</string>
<string name="can_not_resell">
- Le terrain acheté dans cette région ne peut pas être revendu.
+ Le terrain acheté dans la région ne peut pas être revendu.
</string>
<string name="can_change">
- Le terrain acheté dans cette région peut être fusionné ou divisé.
+ Le terrain acheté dans la région peut être fusionné ou divisé.
</string>
<string name="can_not_change">
- Le terrain acheté dans cette région ne peut pas être fusionné ou
-divisé.
+ Le terrain acheté dans la région ne peut être fusionné ou divisé.
</string>
</panel>
diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml
index 4c82475a6f40fbf33810791786d7ae06a0ccab9e..23232208725684e6d5c4d4fefaef8da47f68048f 100644
--- a/indra/newview/skins/default/xui/it/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_about_land.xml
@@ -82,9 +82,9 @@ Vai al menu Mondo > Informazioni sul terreno oppure seleziona un altro appezz
Gruppo:
</text>
<text left="119" name="GroupText" width="227"/>
- <button label="Imposta..." label_selected="Imposta..." name="Set..."/>
+ <button label="Imposta" name="Set..."/>
<check_box label="Permetti cessione al gruppo" left="119" name="check deed" tool_tip="Un funzionario del gruppo può cedere questa terra al gruppo stesso cosicchè essa sarà  supportata dalle terre del gruppo."/>
- <button label="Cedi..." label_selected="Cedi..." name="Deed..." tool_tip="Puoi solo offrire terra se sei un funzionario del gruppo selezionato."/>
+ <button label="Cedi" name="Deed..." tool_tip="Puoi solo offrire terra se sei un funzionario del gruppo selezionato."/>
<check_box label="Il proprietario fa un contributo con la cessione" left="119" name="check contrib" tool_tip="Quando la terra è ceduta al gruppo, il proprietario precedente contribuisce con abbastanza allocazione di terra per supportarlo."/>
<text name="For Sale:">
In vendita:
@@ -126,11 +126,11 @@ Vai al menu Mondo > Informazioni sul terreno oppure seleziona un altro appezz
0
</text>
<button label="Acquista il terreno..." label_selected="Acquista il terreno..." left="130" name="Buy Land..." width="125"/>
- <button label="Acquista per il gruppo..." label_selected="Acquista per il gruppo..." name="Buy For Group..."/>
+ <button label="Acquista per il gruppo" name="Buy For Group..."/>
<button label="Compra pass..." label_selected="Compra pass..." left="130" name="Buy Pass..." tool_tip="Un pass ti da un accesso temporaneo in questo territorio." width="125"/>
- <button label="Abbandona la terra..." label_selected="Abbandona la terra..." name="Abandon Land..."/>
- <button label="Reclama la terra..." label_selected="Reclama la terra..." name="Reclaim Land..."/>
- <button label="Vendita Linden..." label_selected="Vendita Linden..." name="Linden Sale..." tool_tip="La terra deve essere posseduta, con contenuto impostato, e non già messa in asta."/>
+ <button label="Abbandona la terra" name="Abandon Land..."/>
+ <button label="Reclama la terra" name="Reclaim Land..."/>
+ <button label="Vendita Linden" name="Linden Sale..." tool_tip="La terra deve essere posseduta, con contenuto impostato, e non già messa in asta."/>
</panel>
<panel label="COVENANT" name="land_covenant_panel">
<panel.string name="can_resell">
@@ -231,7 +231,7 @@ o suddivisa.
[COUNT]
</text>
<button label="Mostra" label_selected="Mostra" name="ShowOwner" right="-135" width="60"/>
- <button label="Restituisci..." label_selected="Restituisci..." name="ReturnOwner..." right="-10" tool_tip="Restituisci gli oggetti ai loro proprietari." width="119"/>
+ <button label="Restituisci" name="ReturnOwner..." right="-10" tool_tip="Restituisci gli oggetti ai loro proprietari." width="119"/>
<text left="14" name="Set to group:" width="180">
Imposta al gruppo:
</text>
@@ -239,7 +239,7 @@ o suddivisa.
[COUNT]
</text>
<button label="Mostra" label_selected="Mostra" name="ShowGroup" right="-135" width="60"/>
- <button label="Restituisci..." label_selected="Restituisci..." name="ReturnGroup..." right="-10" tool_tip="Restituisci gli oggetti ai loro proprietari." width="119"/>
+ <button label="Restituisci" name="ReturnGroup..." right="-10" tool_tip="Restituisci gli oggetti ai loro proprietari." width="119"/>
<text left="14" name="Owned by others:" width="180">
Posseduti da altri:
</text>
@@ -247,7 +247,7 @@ o suddivisa.
[COUNT]
</text>
<button label="Mostra" label_selected="Mostra" name="ShowOther" right="-135" width="60"/>
- <button label="Restituisci..." label_selected="Restituisci..." name="ReturnOther..." right="-10" tool_tip="Restituisci gli oggetti ai loro proprietari." width="119"/>
+ <button label="Restituisci" name="ReturnOther..." right="-10" tool_tip="Restituisci gli oggetti ai loro proprietari." width="119"/>
<text left="14" name="Selected / sat upon:" width="193">
Selezionati / sui quali sei sopra:
</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
index c0449f1221a824db3396503ab3352f90bcf9308a..ef6d8cce47234e3b8f36a27f6f3aec9448da43c5 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
@@ -45,7 +45,7 @@
ã‚ãªãŸã®è²¢çŒ®ï¼š
</text>
<text name="your_contribution_units">
- 平方メートル
+ m²
</text>
<text name="your_contribution_max_value">
（最大 [AMOUNT]）
diff --git a/indra/newview/skins/default/xui/ja/panel_group_roles.xml b/indra/newview/skins/default/xui/ja/panel_group_roles.xml
index db6fe268c75faf058b84f4d576fe26f6e9ac149c..8a629be910a3fb1f93fbd9c2a46b747948508138 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_roles.xml
@@ -17,7 +17,7 @@ Ctrl ã‚ーを押ã—ãªãŒã‚‰ãƒ¡ãƒ³ãƒãƒ¼åをクリックã™ã‚‹ã¨
<name_list name="member_list">
<name_list.columns label="メンãƒãƒ¼" name="name"/>
<name_list.columns label="寄付" name="donated"/>
- <name_list.columns label="ステータス" name="online"/>
+ <name_list.columns label="ãƒã‚°ã‚¤ãƒ³" name="online"/>
</name_list>
<button label="招待" name="member_invite"/>
<button label="追放" name="member_eject"/>
@@ -44,7 +44,7 @@ Ctrl ã‚ーを押ã—ãªãŒã‚‰ãƒ¡ãƒ³ãƒãƒ¼åをクリックã™ã‚‹ã¨
<filter_editor label="役割をé¸åˆ¥" name="filter_input"/>
<scroll_list name="role_list">
<scroll_list.columns label="役割" name="name"/>
- <scroll_list.columns label="肩書ã" name="title"/>
+ <scroll_list.columns label="タイトル" name="title"/>
<scroll_list.columns label="#" name="members"/>
</scroll_list>
<button label="æ–°ã—ã„役割" name="role_create"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_places.xml b/indra/newview/skins/default/xui/ja/panel_places.xml
index a7fbc7988486d3dc551a5f50a42d4a306b09ef33..acfa0bf4e8d2ac3466be682debe71446b1aa5c64 100644
--- a/indra/newview/skins/default/xui/ja/panel_places.xml
+++ b/indra/newview/skins/default/xui/ja/panel_places.xml
@@ -2,7 +2,7 @@
<panel label="å ´æ‰€" name="places panel">
<string name="landmarks_tab_title" value="マイ ランドマーク"/>
<string name="teleport_history_tab_title" value="テレãƒãƒ¼ãƒˆã®å±¥æ´"/>
- <filter_editor label="ç§ã®å ´æ‰€ã‚’フィルターã™ã‚‹" name="Filter"/>
+ <filter_editor label="å ´æ‰€ã‚’ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼" name="Filter"/>
<panel name="button_panel">
<button label="テレãƒãƒ¼ãƒˆ" name="teleport_btn" tool_tip="該当ã™ã‚‹ã‚¨ãƒªã‚¢ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã™"/>
<button label="地図" name="map_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index 6df59ca189a7ecdbd3e7893ad686dfbe3f8fef90..4ccb70b321a1a4c52a36d68101e356d3590ce050 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -44,7 +44,7 @@
<radio_item label="オン" name="radio2" value="1"/>
<radio_item label="一時的ã«è¡¨ç¤º" name="radio3" value="2"/>
</radio_group>
- <check_box label="ç§ã®åå‰ã‚’表示" name="show_my_name_checkbox1"/>
+ <check_box label="自分ã®åå‰ã‚’表示" name="show_my_name_checkbox1"/>
<check_box initial_value="true" label="å°ã•ã„ã‚¢ãƒã‚¿ãƒ¼å" name="small_avatar_names_checkbox"/>
<check_box label="グループタイトルを表示" name="show_all_title_checkbox1"/>
<text name="effects_color_textbox">
@@ -53,12 +53,12 @@
<text name="title_afk_text">
一時退å¸ã¾ã§ã®æ™‚間：
</text>
- <color_swatch label="" name="effect_color_swatch" tool_tip="カラー・ピッカーをクリックã—ã¦é–‹ã"/>
+ <color_swatch label="" name="effect_color_swatch" tool_tip="クリックã§ã‚«ãƒ©ãƒ¼ãƒ”ッカーを開ãã¾ã™"/>
<combo_box label="一時退å¸ã¾ã§ã®æ™‚間：" name="afk">
- <combo_box.item label="2分" name="item0"/>
- <combo_box.item label="5分" name="item1"/>
- <combo_box.item label="10分" name="item2"/>
- <combo_box.item label="30分" name="item3"/>
+ <combo_box.item label="2 分" name="item0"/>
+ <combo_box.item label="5 分" name="item1"/>
+ <combo_box.item label="10 分" name="item2"/>
+ <combo_box.item label="30 分" name="item3"/>
<combo_box.item label="一時退å¸è¨å®šãªã—" name="item4"/>
</combo_box>
<text name="text_box3">
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
index 4fba4b1567360aab585eb8dd073f0c21fe8ac730..94be8ba73dcb230a7be4fded11aeac5197ae52ec 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
@@ -10,7 +10,7 @@
MyOutfit With a really Long Name like MOOSE
</text>
</panel>
- <filter_editor label="アウトフィットã®ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼" name="Filter"/>
+ <filter_editor label="アウトフィットをフィルター" name="Filter"/>
<button label="装ç€" name="wear_btn"/>
<button label="æ–°ã—ã„アウトフィット" name="newlook_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 688e4751dea6e2a343bb2311c68a46f31dbaf91d..18afe387b1ac85f5d332b940e9ece659d1033003 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -828,7 +828,7 @@
ESC ã‚ーを押ã—ã¦ãƒ¯ãƒ¼ãƒ«ãƒ‰ãƒ“ューã«æˆ»ã‚Šã¾ã™
</string>
<string name="InventoryNoMatchingItems">
- 一致ã™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ ãŒæŒã¡ç‰©ã«ã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ [secondlife:///app/search/groups 「検索ã€] ã‚’ãŠè©¦ã—ãã ã•ã„。
+ 一致ã™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ ãŒã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚[secondlife:///app/search/groups 「検索ã€]ã‚’ãŠè©¦ã—ãã ã•ã„。
</string>
<string name="FavoritesNoMatchingItems">
ã“ã“ã«ãƒ©ãƒ³ãƒ‰ãƒžãƒ¼ã‚¯ã‚’ドラッグã—ã¦ã€ãŠæ°—ã«å…¥ã‚Šã«è¿½åŠ ã—ã¾ã™ã€‚
@@ -1301,7 +1301,7 @@
許å¯ã•ã‚ŒãŸä½äººï¼š （[ALLOWEDAGENTS] 人ã€æœ€å¤§ [MAXACCESS] 人）
</string>
<string name="RegionInfoAllowedGroups">
- 許å¯ã•ã‚ŒãŸã‚°ãƒ«ãƒ¼ãƒ—： （[ALLOWEDGROUPS]ã€æœ€å¤§ [MAXACCESS] グループ）
+ 許å¯ã•ã‚ŒãŸã‚°ãƒ«ãƒ¼ãƒ—： （[ALLOWEDGROUPS]ã€æœ€å¤§ [MAXACCESS] ）
</string>
<string name="ScriptLimitsParcelScriptMemory">
区画スクリプトメモリ
diff --git a/indra/newview/skins/default/xui/nl/floater_about_land.xml b/indra/newview/skins/default/xui/nl/floater_about_land.xml
index 3a77de70d281f2db63762cd310c9cfa9c326f587..8f27e08f6649932160e16be5ff10245fadb022f8 100644
--- a/indra/newview/skins/default/xui/nl/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/nl/floater_about_land.xml
@@ -26,14 +26,14 @@
<text name="OwnerText" left="102" width="242">
Leyla Linden
</text>
- <button label="Profiel..." label_selected="Profiel..." name="Profile..."/>
+ <button label="Profiel" name="Profile..."/>
<text name="Group:">
Groep:
</text>
<text left="102" name="GroupText" width="242"/>
- <button label="Instellen..." label_selected="Instellen..." name="Set..."/>
+ <button label="Instellen" name="Set..."/>
<check_box label="Overdracht aan groep toestaan" name="check deed" tool_tip="Een groepofficier kan dit land aan de groep overdragen, zodat het ondersteund wordt door de landallocatie van de groep."/>
- <button label="Overdragen..." label_selected="Overdragen..." name="Deed..." tool_tip="U mag alleen land overdragen indien u een officier bent in de geselecteerde groep."/>
+ <button label="Overdragen" name="Deed..." tool_tip="U mag alleen land overdragen indien u een officier bent in de geselecteerde groep."/>
<check_box label="Eigenaar maakt bijdrage met overdracht" name="check contrib" tool_tip="Wanneer het land is overgedragen aan de groep, draagt de voormalig eigenaar voldoende landtoewijzing bij om het te ondersteunen."/>
<text name="For Sale:">
Te koop:
@@ -44,7 +44,7 @@
<text name="For Sale: Price L$[PRICE].">
Prijs: L$[PRICE] (L$[PRICE_PER_SQM]/m²).
</text>
- <button label="Verkoop land..." label_selected="Verkoop land..." name="Sell Land..."/>
+ <button label="Verkoop land" name="Sell Land..."/>
<text name="For sale to">
Te koop voor: [BUYER]
</text>
@@ -74,11 +74,11 @@
0
</text>
<button left="130" width="125" label="Koop land..." label_selected="Koop land..." name="Buy Land..."/>
- <button label="Koop voor groep..." label_selected="Koop voor groep..." name="Buy For Group..."/>
+ <button label="Koop voor groep" name="Buy For Group..."/>
<button left="130" width="125" label="Koop toegangspas..." label_selected="Koop toegangspas..." name="Buy Pass..." tool_tip="Een toegangspas geeft u tijdelijk toegang tot dit land."/>
- <button label="Land Afstaan..." label_selected="Land Afstaan..." name="Abandon Land..."/>
- <button label="Land terugvorderen..." label_selected="Land terugvorderen..." name="Reclaim Land..."/>
- <button label="Lindenverkoop..." label_selected="Lindenverkoop..." name="Linden Sale..." tool_tip="Land moet in bezit zijn, de inhoud moet ingesteld zijn en niet al ter veiling zijn aangeboden."/>
+ <button label="Land Afstaan" name="Abandon Land..."/>
+ <button label="Land terugvorderen" name="Reclaim Land..."/>
+ <button label="Lindenverkoop" name="Linden Sale..." tool_tip="Land moet in bezit zijn, de inhoud moet ingesteld zijn en niet al ter veiling zijn aangeboden."/>
<panel.string name="new users only">
Alleen nieuwe gebruikers
</panel.string>
@@ -224,7 +224,7 @@ of opgedeeld.
[COUNT]
</text>
<button label="Toon" label_selected="Toon" name="ShowOwner" right="-135" width="60"/>
- <button label="Retourneren..." label_selected="Retourneren..." name="ReturnOwner..." tool_tip="Retourneer objecten naar hun eigenaren." right="-10" width="119"/>
+ <button label="Retourneren" name="ReturnOwner..." tool_tip="Retourneer objecten naar hun eigenaren." right="-10" width="119"/>
<text name="Set to group:" left="14" width="180">
Groep toewijzen:
</text>
@@ -232,7 +232,7 @@ of opgedeeld.
[COUNT]
</text>
<button label="Toon" label_selected="Toon" name="ShowGroup" right="-135" width="60"/>
- <button label="Retourneren..." label_selected="Retourneren..." name="ReturnGroup..." tool_tip="Retourneer objecten naar hun eigenaren." right="-10" width="119"/>
+ <button label="Retourneren" name="ReturnGroup..." tool_tip="Retourneer objecten naar hun eigenaren." right="-10" width="119"/>
<text name="Owned by others:" left="14" width="128">
Eigendom van anderen:
</text>
@@ -240,7 +240,7 @@ of opgedeeld.
[COUNT]
</text>
<button label="Toon" label_selected="Toon" name="ShowOther" right="-135" width="60"/>
- <button label="Retourneren..." label_selected="Retourneren..." name="ReturnOther..." tool_tip="Retourneer objecten naar hun eigenaren." right="-10" width="119"/>
+ <button label="Retourneren" name="ReturnOther..." tool_tip="Retourneer objecten naar hun eigenaren." right="-10" width="119"/>
<text name="Selected / sat upon:" left="14" width="193">
Geselecteerd/Er op gezeten
</text>
@@ -256,7 +256,7 @@ of opgedeeld.
Objecteigenaren:
</text>
<button label="Ververs lijst" label_selected="Ververs lijst" name="Refresh List" bottom="-213"/>
- <button label="Retourneer objecten..." label_selected="Retourneer objecten..." name="Return objects..." width="164" bottom="-213"/>
+ <button label="Retourneer objecten" name="Return objects..." width="164" bottom="-213"/>
<name_list name="owner list" height="104">
<column label="Type" name="type"/>
<column label="Naam" name="name"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_about_land.xml b/indra/newview/skins/default/xui/pl/floater_about_land.xml
index d456ea26b422892480e8634ffbc5a0d3f6190fe0..8a4b1a4d533cce3edd7bcb9c838f0f49d6709e96 100644
--- a/indra/newview/skins/default/xui/pl/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pl/floater_about_land.xml
@@ -26,13 +26,13 @@
<text name="OwnerText">
Leyla Linden
</text>
- <button label="Profile..." label_selected="Profile..." name="Profile..."/>
+ <button label="Profile" name="Profile..."/>
<text name="Group:">
Grupa:
</text>
- <button label="Ustaw..." label_selected="Ustaw..." name="Set..."/>
+ <button label="Ustaw" name="Set..."/>
<check_box label="Udostępnij przypisywanie na grupę" name="check deed" tool_tip="Oficer grupy ma prawo przepisać prawo własności posiadłości na grupę. Posiadłość wspierana jest przez przydziały pochodzące od członków grupy."/>
- <button label="Przypisz..." label_selected="Przypisz..." name="Deed..." tool_tip="Prawo przypisania posiadłości na grupę może dokonać jedynie oficer grupy."/>
+ <button label="Przypisz" name="Deed..." tool_tip="Prawo przypisania posiadłości na grupę może dokonać jedynie oficer grupy."/>
<check_box label="Właścicel dokonuje wpłat związanych z posiadłością" name="check contrib" tool_tip="Kiedy posiadłość zostaje przypisana na grupę, poprzedni właściciel realizuje wpłaty z nią związane w celu jej utrzymania."/>
<text name="For Sale:">
Na Sprzedaż:
@@ -43,7 +43,7 @@
<text name="For Sale: Price L$[PRICE].">
Cena: L$[PRICE] (L$[PRICE_PER_SQM]/m²).
</text>
- <button label="Sprzedaj Posiadłość..." label_selected="Sprzedaj Posiadłość..." name="Sell Land..."/>
+ <button label="Sprzedaj Posiadłość" name="Sell Land..."/>
<text name="For sale to">
Na sprzedaż dla: [BUYER]
</text>
@@ -73,11 +73,11 @@
0
</text>
<button label="Kup Posiadłość..." label_selected="Kup Posiadłość..." left="130" name="Buy Land..." width="125"/>
- <button label="Kup dla Grupy..." label_selected="Kup dla Grupy..." name="Buy For Group..."/>
+ <button label="Kup dla Grupy" name="Buy For Group..."/>
<button label="Kup Przepustkę..." label_selected="Kup Przeputkę..." left="130" name="Buy Pass..." tool_tip="Przepustka udostępnia tymczasowy wstęp na posiadłość." width="125"/>
- <button label="Porzuć z Posiadłości..." label_selected="Porzuć z Posiadłości..." name="Abandon Land..."/>
- <button label="Odzyskaj Posiadłość..." label_selected="Odzyskaj Posiadłość..." name="Reclaim Land..."/>
- <button label="Sprzedaż przez Lindenów..." label_selected="Sprzedaż przez Lindenów..." name="Linden Sale..." tool_tip="Posiadłość musi mieć właściciela, zawartość oraz nie może być wystawiona na aukcę."/>
+ <button label="Porzuć z Posiadłości" name="Abandon Land..."/>
+ <button label="Odzyskaj Posiadłość" name="Reclaim Land..."/>
+ <button label="Sprzedaż przez Lindenów" name="Linden Sale..." tool_tip="Posiadłość musi mieć właściciela, zawartość oraz nie może być wystawiona na aukcę."/>
<panel.string name="new users only">
Tylko nowi użytkownicy
</panel.string>
@@ -224,7 +224,7 @@ Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokaz
[COUNT]
</text>
<button label="Pokaż" label_selected="Pokaż" name="ShowOwner"/>
- <button label="Zwróć..." label_selected="Zwróć..." name="ReturnOwner..." tool_tip="Zwróć obiekty do ich właścicieli."/>
+ <button label="Zwróć" name="ReturnOwner..." tool_tip="Zwróć obiekty do ich właścicieli."/>
<text name="Set to group:">
Grupy:
</text>
@@ -232,7 +232,7 @@ Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokaz
[COUNT]
</text>
<button label="Pokaż" label_selected="Pokaż" name="ShowGroup"/>
- <button label="Zwróć..." label_selected="Zwróć..." name="ReturnGroup..." tool_tip="Zwróć obiekty do ich właścicieli.."/>
+ <button label="Zwróć" name="ReturnGroup..." tool_tip="Zwróć obiekty do ich właścicieli.."/>
<text name="Owned by others:">
Innych Rezydentów:
</text>
@@ -240,7 +240,7 @@ Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokaz
[COUNT]
</text>
<button label="Pokaż" label_selected="Pokaż" name="ShowOther"/>
- <button label="Zwróć..." label_selected="Zwróć..." name="ReturnOther..." tool_tip="Zwróć obiekty do ich właścicieli."/>
+ <button label="Zwróć" name="ReturnOther..." tool_tip="Zwróć obiekty do ich właścicieli."/>
<text name="Selected / sat upon:">
Wybranych:
</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml
index ebb9bfc32db04f0e7894ff7016137736b8730661..7b943f2f67035de000303bb2f6883d8b3d4b59ba 100644
--- a/indra/newview/skins/default/xui/pt/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floaterland" title="SOBRE O TERRENO">
+ <floater.string name="maturity_icon_general">
+ "Parcel_PG_Dark
+ </floater.string>
+ <floater.string name="maturity_icon_moderate">
+ "Parcel_M_Dark"
+ </floater.string>
+ <floater.string name="maturity_icon_adult">
+ "Parcel_R_Dark"
+ </floater.string>
<floater.string name="Minutes">
[MINUTES] minutos
</floater.string>
@@ -15,7 +24,7 @@
<tab_container name="landtab">
<panel label="GERAL" name="land_general_panel">
<panel.string name="new users only">
- Somente novos usuários
+ Somente novos residentes
</panel.string>
<panel.string name="anyone">
Qualquer um
@@ -84,9 +93,9 @@ Vá para o menu Mundo > Sobre a Terra ou selecione outro lote para mostrar se
<text name="GroupText">
Leyla Linden
</text>
- <button label="Ajustar..." label_selected="Ajustar..." name="Set..."/>
+ <button label="Ajustar" name="Set..."/>
<check_box label="Permitir posse para o grupo" name="check deed" tool_tip="O gerente do grupo pode acionar essa terra ao grupo, então esta será mantida pelo gestor da ilha"/>
- <button label="Passar..." label_selected="Passar..." name="Deed..." tool_tip="Você só pode delegar esta terra se você for um gerente selecionado pelo grupo."/>
+ <button label="Passar" name="Deed..." tool_tip="Você só pode delegar esta terra se você for um gerente selecionado pelo grupo."/>
<check_box label="Proprietário faz contribuição com delegação" name="check contrib" tool_tip="Quando a terra é delegada ao grupo, o proprietário anterior contribui alocando terra suficiente para mantê-la."/>
<text name="For Sale:">
À Venda:
@@ -97,7 +106,7 @@ Vá para o menu Mundo > Sobre a Terra ou selecione outro lote para mostrar se
<text name="For Sale: Price L$[PRICE].">
Preço: L$[PRICE] (L$[PRICE_PER_SQM]/m²).
</text>
- <button label="Vender Terra..." label_selected="Vender Terra..." name="Sell Land..."/>
+ <button label="Vender Terra" name="Sell Land..."/>
<text name="For sale to">
À venda para: [BUYER]
</text>
@@ -128,11 +137,11 @@ Vá para o menu Mundo > Sobre a Terra ou selecione outro lote para mostrar se
</text>
<button label="Comprar Terra..." label_selected="Comprar Terra..." left="130" name="Buy Land..." width="125"/>
<button label="Dados do script" name="Scripts..."/>
- <button label="Comprar para o Grupo..." label_selected="Comprar para o Grupo..." name="Buy For Group..."/>
+ <button label="Comprar para o Grupo" name="Buy For Group..."/>
<button label="Comprar Passe..." label_selected="Comprar Passe..." left="130" name="Buy Pass..." tool_tip="Um passe concede a você acesso temporário a esta terra." width="125"/>
<button label="Abandonar Terra.." label_selected="Abandonar Terra.." name="Abandon Land..."/>
- <button label="Reclamar Terra..." label_selected="Reclamar Terra..." name="Reclaim Land..."/>
- <button label="Venda Linden..." label_selected="Venda Linden..." name="Linden Sale..." tool_tip="A terra precisa ser possuÃda, estar com o conteúdo configurado e não estar pronta para leilão."/>
+ <button label="Reclamar Terra" name="Reclaim Land..."/>
+ <button label="Venda Linden" name="Linden Sale..." tool_tip="A terra precisa ser possuÃda, estar com o conteúdo configurado e não estar pronta para leilão."/>
</panel>
<panel label="CONTRATO" name="land_covenant_panel">
<panel.string name="can_resell">
@@ -233,7 +242,7 @@ ou sub-dividida.
[COUNT]
</text>
<button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-135" width="60"/>
- <button label="Retornar..." label_selected="Retornar..." name="ReturnOwner..." right="-10" tool_tip="Retornar os objetos aos seus donos." width="119"/>
+ <button label="Retornar" name="ReturnOwner..." right="-10" tool_tip="Retornar os objetos aos seus donos." width="119"/>
<text left="14" name="Set to group:" width="180">
Configurados ao grupo:
</text>
@@ -241,7 +250,7 @@ ou sub-dividida.
[COUNT]
</text>
<button label="Mostrar" label_selected="Mostrar" name="ShowGroup" right="-135" width="60"/>
- <button label="Retornar..." label_selected="Retornar..." name="ReturnGroup..." right="-10" tool_tip="Retornar os objetos para seus donos." width="119"/>
+ <button label="Retornar" name="ReturnGroup..." right="-10" tool_tip="Retornar os objetos para seus donos." width="119"/>
<text left="14" name="Owned by others:" width="128">
Propriedade de Outros:
</text>
@@ -249,7 +258,7 @@ ou sub-dividida.
[COUNT]
</text>
<button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-135" width="60"/>
- <button label="Retornar..." label_selected="Retornar..." name="ReturnOther..." right="-10" tool_tip="Retornar os objetos aos seus donos." width="119"/>
+ <button label="Retornar" name="ReturnOther..." right="-10" tool_tip="Retornar os objetos aos seus donos." width="119"/>
<text left="14" name="Selected / sat upon:" width="193">
Selecionado/Sentado:
</text>
@@ -426,6 +435,9 @@ MÃdia:
<panel.string name="access_estate_defined">
(Definições do terreno)
</panel.string>
+ <panel.string name="allow_public_access">
+ Acesso para público: [MATURITY]
+ </panel.string>
<panel.string name="estate_override">
Uma ou mais destas opções está definida no nÃvel de propriedade.
</panel.string>
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_land.xml b/indra/newview/skins/default/xui/pt/floater_buy_land.xml
index 9500ba94e575bf87175d2d4aad4de94d110bfe8b..73b483acf26924c09061f2a307df72431ded382d 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_land.xml
@@ -40,7 +40,8 @@
A área selecionada não tem terras públicas.
</floater.string>
<floater.string name="not_owned_by_you">
- Está selecionada uma terra pertencente a outro usuário. Tente selecionar uma área menor.
+ Terrenos de outros residentes foram selecionados.
+Tente selecionar uma área menor.
</floater.string>
<floater.string name="processing">
Processando sua compra...
diff --git a/indra/newview/skins/default/xui/pt/floater_camera.xml b/indra/newview/skins/default/xui/pt/floater_camera.xml
index 5114b19336296473cf4fa2ead136d10ef030803a..7989ce66bc32e9ce35ff2b31852ffec6a18f50ca 100644
--- a/indra/newview/skins/default/xui/pt/floater_camera.xml
+++ b/indra/newview/skins/default/xui/pt/floater_camera.xml
@@ -9,6 +9,18 @@
<floater.string name="move_tooltip">
Mover a Câmera para Cima e para Baixo, para a Esquerda e para a Direita
</floater.string>
+ <floater.string name="orbit_mode_title">
+ Órbita
+ </floater.string>
+ <floater.string name="pan_mode_title">
+ Pan
+ </floater.string>
+ <floater.string name="avatar_view_mode_title">
+ Predefinições
+ </floater.string>
+ <floater.string name="free_mode_title">
+ Visualizar objeto
+ </floater.string>
<panel name="controls">
<joystick_track name="cam_track_stick" tool_tip="Move a câmera para cima e para baixo, direita e esquerda"/>
<panel name="zoom" tool_tip="Aproximar a Câmera in direção ao Foco">
@@ -25,7 +37,7 @@
<panel name="buttons">
<button label="" name="orbit_btn" tool_tip="Câmera orbital"/>
<button label="" name="pan_btn" tool_tip="Câmera Pan"/>
- <button label="" name="avatarview_btn" tool_tip="ver como o avatar"/>
+ <button label="" name="avatarview_btn" tool_tip="Predefinições"/>
<button label="" name="freecamera_btn" tool_tip="Visualizar objeto"/>
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_event.xml b/indra/newview/skins/default/xui/pt/floater_event.xml
index 4b2489654a2990d237a740e3726ede10ef21d31e..1cd4dcbda4f85a285e7888f9d5ba39d377e6bb81 100644
--- a/indra/newview/skins/default/xui/pt/floater_event.xml
+++ b/indra/newview/skins/default/xui/pt/floater_event.xml
@@ -9,6 +9,18 @@
<floater.string name="dont_notify">
Não avisar
</floater.string>
+ <floater.string name="moderate">
+ Moderado
+ </floater.string>
+ <floater.string name="adult">
+ Adulto
+ </floater.string>
+ <floater.string name="general">
+ Público geral
+ </floater.string>
+ <floater.string name="unknown">
+ Desconhecido
+ </floater.string>
<layout_stack name="layout">
<layout_panel name="profile_stack">
<text name="event_name">
@@ -21,12 +33,21 @@
Organização:
</text>
<text initial_value="(pesquisando)" name="event_runby"/>
+ <text name="event_date_label">
+ Data:
+ </text>
<text name="event_date">
10/10/2010
</text>
+ <text name="event_duration_label">
+ Duração:
+ </text>
<text name="event_duration">
1 hora
</text>
+ <text name="event_covercharge_label">
+ Cover:
+ </text>
<text name="event_cover">
Grátis
</text>
@@ -36,6 +57,9 @@
<text name="event_location" value="LoteExemplo, Nome extenso (145, 228, 26)"/>
<text name="rating_label" value="Classificação:"/>
<text name="rating_value" value="(Desconhecido)"/>
+ <expandable_text name="event_desc">
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+ </expandable_text>
</layout_panel>
<layout_panel name="button_panel">
<button name="create_event_btn" tool_tip="Criar evento"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_god_tools.xml b/indra/newview/skins/default/xui/pt/floater_god_tools.xml
index 93b2f3e90d61c8c70e817f87a9b6194121046a23..2e63d862815cb9bf0705763cad05d3457d9d6491 100644
--- a/indra/newview/skins/default/xui/pt/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_god_tools.xml
@@ -2,7 +2,7 @@
<floater name="godtools floater" title="FERRAMENTAS DE DEUS">
<tab_container name="GodTools Tabs">
<panel label="Grade" name="grid">
- <button label="Desconectar todos os usuários" label_selected="Desconectar todos os usuários" name="Kick all users"/>
+ <button label="Chutar todos" label_selected="Chutar todos" name="Kick all users"/>
<button label="Limpar os cachês de visibilidade do mapa da região." label_selected="Limpar os cachês de visibilidade do mapa da região." name="Flush This Region's Map Visibility Caches"/>
</panel>
<panel label="Região" name="region">
diff --git a/indra/newview/skins/default/xui/pt/floater_im.xml b/indra/newview/skins/default/xui/pt/floater_im.xml
index f6057c48f1989334f0a111fd3ccc0738904e8e9c..c81d0dd7ef37d079c0641a4044a9cc20a11d28a0 100644
--- a/indra/newview/skins/default/xui/pt/floater_im.xml
+++ b/indra/newview/skins/default/xui/pt/floater_im.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<multi_floater name="im_floater" title="Mensagem Instantânea">
<string name="only_user_message">
- Você é o único usuário desta sessão.
+ Você é o único residente nesta sessão
</string>
<string name="offline_message">
[FIRST] [LAST] está offline.
@@ -31,7 +31,7 @@
Um moderador do grupo desabilitou seu bate-papo em texto.
</string>
<string name="add_session_event">
- Não foi possÃvel adicionar usuários na sessão de bate-papo com [RECIPIENT].
+ Não foi possÃvel adicionar residentes ao bate-papo com [RECIPIENT].
</string>
<string name="message_session_event">
Não foi possÃvel enviar sua mensagem na sessão de bate- papo com [RECIPIENT].
diff --git a/indra/newview/skins/default/xui/pt/floater_moveview.xml b/indra/newview/skins/default/xui/pt/floater_moveview.xml
index f67a16bb46fe9ac06c5a46ecd6a38134477ad9ec..9c025700764ad3ccc5185dbe71ae459c9719da13 100644
--- a/indra/newview/skins/default/xui/pt/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_moveview.xml
@@ -18,6 +18,15 @@
<string name="fly_back_tooltip">
Voar para trás (flecha para baixo ou S)
</string>
+ <string name="walk_title">
+ Andar
+ </string>
+ <string name="run_title">
+ Correr
+ </string>
+ <string name="fly_title">
+ Voar
+ </string>
<panel name="panel_actions">
<button label="" label_selected="" name="turn left btn" tool_tip="Virar à esquerda (flecha ESQ ou A)"/>
<button label="" label_selected="" name="turn right btn" tool_tip="Virar à direita (flecha DIR ou D)"/>
@@ -30,6 +39,5 @@
<button label="" name="mode_walk_btn" tool_tip="Modo caminhar"/>
<button label="" name="mode_run_btn" tool_tip="Modo correr"/>
<button label="" name="mode_fly_btn" tool_tip="Modo voar"/>
- <button label="Parar de voar" name="stop_fly_btn" tool_tip="Parar de voar"/>
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_publish_classified.xml b/indra/newview/skins/default/xui/pt/floater_publish_classified.xml
new file mode 100644
index 0000000000000000000000000000000000000000..988f8f2ce114b78c33c75575003b1bda8e9cef51
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_publish_classified.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="publish_classified" title="Publicando anúncio">
+ <text name="explanation_text">
+ Seu anúncio será publicado por uma semana a partir da data de publicação.
+
+Lembre-se, o pagamento do anúncio não é reembolsável
+ </text>
+ <spinner label="Preço do anúncio:" name="price_for_listing" tool_tip="Preço do anúncio." value="50"/>
+ <text name="l$_text" value="L$"/>
+ <text name="more_info_text">
+ Mais informações (link para ajuda com anúncios)
+ </text>
+ <button label="Publicar" name="publish_btn"/>
+ <button label="Cancelar" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_controls.xml b/indra/newview/skins/default/xui/pt/floater_voice_controls.xml
index 6ab10db96f9fc0d97a389a2cd94b01b9df79f8f2..5ef8479b7a0555c89ebaad7ace35c68958169e3a 100644
--- a/indra/newview/skins/default/xui/pt/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/pt/floater_voice_controls.xml
@@ -17,7 +17,7 @@
</string>
<layout_stack name="my_call_stack">
<layout_panel name="my_panel">
- <text name="user_text" value="Mya Avatar:"/>
+ <text name="user_text" value="Meu avatar:"/>
</layout_panel>
<layout_panel name="leave_call_btn_panel">
<button label="Desligar" name="leave_call_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_water.xml b/indra/newview/skins/default/xui/pt/floater_water.xml
index 36b995d4fd41e0959ec0fcdc69ccf22ce9cd3647..b4613e089094212f4564010c3a64d9b3172ce93d 100644
--- a/indra/newview/skins/default/xui/pt/floater_water.xml
+++ b/indra/newview/skins/default/xui/pt/floater_water.xml
@@ -8,7 +8,7 @@
<button label="Salvar" label_selected="Salvar" name="WaterSavePreset"/>
<button label="Deletar" label_selected="Deletar" name="WaterDeletePreset"/>
<tab_container name="Water Tabs">
- <panel label="Configurações" name="Settings">
+ <panel label="DEFINIÇÕES" name="Settings">
<text name="BHText">
Cor da névoa da Ãgua
</text>
@@ -56,7 +56,7 @@
</text>
<button label="?" left="640" name="WaterBlurMultiplierHelp"/>
</panel>
- <panel label="Imagem" name="Waves">
+ <panel label="IMAGEM" name="Waves">
<text name="BHText">
Direção da Onda Maior
</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_windlight_options.xml b/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
index 951e37a1a653502eb10fe857d7f9fa183da298f0..22632a4ef8779df26455bbadf14f64000d14a5ef 100644
--- a/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
@@ -5,11 +5,11 @@
</text>
<combo_box left_delta="130" name="WLPresetsCombo"/>
<button label="Novo" label_selected="Novo" name="WLNewPreset"/>
- <button label="Salvar" label_selected="Salvar" name="WLSavePreset" left_delta="72"/>
- <button label="Deletar" label_selected="Deletar" name="WLDeletePreset" left_delta="72"/>
- <button label="Editor de Ciclos do Dia" label_selected="Editor de Ciclos do Dia" name="WLDayCycleMenuButton" width="150" left_delta="84" />
+ <button label="Salvar" label_selected="Salvar" left_delta="72" name="WLSavePreset"/>
+ <button label="Deletar" label_selected="Deletar" left_delta="72" name="WLDeletePreset"/>
+ <button label="Editor de Ciclos do Dia" label_selected="Editor de Ciclos do Dia" left_delta="84" name="WLDayCycleMenuButton" width="150"/>
<tab_container name="WindLight Tabs">
- <panel label="Atmosfera" name="Atmosphere">
+ <panel label="ATMOSFERA" name="Atmosphere">
<text name="BHText">
Horizonte Azul
</text>
@@ -53,17 +53,17 @@
<text name="DensMultText">
Multiplicador de Densidade
</text>
- <button label="?" name="WLDensityMultHelp" left="635"/>
+ <button label="?" left="635" name="WLDensityMultHelp"/>
<text name="WLDistanceMultText">
Multiplicador de Distância
</text>
- <button label="?" name="WLDistanceMultHelp" left="635"/>
+ <button label="?" left="635" name="WLDistanceMultHelp"/>
<text name="MaxAltText">
Altitude Máxima
</text>
- <button label="?" name="WLMaxAltitudeHelp" left="635"/>
+ <button label="?" left="635" name="WLMaxAltitudeHelp"/>
</panel>
- <panel label="Iluminação" name="Lighting">
+ <panel label="ILUMINAÇÃO" name="Lighting">
<text name="SLCText">
Cor do Sol/Lua
</text>
@@ -119,7 +119,7 @@
</text>
<button label="?" name="WLStarBrightnessHelp"/>
</panel>
- <panel label="Nuvens" name="Clouds">
+ <panel label="NUVENS" name="Clouds">
<text name="WLCloudColorText">
Cor da Nuvem
</text>
@@ -157,10 +157,10 @@
Escala da Nuvem
</text>
<button label="?" name="WLCloudScaleHelp"/>
- <text name="WLCloudDetailText" font="SansSerifSmall">
+ <text font="SansSerifSmall" name="WLCloudDetailText">
Detalhe da Nuvem (XY/Densidade)
</text>
- <button label="?" name="WLCloudDetailHelp" left="421"/>
+ <button label="?" left="421" name="WLCloudDetailHelp"/>
<text name="BHText8">
X
</text>
@@ -181,7 +181,7 @@
<button label="?" name="WLCloudScrollYHelp"/>
<check_box label="Travar" name="WLCloudLockY"/>
<check_box label="Desenhar Nuvens Clássicas" name="DrawClassicClouds"/>
- <button label="?" name="WLClassicCloudsHelp" left="645"/>
+ <button label="?" left="645" name="WLClassicCloudsHelp"/>
</panel>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_world_map.xml b/indra/newview/skins/default/xui/pt/floater_world_map.xml
index 95bb8990717a55f6c794a410a19d5cc1f7862e23..115192203f066ad8d48fc0b37e4524bc4951319e 100644
--- a/indra/newview/skins/default/xui/pt/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/pt/floater_world_map.xml
@@ -5,8 +5,7 @@
Legenda
</text>
</panel>
- <panel
- name="layout_panel_2">
+ <panel name="layout_panel_2">
<button font="SansSerifSmall" label="Mostra minha localização" label_selected="Mostra minha localização" left_delta="91" name="Show My Location" tool_tip="Centrar o mapa na localização do meu avatar" width="135"/>
<text name="me_label">
Eu
@@ -24,60 +23,56 @@
Venda de terreno
</text>
<text name="by_owner_label">
- pelo dono
+ o proprietário
</text>
<text name="auction_label">
leilão de terrenos
</text>
- <button label="Ir para Casa" label_selected="Ir para casa" name="Go Home" tool_tip="Teletransportar para minha casa"/>
+ <button label="Ir para Casa" label_selected="Ir para casa" name="Go Home" tool_tip="Teletransportar para meu inÃcio"/>
<text name="Home_label">
- Casa
+ InÃcio
</text>
<text name="events_label">
Eventos:
</text>
<check_box label="PG" name="event_chk"/>
<text name="pg_label">
- Geral
+ Público geral
</text>
- <check_box initial_value="true" label="Mature" name="event_mature_chk"/>
+ <check_box initial_value="verdadeiro" label="Mature" name="event_mature_chk"/>
<text name="mature_label">
Moderado
</text>
<check_box label="Adult" name="event_adult_chk"/>
<text name="adult_label">
- Público adulto
+ Adulto
</text>
</panel>
- <panel
- name="layout_panel_3">
+ <panel name="layout_panel_3">
<text name="find_on_map_label">
Localizar no mapa
</text>
</panel>
- <panel
- name="layout_panel_4">
- <combo_box label="Amigos Conectados" name="friend combo" tool_tip="Mostrar amigos no mapa">
+ <panel name="layout_panel_4">
+ <combo_box label="Amigos online" name="friend combo" tool_tip="Mostrar amigos no mapa">
<combo_box.item label="Amigos conectados" name="item1"/>
</combo_box>
<combo_box label="Meus marcos" name="landmark combo" tool_tip="Mostrar marco no mapa">
<combo_box.item label="Meus marcos" name="item1"/>
</combo_box>
- <search_editor label="Regiões por nome" name="location" tool_tip="Digite o nome de uma Região"/>
- <button label="Buscar" name="DoSearch" tool_tip="Procurar por região"/>
- <button name="Clear" tool_tip="Limpara linhas e redefinir mapa"/>
- <button font="SansSerifSmall" label="Teletransporte" label_selected="Teletransporte" name="Teleport" tool_tip="Teletransportar para a posição selecionada"/>
+ <search_editor label="Regiões por nome" name="location" tool_tip="Digite o nome da região"/>
+ <button label="Buscar" name="DoSearch" tool_tip="Buscar região"/>
+ <button name="Clear" tool_tip="Limpar linhas e redefinir mapa"/>
+ <button font="SansSerifSmall" label="Teletransportar" label_selected="Teletransporte" name="Teleport" tool_tip="Teletransportar para o lugar selecionado"/>
<button font="SansSerifSmall" label="Copiar SLurl" name="copy_slurl" tool_tip="Copia a localização atual como um SLurl para usar na web."/>
- <button font="SansSerifSmall" label="Mostrar seleção" label_selected="Mostrar Destino" left_delta="91" name="Show Destination" tool_tip="Centralizar mapa na posição selecionada" width="135"/>
+ <button font="SansSerifSmall" label="Mostrar seleção" label_selected="Mostrar Destino" left_delta="91" name="Show Destination" tool_tip="Centrar mapa no local selecionado" width="135"/>
</panel>
- <panel
- name="layout_panel_5">
+ <panel name="layout_panel_5">
<text name="zoom_label">
Zoom
</text>
</panel>
- <panel
- name="layout_panel_6">
+ <panel name="layout_panel_6">
<slider label="Zoom" name="zoom slider"/>
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/menu_object.xml b/indra/newview/skins/default/xui/pt/menu_object.xml
index 5121c9d0484056c5dac77b190c27559b15a1c11d..a5969cacc39824b5eab3770b0f2c14685faed81c 100644
--- a/indra/newview/skins/default/xui/pt/menu_object.xml
+++ b/indra/newview/skins/default/xui/pt/menu_object.xml
@@ -5,6 +5,7 @@
<menu_item_call label="Construir" name="Build"/>
<menu_item_call label="Abrir" name="Open"/>
<menu_item_call label="Sentar aqui" name="Object Sit"/>
+ <menu_item_call label="Ficar de pé" name="Object Stand Up"/>
<menu_item_call label="Perfil do objeto" name="Object Inspect"/>
<menu_item_call label="Mais zoom" name="Zoom In"/>
<context_menu label="Colocar no(a)" name="Put On">
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 60113bcf0bb3dbb7566fcc3ef68e03eecf0e2cba..1480343dc17df5078ab7016143bd33829c0c34e0 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -106,7 +106,7 @@ Por favor, selecione apenas um objeto e tente novamente.
</notification>
<notification name="FriendsAndGroupsOnly">
Residentes que não são amigos não veem que você decidiu ignorar ligações e MIs deles.
- <usetemplate name="okbutton" yestext="Sim"/>
+ <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="GrantModifyRights">
Conceder direitos de modificação a outros residentes vai autorizá-los a mudar, apagar ou pegar TODOS os seus objetos. Seja MUITO cuidadoso ao conceder esta autorização.
@@ -442,7 +442,6 @@ O objeto pode estar fora de alcance ou ter sido deletado.
<notification name="UnsupportedHardware">
Sabe de uma coisa? Seu computador não tem os requisitos mÃnimos do [APP_NAME]. Talvez o desempenho seja um pouco sofrÃvel. O suporte não pode atender pedidos de assistência técnicas em sistemas não suportados.
-MINSPECS
Consultar [_URL] para mais informações?
<url name="url" option="0">
http://secondlife.com/support/sysreqs.php?lang=pt
@@ -1287,8 +1286,8 @@ Deixar este grupo?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Deixar"/>
</notification>
<notification name="ConfirmKick">
- Você quer REALMENTE expulsar todos os usuários deste grid?
- <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Expulsar todos os usuários"/>
+ Tem CERTEZA de que deseja expulsar todos os residentes do grid?
+ <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Chutar todos"/>
</notification>
<notification name="MuteLinden">
Desculpe, nenhum Linden pode ser bloqueado.
@@ -1328,7 +1327,7 @@ O bate-papo e MIs não serão exibidos. MIs enviadas para você receberão sua
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="KickUser">
- Expulsar este usuário com qual mensagem?
+ Chutar este residente com qual mensagem?
<form name="form">
<input name="message">
Um administrador desligou você.
@@ -1348,7 +1347,7 @@ O bate-papo e MIs não serão exibidos. MIs enviadas para você receberão sua
</form>
</notification>
<notification name="FreezeUser">
- Paralise este usuário com qual mensagem?
+ Congelar este residente com qual mensagem?
<form name="form">
<input name="message">
Você foi congelado. Você não pode se mover ou conversar. Um administrador irá contatá-lo via mensagem instantânea (MI).
@@ -1358,7 +1357,7 @@ O bate-papo e MIs não serão exibidos. MIs enviadas para você receberão sua
</form>
</notification>
<notification name="UnFreezeUser">
- Liberar este usuário com qual mensagem?
+ Descongelar este residente com qual mensagem?
<form name="form">
<input name="message">
Você não está mais congelado.
@@ -1378,7 +1377,7 @@ O bate-papo e MIs não serão exibidos. MIs enviadas para você receberão sua
</form>
</notification>
<notification name="OfferTeleportFromGod">
- God user convocou para a sua localização?
+ Convocar residente à sua localização com poderes de deus?
<form name="form">
<input name="message">
Junte-se a mim em [REGION]
@@ -1408,11 +1407,11 @@ O bate-papo e MIs não serão exibidos. MIs enviadas para você receberão sua
</form>
</notification>
<notification label="Mudar propriedade Linden" name="ChangeLindenEstate">
- Você está prestes a mudar uma propriedade pertencente a Linden (continente, teen grid, orientação, etc.)
+ Você está prestes a modificar uma propriedade da Linden (continente, teen, grid, orientação, etc)
-Isto é EXTREMAMENTE PERIGOSO porque pode fundamentalmente afetar a experiência do usuário. No continente, vai mudar milhares de regiões e fazer o spaceserver soluçar.
+Esta ação é EXTREMAMENTE PERIGOSA -- ela pode afetar a experiência dos residentes. No continente, isso vai mudar milhares de regiões e deixar o spaceserver sobrecarregado.
-Proceder?
+Deseja prosseguir?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Mudar Propriedade"/>
</notification>
<notification label="Mudar o acesso à propriedade Linden" name="ChangeLindenAccess">
@@ -2399,14 +2398,6 @@ Deixar?
<button name="Ignore" text="Ignorar"/>
</form>
</notification>
- <notification name="ScriptToast">
- [FIRST] [LAST], '[TITLE]' está pedindo dados de usuário.
- <form name="form">
- <button name="Open" text="Abrir diálogo"/>
- <button name="Ignore" text="Ignorar"/>
- <button name="Block" text="Bloquear"/>
- </form>
- </notification>
<notification name="BuyLindenDollarSuccess">
Obrigado e volte sempre!
@@ -2533,7 +2524,7 @@ Para sua segurança, os SLurls serão bloqueados por alguns instantes.
</notification>
<notification name="ConfirmCloseAll">
Tem certeza de que quer fechar todas as MIs?
- <usetemplate name="okcancelignore" notext="Cancelar" yestext="OK"/>
+ <usetemplate ignoretext="Confirmar antes de fechar todas as MIs" name="okcancelignore" notext="Cancelar" yestext="OK"/>
</notification>
<notification name="AttachmentSaved">
Anexo salvo.
diff --git a/indra/newview/skins/default/xui/pt/panel_classified_info.xml b/indra/newview/skins/default/xui/pt/panel_classified_info.xml
index 8441cd99139567ebd1edc9a327f32a8fb949b808..31d9bc2b2667a496695c32495de2376cc541de7b 100644
--- a/indra/newview/skins/default/xui/pt/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/pt/panel_classified_info.xml
@@ -3,16 +3,46 @@
<panel.string name="l$_price">
L$ [PRICE]
</panel.string>
+ <panel.string name="click_through_text_fmt">
+ [TELEPORT] teletransporte, [MAP] mapa, [PROFILE] perfil
+ </panel.string>
+ <panel.string name="date_fmt">
+ [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
+ </panel.string>
+ <panel.string name="auto_renew_on">
+ Ativado
+ </panel.string>
+ <panel.string name="auto_renew_off">
+ Desativado
+ </panel.string>
<text name="title" value="Dados do anúncio"/>
<scroll_container name="profile_scroll">
<panel name="scroll_content_panel">
<text_editor name="classified_name" value="[nome]"/>
+ <text name="classified_location_label" value="Localização:"/>
<text_editor name="classified_location" value="[carregando...]"/>
+ <text name="content_type_label" value="Tipo de conteúdo:"/>
<text_editor name="content_type" value="[content type]"/>
+ <text name="category_label" value="Categoria:"/>
<text_editor name="category" value="[category]"/>
- <check_box label="Renovar automaticamente todas as semanas" name="auto_renew"/>
- <text_editor name="price_for_listing" tool_tip="Preço do anúncio."/>
- <text_editor name="classified_desc" value="[descrição]"/>
+ <text name="creation_date_label" value="Data de criação"/>
+ <text_editor name="creation_date" tool_tip="Data de criação" value="[date]"/>
+ <text name="price_for_listing_label" value="Preço do anúncio:"/>
+ <text_editor name="price_for_listing" tool_tip="Preço do anúncio." value="[price]"/>
+ <layout_stack name="descr_stack">
+ <layout_panel name="clickthrough_layout_panel">
+ <text name="click_through_label" value="Cliques:"/>
+ <text_editor name="click_through_text" tool_tip="Dados de click-through" value="[cliques]"/>
+ </layout_panel>
+ <layout_panel name="price_layout_panel">
+ <text name="auto_renew_label" value="Renovação automática:"/>
+ <text name="auto_renew" value="Ativado"/>
+ </layout_panel>
+ <layout_panel name="descr_layout_panel">
+ <text name="classified_desc_label" value="Descrição:"/>
+ <text_editor name="classified_desc" value="[descrição]"/>
+ </layout_panel>
+ </layout_stack>
</panel>
</scroll_container>
<panel name="buttons">
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_classified.xml b/indra/newview/skins/default/xui/pt/panel_edit_classified.xml
index a754c5f070122b2eb6100017f40054b246071854..f6fb22359964f4a0d939c7005b35cf02354baceb 100644
--- a/indra/newview/skins/default/xui/pt/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_classified.xml
@@ -3,12 +3,20 @@
<panel.string name="location_notice">
(salvar para atualizar)
</panel.string>
+ <string name="publish_label">
+ Publicar
+ </string>
+ <string name="save_label">
+ Salvar
+ </string>
<text name="title">
Editar anúncio
</text>
<scroll_container name="profile_scroll">
<panel name="scroll_content_panel">
- <icon label="" name="edit_icon" tool_tip="Selecione uma imagem"/>
+ <panel name="snapshot_panel">
+ <icon label="" name="edit_icon" tool_tip="Selecione uma imagem"/>
+ </panel>
<text name="Name:">
Cargo:
</text>
@@ -22,12 +30,19 @@
Carregando...
</text>
<button label="Usar configuração local" name="set_to_curr_location_btn"/>
+ <text name="category_label" value="Categoria:"/>
+ <text name="content_type_label" value="Tipo de conteúdo:"/>
+ <icons_combo_box label="Público geral" name="content_type">
+ <icons_combo_box.item label="Moderado" name="mature_ci" value="Adulto"/>
+ <icons_combo_box.item label="Público geral" name="pg_ci" value="Adequado para menores"/>
+ </icons_combo_box>
+ <text name="price_for_listing_label" value="Preço do anúncio:"/>
<spinner label="L$" name="price_for_listing" tool_tip="Preço do anúncio" value="50"/>
<check_box label="Renovação automática semanal" name="auto_renew"/>
</panel>
</scroll_container>
<panel label="bottom_panel" name="bottom_panel">
- <button label="Salvar" name="save_changes_btn"/>
+ <button label="[LABEL]" name="save_changes_btn"/>
<button label="Cancelar" name="cancel_btn"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml
index 11e1ba0039dded15de87f4eb19c61f250251bfb4..2535340f4cacbfcc8ec4db59751ac022b62d5fc3 100644
--- a/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml
@@ -13,7 +13,7 @@
<layout_panel name="share_btn_panel">
<button label="Compartilhar" name="share_btn"/>
</layout_panel>
- <layout_panel name="share_btn_panel">
+ <layout_panel name="pay_btn_panel">
<button label="Pagar" name="pay_btn"/>
</layout_panel>
<layout_panel name="call_btn_panel">
diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml
index 50617887577a5f422c34be59988345ecd490368b..66938e8f6f67b009ae709f3b7d2f3fc396229894 100644
--- a/indra/newview/skins/default/xui/pt/panel_people.xml
+++ b/indra/newview/skins/default/xui/pt/panel_people.xml
@@ -7,6 +7,8 @@
<string name="no_friends" value="Nenhum amigo"/>
<string name="people_filter_label" value="Filtro de pessoas"/>
<string name="groups_filter_label" value="Filtro de grupos"/>
+ <string name="no_filtered_groups_msg" value="[secondlife:///app/search/groups Tente encontrar o grupo na Busca]"/>
+ <string name="no_groups_msg" value="[secondlife:///app/search/groups Tente procurar grupos que lhe interessam]"/>
<filter_editor label="Filtro" name="filter_input"/>
<tab_container name="tabs">
<panel label="PROXIMIDADE" name="nearby_panel">
@@ -26,7 +28,7 @@
<button name="del_btn" tool_tip="Remover a pessoa selecionada da sua lista de amigos"/>
</panel>
<text name="no_friends_msg">
- Para adicionar amigos, use a [secondlife:///app/search/people busca de pessoas] ou clique em um usuário para adicioná-lo.
+ Para adicionar amigos, use a [secondlife:///app/search/people busca de pessoas] ou clique em um residente para adicioná-lo.
Para conhecer mais gente, use [secondlife:///app/worldmap o Mapa].
</text>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_place_profile.xml b/indra/newview/skins/default/xui/pt/panel_place_profile.xml
index 453c56d2807b24024e31e643454f0ddb8d34cf3a..5c81c7649bb5359e492feecbaacb403e1b897103 100644
--- a/indra/newview/skins/default/xui/pt/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/pt/panel_place_profile.xml
@@ -51,12 +51,12 @@
<accordion_tab name="parcel_characteristics_tab" title="Lote">
<panel name="parcel_characteristics_panel">
<text name="rating_label" value="Classificação:"/>
- <text name="rating_value" value="(Desconhecido)"/>
+ <text name="rating_value" value="desconhecido"/>
<text name="voice_label" value="Voz:"/>
<text name="voice_value" value="Ligar"/>
<text name="fly_label" value="Voar:"/>
<text name="fly_value" value="Ligar"/>
- <text name="push_label" value="Push:"/>
+ <text name="push_label" value="Empurrar:"/>
<text name="push_value" value="Desligar"/>
<text name="build_label" value="Construir:"/>
<text name="build_value" value="Ligar"/>
@@ -70,10 +70,17 @@
<accordion_tab name="region_information_tab" title="Região">
<panel name="region_information_panel">
<text name="region_name_label" value="Região:"/>
+ <text name="region_name" value="Alcelândia"/>
<text name="region_type_label" value="Tipo:"/>
+ <text name="region_type" value="Alce"/>
<text name="region_rating_label" value="Classificação:"/>
+ <text name="region_rating" value="Adulto"/>
<text name="region_owner_label" value="Proprietário:"/>
+ <text name="region_owner" value="moose Van Moose"/>
<text name="region_group_label" value="Grupo:"/>
+ <text name="region_group">
+ The Mighty Moose of mooseville soundvillemoose
+ </text>
<button label="Região/Propriedade" name="region_info_btn"/>
</panel>
</accordion_tab>
@@ -93,7 +100,7 @@
<text name="primitives_label" value="Prims:"/>
<text name="parcel_scripts_label" value="Scripts:"/>
<text name="terraform_limits_label" value="Limite de terraplenagem:"/>
- <text name="subdivide_label" value="Juntar/subdividir:"/>
+ <text name="subdivide_label" value="Capacidade de juntar/subdividir:"/>
<text name="resale_label" value="Revenda:"/>
<text name="sale_to_label" value="À venda para:"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
index d9b18724e2a9009b6ba95fd43c6dd7ec49279d4f..18348d0332f981457e14fc8e89c2b16821affc4d 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -1,10 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Chat" name="chat">
+ <text name="font_size">
+ Tamanho da fonte:
+ </text>
<radio_group name="chat_font_size">
<radio_item label="Pequeno" name="radio" value="0"/>
<radio_item label="Média" name="radio2" value="1"/>
<radio_item label="Grande" name="radio3" value="2"/>
</radio_group>
+ <text name="font_colors">
+ Cor da fonte:
+ </text>
<color_swatch label="Você" name="user"/>
<text name="text_box1">
Eu
diff --git a/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
index 0f173ab21acf4713600eb144dacb2c150d81fb04..e5d394865cfda98fb9af01d56690c92abba4b82a 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
@@ -39,7 +39,7 @@
</string>
<button label="?" name="abuse_email_address_help"/>
<button label="Aplicar" name="apply_btn"/>
- <button label="Chutar usuário da propriedade..." name="kick_user_from_estate_btn"/>
+ <button label="Expulsar da propriedade..." name="kick_user_from_estate_btn"/>
<button label="Enviar mensagem à Propriedade" name="message_estate_btn"/>
<text name="estate_manager_label">
Gerentes da propriedade:
diff --git a/indra/newview/skins/default/xui/pt/panel_region_general.xml b/indra/newview/skins/default/xui/pt/panel_region_general.xml
index 1a06d91aa84e1551dbedfcc5133fea8facd28811..d1a5eaa11e730741d441e885e11ec7ce8e6dd11d 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_general.xml
@@ -19,35 +19,25 @@
desconhecido
</text>
<check_box label="Bloquear Terraform" name="block_terraform_check"/>
- <button label="?" name="terraform_help"/>
<check_box label="Bloquear Vôo" name="block_fly_check"/>
- <button label="?" name="fly_help"/>
<check_box label="Permitir Dano" name="allow_damage_check"/>
- <button label="?" name="damage_help"/>
<check_box label="Restringir Empurrar" name="restrict_pushobject"/>
- <button label="?" name="restrict_pushobject_help"/>
<check_box label="Permitir Revenda de Terra" name="allow_land_resell_check"/>
- <button label="?" name="land_resell_help"/>
<check_box label="Permitir Unir/Dividir Terra" name="allow_parcel_changes_check"/>
- <button label="?" name="parcel_changes_help"/>
<check_box label="Bloquear Mostrar Terra na Busca" name="block_parcel_search_check" tool_tip="Permitir que as pessoas vejam esta região e seus lotes nos resultados de busca"/>
- <button label="?" name="parcel_search_help"/>
<spinner label="Limit do Agente" name="agent_limit_spin"/>
- <button label="?" name="agent_limit_help"/>
<spinner label="Objeto Bonus" name="object_bonus_spin"/>
- <button label="?" name="object_bonus_help"/>
<text label="Maturidade" name="access_text">
Classificação:
</text>
- <combo_box label="Mature" name="access_combo">
- <combo_box.item label="Adult" name="Adult"/>
- <combo_box.item label="Mature" name="Mature"/>
- <combo_box.item label="PG" name="PG"/>
- </combo_box>
- <button label="?" name="access_help"/>
+ <icons_combo_box label="Mature" name="access_combo">
+ <icons_combo_box.item label="Adult" name="Adult" value="42"/>
+ <icons_combo_box.item label="Mature" name="Mature" value="21"/>
+ <icons_combo_box.item label="PG" name="PG" value="13"/>
+ </icons_combo_box>
<button label="Aplicar" name="apply_btn"/>
- <button label="Teletransportar um usuário para Casa..." name="kick_btn"/>
- <button label="Teletransportar Todos os Usuários..." name="kick_all_btn"/>
+ <button label="Teletransportar um residente para inÃcio..." name="kick_btn"/>
+ <button label="Teletransportar todos para inÃcio..." name="kick_all_btn"/>
<button label="Enviar Mensagem para a Região..." name="im_btn"/>
<button label="Gerenciar Telehub..." name="manage_telehub_btn"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_general_layout.xml b/indra/newview/skins/default/xui/pt/panel_region_general_layout.xml
index 89fcb05658fef4019b6183c44ed89aa5d8f6dab4..d2d5fb649cac94f96147c611e5a6f9e5664b8530 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_general_layout.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_general_layout.xml
@@ -36,7 +36,7 @@
<combo_box.item label="Geral" name="PG"/>
</combo_box>
<button label="Aplicar" name="apply_btn"/>
- <button label="Teletransportar para inÃcio..." name="kick_btn"/>
+ <button label="Teletransportar um residente para inÃcio..." name="kick_btn"/>
<button label="Teletransportar todos para inÃcio..." name="kick_all_btn"/>
<button label="Enviar mensagem para região..." name="im_btn"/>
<button label="Gerenciar telehub..." name="manage_telehub_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_texture.xml b/indra/newview/skins/default/xui/pt/panel_region_texture.xml
index 7f37919af2c3dd7688f80f20c0c9f5edb7e75e28..35928ccc67320b7b0c9f936620008428f0fbb0c3 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_texture.xml
@@ -25,16 +25,16 @@
Escalas de Elevação de Terreno
</text>
<text name="height_text_lbl6">
- Sudeste
+ Noroeste
</text>
<text name="height_text_lbl7">
- Noroeste
+ Nordeste
</text>
<text name="height_text_lbl8">
Sudoeste
</text>
<text name="height_text_lbl9">
- Noroeste
+ Sudeste
</text>
<spinner label="Baixo" name="height_start_spin_0"/>
<spinner label="Baixo" name="height_start_spin_1"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_status_bar.xml b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
index a320d9d56d842639ed43180aeb9e3442287d265e..ae2879f4a95b179d0cda2f05b0f5222f15ef7f9b 100644
--- a/indra/newview/skins/default/xui/pt/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
@@ -22,7 +22,7 @@
L$ [AMT]
</panel.string>
<button label="" label_selected="" name="buycurrency" tool_tip="Meu saldo"/>
- <button label="Comprar L$" name="buyL" tool_tip="Comprar mais L$"/>
+ <button label="Comprar" name="buyL" tool_tip="Comprar mais L$"/>
<text name="TimeText" tool_tip="Hora atual (PacÃfico)">
24:00 AM PST
</text>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
index 7981cd106f0cc132701c43dec091adb0899f18ba..919373001839d9c3214877d008af155251cc02a7 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
@@ -38,7 +38,7 @@
</panel.string>
<text name="title" value="Perfil do objeto"/>
<text name="where" value="(inworld)"/>
- <panel label="">
+ <panel label="" name="properties_panel">
<text name="Name:">
Nome:
</text>
@@ -54,12 +54,15 @@
<text name="Owner:">
Proprietário:
</text>
+ <text name="Owner Name">
+ Erica Linden
+ </text>
<text name="Group_label">
Grupo:
</text>
<button name="button set group" tool_tip="Selecione o grupo que terá acesso à autorização do objeto"/>
<name_box initial_value="Carregando..." name="Group Name Proxy"/>
- <button label="Doar" label_selected="Doar" name="button deed" tool_tip="Ao doar este item, o próximo dono terá permissões de próximo dono. Objetos de grupos podem ser doados por um oficial do grupo."/>
+ <button label="Doar" label_selected="Doar" name="button deed" tool_tip="Ao doar este item, o próximo dono terá permissões de próximo dono. Objetos de grupos podem ser doados por um oficial do grupo."/>
<text name="label click action">
Clique para:
</text>
@@ -121,5 +124,6 @@
<button label="Abrir" name="open_btn"/>
<button label="Pagar" name="pay_btn"/>
<button label="Comprar" name="buy_btn"/>
+ <button label="Detalhes" name="details_btn"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 195345abc0846e1bfb54ae923273fa054eb310a7..5b8f76c2e99c2289e7a2b8257ee13d00adbf5a7d 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -164,6 +164,7 @@
Clique para ativar no secondlife:// commando
</string>
<string name="CurrentURL" value="URL atual: [CurrentURL]"/>
+ <string name="TooltipPrice" value="L$[PRICE]-"/>
<string name="SLurlLabelTeleport">
Teletransportar para
</string>
@@ -737,6 +738,9 @@
<string name="invalid">
inválido
</string>
+ <string name="NewWearable">
+ Novo [WEARABLE_ITEM]
+ </string>
<string name="next">
Próximo
</string>
@@ -1435,6 +1439,9 @@
<string name="PanelContentsNewScript">
Novo Script
</string>
+ <string name="BusyModeResponseDefault">
+ O residente para o qual escreveu está no modo 'ocupado', ou seja, ele prefere não receber nada no momento. Sua mensagem será exibida como uma MI mais tarde.
+ </string>
<string name="MuteByName">
(por nome)
</string>
diff --git a/indra/newview/skins/default/xui/pt/teleport_strings.xml b/indra/newview/skins/default/xui/pt/teleport_strings.xml
index 1a0461082b2d5f8c2ac1c54b1afd7f3e65245a63..92ffee02333bf5d734eb8dfc0ab3dcf39097d469 100644
--- a/indra/newview/skins/default/xui/pt/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/pt/teleport_strings.xml
@@ -59,6 +59,9 @@ Se você continuar a receber esta mensagem, por favor consulte o [SUPPORT_SITE].
<message name="completing">
Completando teletransporte.
</message>
+ <message name="completed_from">
+ Teletransporte de [T_SLURL] concluÃdo
+ </message>
<message name="resolving">
Identificando destino.
</message>
diff --git a/indra/test_apps/llplugintest/bookmarks.txt b/indra/test_apps/llplugintest/bookmarks.txt
index b8b83df38667abe008b2afaa9b0160c09c24b739..2ff64f217f57aa331aee5b21c465c50b30e73d34 100644
--- a/indra/test_apps/llplugintest/bookmarks.txt
+++ b/indra/test_apps/llplugintest/bookmarks.txt
@@ -18,20 +18,20 @@
(Flash) Scribd,http://www.scribd.com/doc/14427744/Second-Life-Quickstart-Guide
(Flash) MAME,http://yvern.com/fMAME/fMAME.html
(QT) Local sample,file:///C|/Program Files/QuickTime/Sample.mov
-(QT) Movie - Watchmen Trailer,http://movies.apple.com/movies/wb/watchmen/watchmen-tlr2_480p.mov
-(QT) Movie - Transformers - Revenge of the Fallen,http://movies.apple.com/movies/paramount/transformers2/transformersrevengeofthefallen-tlr1_h.320.mov
-(QT) Movie - Terminator Salvation,http://movies.apple.com/movies/wb/terminatorsalvation/terminatorsalvation-tlr3_h.320.mov
-(QT) Movie - Angels and Demons,http://movies.apple.com/movies/sony_pictures/angelsanddemons/angelsanddemons-video_h.320.mov
-(QT) Movie - Sin City Trailer,http://movies.apple.com/movies/miramax/sin_city/sin_city_480.mov
-(QT) Movie - The Incredibles Trailer,http://movies.apple.com/movies/disney/the_incredibles/the_incredibles-tlr_a480.mov
+(QT) Movie - Watchmen Trailer,http://trailers.apple.com/movies/wb/watchmen/watchmen-tlr2_480p.mov
+(QT) Movie - Transformers - Revenge of the Fallen,http://trailers.apple.com/movies/paramount/transformers2/transformersrevengeofthefallen-tlr1_h.320.mov
+(QT) Movie - Terminator Salvation,http://trailers.apple.com/movies/wb/terminatorsalvation/terminatorsalvation-tlr3_h.320.mov
+(QT) Movie - Angels and Demons,http://trailers.apple.com/movies/sony_pictures/angelsanddemons/angelsanddemons-video_h.320.mov
+(QT) Movie - Sin City Trailer,http://trailers.apple.com/movies/miramax/sin_city/sin_city_480.mov
+(QT) Movie - The Incredibles Trailer,http://trailers.apple.com/movies/disney/the_incredibles/the_incredibles-tlr_a480.mov
(QT) Movie - Streaming Apple Event,http://stream.qtv.apple.com/events/mar/0903lajkszg/m_090374535329zdwg_650_ref.mov
(QT) Movie - MPEG-4 from Amazon S3,http://s3.amazonaws.com/callum-linden/flashdemo/interactive_flash_demo.mp4
-(QT) Movie - Star Trek,http://movies.apple.com/movies/paramount/star_trek/startrek-tlr3_h.320.mov
-(QT) Movie - Ice Age 3,http://movies.apple.com/movies/fox/ice_age_iii/iceage3-tlrd_h.320.mov
-(QT) Movie - AstroBoy,http://movies.apple.com/movies/summit/astroboy/astroboy-tsr_h.320.mov
-(QT) Movie - Ante Up,http://movies.apple.com/movies/independent/anteup/anteup_h.320.mov
-(QT) Movie - Every Little Step,http://movies.apple.com/movies/sony/everylittlestep/everylittlestep-clip_h.320.mov
-(QT) Movie - The Informers,http://movies.apple.com/movies/independent/theinformers/theinformers_h.320.mov
+(QT) Movie - Star Trek,http://trailers.apple.com/movies/paramount/star_trek/startrek-tlr3_h.320.mov
+(QT) Movie - Ice Age 3,http://trailers.apple.com/movies/fox/ice_age_iii/iceage3-tlrd_h.320.mov
+(QT) Movie - AstroBoy,http://trailers.apple.com/movies/summit/astroboy/astroboy-tsr_h.320.mov
+(QT) Movie - Ante Up,http://trailers.apple.com/movies/independent/anteup/anteup_h.320.mov
+(QT) Movie - Every Little Step,http://trailers.apple.com/movies/sony/everylittlestep/everylittlestep-clip_h.320.mov
+(QT) Movie - The Informers,http://trailers.apple.com/movies/independent/theinformers/theinformers_h.320.mov
(QT) Animated GIF,http://upload.wikimedia.org/wikipedia/commons/4/44/Optical.greysquares.arp-animated.gif
(QT) Apple Text Descriptors,http://ubrowser.com/tmp/apple_text.txt
(EX) Example Plugin,example://blah
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp
index e5a846f15a110e882d31aa0465225fc4939de3c7..5677308fb0bf2b135fe50f18e235f1e2f12414cf 100644
--- a/indra/test_apps/llplugintest/llmediaplugintest.cpp
+++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp
@@ -1593,8 +1593,8 @@ void LLMediaPluginTest::addMediaPanel( std::string url )
}
std::string user_data_path = std::string( cwd ) + "/";
#endif
-
- media_source->init( launcher_name, plugin_name, false, user_data_path );
+ media_source->setUserDataPath(user_data_path);
+ media_source->init( launcher_name, plugin_name, false );
media_source->setDisableTimeout(mDisableTimeout);
// make a new panel and save parameters
@@ -1831,7 +1831,8 @@ void LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string url )
std::string user_data_path = std::string( cwd ) + "/";
#endif
- media_source->init( launcher_name, plugin_name, false, user_data_path );
+ media_source->setUserDataPath(user_data_path);
+ media_source->init( launcher_name, plugin_name, false );
media_source->setDisableTimeout(mDisableTimeout);
// make a new panel and save parameters