diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index 0272c55db21a812978de298b25463be1dd13429b..0ed700b9da82ec7db79fa0b889b51f3020af7b5f 100644
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -775,6 +775,33 @@ void LLMemoryInfo::stream(std::ostream& s) const
#endif
}
+S32 LLDisplayInfo::getDisplayWidth() const
+{
+#if LL_WINDOWS
+ return ::GetSystemMetrics(SM_CXVIRTUALSCREEN);
+#elif LL_DARWIN
+ return 1024; //*FIXME
+#elif LL_SOLARIS
+ return 1024; //*FIXME
+#else
+ return 1024; //*FIXME
+#endif
+}
+
+S32 LLDisplayInfo::getDisplayHeight() const
+{
+#if LL_WINDOWS
+ return ::GetSystemMetrics(SM_CYVIRTUALSCREEN);
+#elif LL_DARWIN
+ return 768; //*FIXME
+#elif LL_SOLARIS
+ return 768; //*FIXME
+#else
+ return 768; //*FIXME
+#endif
+}
+
+
std::ostream& operator<<(std::ostream& s, const LLOSInfo& info)
{
info.stream(s);
diff --git a/indra/llcommon/llsys.h b/indra/llcommon/llsys.h
index c2c45bec9a2a01ea8ce735a70d4d0995176a0a56..aa3fdd485bca84d7c6088daaf80890be06a5edf6 100644
--- a/indra/llcommon/llsys.h
+++ b/indra/llcommon/llsys.h
@@ -122,6 +122,21 @@ class LL_COMMON_API LLMemoryInfo
U32 getPhysicalMemoryClamped() const; ///< Memory size in clamped bytes
};
+//=============================================================================
+//
+// CLASS LLDisplayInfo
+class LL_COMMON_API LLDisplayInfo
+
+/*! @brief Class to query the information about some display settings
+*/
+{
+public:
+ LLDisplayInfo(){}; ///< Default constructor
+
+ S32 getDisplayWidth() const; ///< display width
+ S32 getDisplayHeight() const; ///< display height
+
+};
LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLOSInfo& info);
LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLCPUInfo& info);
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index 6a0d8ef3d65d1d07bb1d9ea1784afc6b6d8c4ce5..59b551a16d33947b52d3d51ef2806be19edd7d44 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -216,6 +216,7 @@ class LLButton
void setImageOverlay(const std::string& image_name, LLFontGL::HAlign alignment = LLFontGL::HCENTER, const LLColor4& color = LLColor4::white);
void setImageOverlay(const LLUUID& image_id, LLFontGL::HAlign alignment = LLFontGL::HCENTER, const LLColor4& color = LLColor4::white);
LLPointer<LLUIImage> getImageOverlay() { return mImageOverlay; }
+ LLFontGL::HAlign getImageOverlayHAlign() const { return mImageOverlayAlignment; }
void autoResize(); // resize with label of current btn state
void resize(LLUIString label); // resize with label input
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 9d23daf56d9b2bd0773efecd405d166fe5748ea4..98c9217306302677c658febf383b1b3daafdf306 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -703,19 +703,12 @@ void LLComboBox::onListMouseUp()
void LLComboBox::onItemSelected(const LLSD& data)
{
- const std::string name = mList->getSelectedItemLabel();
+ setValue(data);
- S32 cur_id = getCurrentIndex();
- mLastSelectedIndex = cur_id;
- if (cur_id != -1)
+ if (mAllowTextEntry && mLastSelectedIndex != -1)
{
- setLabel(name);
-
- if (mAllowTextEntry)
- {
- gFocusMgr.setKeyboardFocus(mTextEntry);
- mTextEntry->selectAll();
- }
+ gFocusMgr.setKeyboardFocus(mTextEntry);
+ mTextEntry->selectAll();
}
// hiding the list reasserts the old value stored in the text editor/dropdown button
@@ -1069,3 +1062,33 @@ BOOL LLComboBox::selectItemRange( S32 first, S32 last )
{
return mList->selectItemRange(first, last);
}
+
+
+static LLDefaultChildRegistry::Register<LLIconsComboBox> register_icons_combo_box("icons_combo_box");
+
+LLIconsComboBox::Params::Params()
+: icon_column("icon_column", ICON_COLUMN),
+ label_column("label_column", LABEL_COLUMN)
+{}
+
+LLIconsComboBox::LLIconsComboBox(const LLIconsComboBox::Params& p)
+: LLComboBox(p),
+ mIconColumnIndex(p.icon_column),
+ mLabelColumnIndex(p.label_column)
+{}
+
+void LLIconsComboBox::setValue(const LLSD& value)
+{
+ BOOL found = mList->selectByValue(value);
+ if (found)
+ {
+ LLScrollListItem* item = mList->getFirstSelected();
+ if (item)
+ {
+ mButton->setImageOverlay(mList->getSelectedItemLabel(mIconColumnIndex), mButton->getImageOverlayHAlign());
+
+ setLabel(mList->getSelectedItemLabel(mLabelColumnIndex));
+ }
+ mLastSelectedIndex = mList->getFirstSelectedIndex();
+ }
+}
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index 4f2758846716e8885fb9e1a31cb54b2c3a7f540f..3cc2a8f5d11313d9ab35417df2e2cd1fa345e10b 100644
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -221,6 +221,7 @@ class LLComboBox
LLPointer<LLUIImage> mArrowImage;
LLUIString mLabel;
BOOL mHasAutocompletedText;
+ S32 mLastSelectedIndex;
private:
BOOL mAllowTextEntry;
@@ -230,6 +231,36 @@ class LLComboBox
commit_callback_t mPrearrangeCallback;
commit_callback_t mTextEntryCallback;
commit_callback_t mSelectionCallback;
- S32 mLastSelectedIndex;
};
+
+// A combo box with icons for the list of items.
+class LLIconsComboBox
+: public LLComboBox
+{
+public:
+ struct Params
+ : public LLInitParam::Block<Params, LLComboBox::Params>
+ {
+ Optional<S32> icon_column,
+ label_column;
+ Params();
+ };
+
+ /*virtual*/ void setValue(const LLSD& value);
+
+private:
+ enum EColumnIndex
+ {
+ ICON_COLUMN = 0,
+ LABEL_COLUMN
+ };
+
+ friend class LLUICtrlFactory;
+ LLIconsComboBox(const Params&);
+ virtual ~LLIconsComboBox() {};
+
+ S32 mIconColumnIndex;
+ S32 mLabelColumnIndex;
+};
+
#endif
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 77caaaa425e6f079c544c29b9ea8e165a66ef280..18ec5b51dd00b4ddb1ea109de7fb61f421701da3 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -630,7 +630,9 @@ void LLScrollListCtrl::calcColumnWidths()
LLScrollListCell* cellp = (*iter)->getColumn(column->mIndex);
if (!cellp) continue;
- column->mMaxContentWidth = llmax(LLFontGL::getFontSansSerifSmall()->getWidth(cellp->getValue().asString()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth);
+ // get text value width only for text cells
+ column->mMaxContentWidth = cellp->isText() ?
+ llmax(LLFontGL::getFontSansSerifSmall()->getWidth(cellp->getValue().asString()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth) : column->mMaxContentWidth;
}
max_item_width += column->mMaxContentWidth;
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 1dcfb4e29668472ab47fc308d71f41eefdd9894d..30fc7babaef355e687e7b20c7ab89f98d7663772 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -2061,12 +2061,5 @@ void LLTabContainer::commitHoveredButton(S32 x, S32 y)
tuple->mButton->onCommit();
}
}
- /**
- * EXT - 4572 (Click and hold the left mouse button doesn't let you browse tabbed IM floater)
- *
- * During hovering mouse(with left mouse button hold) over tabs, a newly just activated corresponding
- * to the tab(that is hovered in the given instant of time) panel may caught mouse capture.
- */
- gFocusMgr.setMouseCapture(this);
}
}
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index c7aba04492213c83acd1aa65d72c388addb8c24b..e66ac3049f57d533c504230f94d2a63c50568ed9 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -43,6 +43,13 @@
#include "llpluginmessageclasses.h"
#include "media_plugin_base.h"
+// set to 1 if you're using the version of llqtwebkit that's QPixmap-ified
+#if LL_LINUX
+# define LL_QTWEBKIT_USES_PIXMAPS 1
+#else
+# define LL_QTWEBKIT_USES_PIXMAPS 0
+#endif // LL_LINUX
+
#if LL_LINUX
# include "linux_volume_catcher.h"
#endif // LL_LINUX
@@ -142,7 +149,11 @@ class MediaPluginWebKit :
{
const unsigned char* browser_pixels = LLQtWebKit::getInstance()->grabBrowserWindow( mBrowserWindowId );
- unsigned int buffer_size = LLQtWebKit::getInstance()->getBrowserRowSpan( mBrowserWindowId ) * LLQtWebKit::getInstance()->getBrowserHeight( mBrowserWindowId );
+ unsigned int rowspan = LLQtWebKit::getInstance()->getBrowserRowSpan( mBrowserWindowId );
+ unsigned int height = LLQtWebKit::getInstance()->getBrowserHeight( mBrowserWindowId );
+#if !LL_QTWEBKIT_USES_PIXMAPS
+ unsigned int buffer_size = rowspan * height;
+#endif // !LL_QTWEBKIT_USES_PIXMAPS
// std::cerr << "webkit plugin: updating" << std::endl;
@@ -150,7 +161,16 @@ class MediaPluginWebKit :
if ( mPixels && browser_pixels )
{
// std::cerr << " memcopy of " << buffer_size << " bytes" << std::endl;
+
+#if LL_QTWEBKIT_USES_PIXMAPS
+ // copy the pixel data upside-down because of the co-ord system
+ for (int y=0; y<height; ++y)
+ {
+ memcpy( &mPixels[(height-y-1)*rowspan], &browser_pixels[y*rowspan], rowspan );
+ }
+#else
memcpy( mPixels, browser_pixels, buffer_size );
+#endif // LL_QTWEBKIT_USES_PIXMAPS
}
if ( mWidth > 0 && mHeight > 0 )
@@ -258,8 +278,10 @@ class MediaPluginWebKit :
// 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 );
+#endif // !LL_QTWEBKIT_USES_PIXMAPS
// set background color
// convert background color channels from [0.0, 1.0] to [0, 255];
@@ -677,7 +699,11 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
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);
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index e5d72310cd91282df3a56942a7712d5c1592ae6d..a64a1a395fc0cda3a056db7a2bb357c7fdbb389f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4334,7 +4334,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>last</string>
+ <string>home</string>
</map>
<key>LoginPage</key>
<map>
@@ -5492,7 +5492,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>1.0</real>
+ <real>0.9</real>
</map>
<key>PlainTextChatHistory</key>
diff --git a/indra/newview/installers/windows/install_icon.ico b/indra/newview/installers/windows/install_icon.ico
index 1e00530c9016b16548de6890ab5562bbe2cbbe1d..efe6c4f323d216cdced45fdcf0d67ac217440841 100644
Binary files a/indra/newview/installers/windows/install_icon.ico and b/indra/newview/installers/windows/install_icon.ico differ
diff --git a/indra/newview/installers/windows/uninstall_icon.ico b/indra/newview/installers/windows/uninstall_icon.ico
index c4ec6c70bd7f325369d8763afef61ee8e93f2960..05e154686092d89fec551319a8ab9ffd906cdd44 100644
Binary files a/indra/newview/installers/windows/uninstall_icon.ico and b/indra/newview/installers/windows/uninstall_icon.ico differ
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 11ac103b3a11466e717cfc371e9be6fa4fd211a0..7b55282ee514addadf8399dd857a41e53fbc2373 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -119,9 +119,9 @@ class LLLibraryOutfitsFetch : public LLInventoryFetchDescendentsObserver
void importedFolderDone(void);
void contentsDone(void);
enum ELibraryOutfitFetchStep mCurrFetchStep;
- typedef std::vector< std::pair< LLUUID, std::string > > cloth_folder_vec_t;
- cloth_folder_vec_t mLibraryClothingFolders;
- cloth_folder_vec_t mImportedClothingFolders;
+ typedef std::vector<LLUUID> clothing_folder_vec_t;
+ clothing_folder_vec_t mLibraryClothingFolders;
+ clothing_folder_vec_t mImportedClothingFolders;
bool mOutfitsPopulated;
LLUUID mClothingID;
LLUUID mLibraryClothingID;
@@ -2240,7 +2240,7 @@ void LLAgentWearables::updateServer()
void LLAgentWearables::populateMyOutfitsFolder(void)
{
- llinfos << "starting outfit populate" << llendl;
+ llinfos << "starting outfit population" << llendl;
LLLibraryOutfitsFetch* outfits = new LLLibraryOutfitsFetch();
@@ -2312,17 +2312,28 @@ void LLLibraryOutfitsFetch::folderDone(void)
LLInventoryModel::item_array_t wearable_array;
gInventory.collectDescendents(mMyOutfitsID, cat_array, wearable_array,
LLInventoryModel::EXCLUDE_TRASH);
-
// Early out if we already have items in My Outfits.
if (cat_array.count() > 0 || wearable_array.count() > 0)
{
mOutfitsPopulated = true;
return;
}
-
+
mClothingID = gInventory.findCategoryUUIDForType(LLFolderType::FT_CLOTHING);
mLibraryClothingID = gInventory.findCategoryUUIDForType(LLFolderType::FT_CLOTHING, false, true);
-
+
+ // If Library->Clothing->Initial Outfits exists, use that.
+ LLNameCategoryCollector matchFolderFunctor("Initial Outfits");
+ gInventory.collectDescendentsIf(mLibraryClothingID,
+ cat_array, wearable_array,
+ LLInventoryModel::EXCLUDE_TRASH,
+ matchFolderFunctor);
+ if (cat_array.count() > 0)
+ {
+ const LLViewerInventoryCategory *cat = cat_array.get(0);
+ mLibraryClothingID = cat->getUUID();
+ }
+
mCompleteFolders.clear();
// Get the complete information on the items in the inventory.
@@ -2353,31 +2364,28 @@ void LLLibraryOutfitsFetch::outfitsDone(void)
{
const LLViewerInventoryCategory *cat = iter->get();
- // Get the names and id's of every outfit in the library, except for ruth and other "misc" outfits.
- if (cat->getName() != "More Outfits" && cat->getName() != "Ruth")
+ // Get the names and id's of every outfit in the library, skip "Ruth"
+ // because it's a low quality legacy outfit
+ if (cat->getName() != "Ruth")
{
// Get the name of every outfit in the library
folders.push_back(cat->getUUID());
- mLibraryClothingFolders.push_back(std::make_pair(cat->getUUID(), cat->getName()));
+ mLibraryClothingFolders.push_back(cat->getUUID());
}
}
-
- // Collect the contents of your Inventory Clothing folder
cat_array.clear();
wearable_array.clear();
- gInventory.collectDescendents(mClothingID, cat_array, wearable_array,
- LLInventoryModel::EXCLUDE_TRASH);
// Check if you already have an "Imported Library Clothing" folder
- for (LLInventoryModel::cat_array_t::const_iterator iter = cat_array.begin();
- iter != cat_array.end();
- ++iter)
+ LLNameCategoryCollector matchFolderFunctor(mImportedClothingName);
+ gInventory.collectDescendentsIf(mClothingID,
+ cat_array, wearable_array,
+ LLInventoryModel::EXCLUDE_TRASH,
+ matchFolderFunctor);
+ if (cat_array.size() > 0)
{
- const LLViewerInventoryCategory *cat = iter->get();
- if (cat->getName() == mImportedClothingName)
- {
- mImportedClothingID = cat->getUUID();
- }
+ const LLViewerInventoryCategory *cat = cat_array.get(0);
+ mImportedClothingID = cat->getUUID();
}
mCompleteFolders.clear();
@@ -2415,31 +2423,59 @@ class LLLibraryOutfitsCopyDone: public LLInventoryCallback
LLLibraryOutfitsFetch * mLibraryOutfitsFetcher;
};
+// Copy the clothing folders from the library into the imported clothing folder
void LLLibraryOutfitsFetch::libraryDone(void)
{
- // Copy the clothing folders from the library into the imported clothing folder if necessary.
- if (mImportedClothingID == LLUUID::null)
+ if (mImportedClothingID != LLUUID::null)
{
- gInventory.removeObserver(this);
- LLPointer<LLInventoryCallback> copy_waiter = new LLLibraryOutfitsCopyDone(this);
- mImportedClothingID = gInventory.createNewCategory(mClothingID,
- LLFolderType::FT_NONE,
- mImportedClothingName);
+ // Skip straight to fetching the contents of the imported folder
+ importedFolderFetch();
+ return;
+ }
+
+ // Remove observer; next autopopulation step will be triggered externally by LLLibraryOutfitsCopyDone.
+ gInventory.removeObserver(this);
+
+ LLPointer<LLInventoryCallback> copy_waiter = new LLLibraryOutfitsCopyDone(this);
+ mImportedClothingID = gInventory.createNewCategory(mClothingID,
+ LLFolderType::FT_NONE,
+ mImportedClothingName);
+ // Copy each folder from library into clothing unless it already exists.
+ for (clothing_folder_vec_t::const_iterator iter = mLibraryClothingFolders.begin();
+ iter != mLibraryClothingFolders.end();
+ ++iter)
+ {
+ const LLUUID& src_folder_id = (*iter); // Library clothing folder ID
+ const LLViewerInventoryCategory *cat = gInventory.getCategory(src_folder_id);
+ if (!cat)
+ {
+ llwarns << "Library folder import for uuid:" << src_folder_id << " failed to find folder." << llendl;
+ continue;
+ }
- for (cloth_folder_vec_t::const_iterator iter = mLibraryClothingFolders.begin();
- iter != mLibraryClothingFolders.end();
- ++iter)
+ if (!LLAppearanceManager::getInstance()->getCanMakeFolderIntoOutfit(src_folder_id))
{
- LLUUID folder_id = gInventory.createNewCategory(mImportedClothingID,
- LLFolderType::FT_NONE,
- iter->second);
- LLAppearanceManager::getInstance()->shallowCopyCategoryContents(iter->first, folder_id, copy_waiter);
+ llinfos << "Skipping non-outfit folder name:" << cat->getName() << llendl;
+ continue;
}
- }
- else
- {
- // Skip straight to fetching the contents of the imported folder
- importedFolderFetch();
+
+ // Don't copy the category if it already exists.
+ LLNameCategoryCollector matchFolderFunctor(cat->getName());
+ LLInventoryModel::cat_array_t cat_array;
+ LLInventoryModel::item_array_t wearable_array;
+ gInventory.collectDescendentsIf(mImportedClothingID,
+ cat_array, wearable_array,
+ LLInventoryModel::EXCLUDE_TRASH,
+ matchFolderFunctor);
+ if (cat_array.size() > 0)
+ {
+ continue;
+ }
+
+ LLUUID dst_folder_id = gInventory.createNewCategory(mImportedClothingID,
+ LLFolderType::FT_NONE,
+ cat->getName());
+ LLAppearanceManager::getInstance()->shallowCopyCategoryContents(src_folder_id, dst_folder_id, copy_waiter);
}
}
@@ -2476,7 +2512,7 @@ void LLLibraryOutfitsFetch::importedFolderDone(void)
// Get the name of every imported outfit
folders.push_back(cat->getUUID());
- mImportedClothingFolders.push_back(std::make_pair(cat->getUUID(), cat->getName()));
+ mImportedClothingFolders.push_back(cat->getUUID());
}
mCompleteFolders.clear();
@@ -2492,17 +2528,25 @@ void LLLibraryOutfitsFetch::contentsDone(void)
LLInventoryModel::cat_array_t cat_array;
LLInventoryModel::item_array_t wearable_array;
- for (cloth_folder_vec_t::const_iterator folder_iter = mImportedClothingFolders.begin();
+ for (clothing_folder_vec_t::const_iterator folder_iter = mImportedClothingFolders.begin();
folder_iter != mImportedClothingFolders.end();
++folder_iter)
{
+ const LLUUID &folder_id = (*folder_iter);
+ const LLViewerInventoryCategory *cat = gInventory.getCategory(folder_id);
+ if (!cat)
+ {
+ llwarns << "Library folder import for uuid:" << folder_id << " failed to find folder." << llendl;
+ continue;
+ }
+
// First, make a folder in the My Outfits directory.
- LLUUID new_outfit_folder_id = gInventory.createNewCategory(mMyOutfitsID, LLFolderType::FT_OUTFIT, folder_iter->second);
+ LLUUID new_outfit_folder_id = gInventory.createNewCategory(mMyOutfitsID, LLFolderType::FT_OUTFIT, cat->getName());
cat_array.clear();
wearable_array.clear();
// Collect the contents of each imported clothing folder, so we can create new outfit links for it
- gInventory.collectDescendents(folder_iter->first, cat_array, wearable_array,
+ gInventory.collectDescendents(folder_id, cat_array, wearable_array,
LLInventoryModel::EXCLUDE_TRASH);
for (LLInventoryModel::item_array_t::const_iterator wearable_iter = wearable_array.begin();
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 5c21be8c32670140bc551d6ad4dc432512857b5b..f08d8decfe94c198dd20c4bf7093fb43da291f40 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -807,47 +807,91 @@ void LLAppearanceManager::shallowCopyCategory(const LLUUID& src_id, const LLUUID
void LLAppearanceManager::shallowCopyCategoryContents(const LLUUID& src_id, const LLUUID& dst_id,
LLPointer<LLInventoryCallback> cb)
{
- LLInventoryModel::cat_array_t cats;
- LLInventoryModel::item_array_t items;
- gInventory.collectDescendents(src_id, cats, items,
- LLInventoryModel::EXCLUDE_TRASH);
- for (S32 i = 0; i < items.count(); ++i)
- {
- const LLViewerInventoryItem* item = items.get(i).get();
- if (item->getActualType() == LLAssetType::AT_LINK)
- {
- link_inventory_item(gAgent.getID(),
- item->getLinkedUUID(),
- dst_id,
- item->getName(),
- LLAssetType::AT_LINK, cb);
- }
- else if (item->getActualType() == LLAssetType::AT_LINK_FOLDER)
+ LLInventoryModel::cat_array_t* cats;
+ LLInventoryModel::item_array_t* items;
+ gInventory.getDirectDescendentsOf(src_id, cats, items);
+ for (LLInventoryModel::item_array_t::const_iterator iter = items->begin();
+ iter != items->end();
+ ++iter)
+ {
+ const LLViewerInventoryItem* item = (*iter);
+ switch (item->getActualType())
{
- LLViewerInventoryCategory *catp = item->getLinkedCategory();
- // Skip copying outfit links.
- if (catp && catp->getPreferredType() != LLFolderType::FT_OUTFIT)
+ case LLAssetType::AT_LINK:
{
link_inventory_item(gAgent.getID(),
item->getLinkedUUID(),
dst_id,
item->getName(),
- LLAssetType::AT_LINK_FOLDER, cb);
+ LLAssetType::AT_LINK, cb);
+ break;
+ }
+ case LLAssetType::AT_LINK_FOLDER:
+ {
+ LLViewerInventoryCategory *catp = item->getLinkedCategory();
+ // Skip copying outfit links.
+ if (catp && catp->getPreferredType() != LLFolderType::FT_OUTFIT)
+ {
+ link_inventory_item(gAgent.getID(),
+ item->getLinkedUUID(),
+ dst_id,
+ item->getName(),
+ LLAssetType::AT_LINK_FOLDER, cb);
+ }
+ break;
}
+ case LLAssetType::AT_CLOTHING:
+ case LLAssetType::AT_OBJECT:
+ case LLAssetType::AT_BODYPART:
+ case LLAssetType::AT_GESTURE:
+ {
+ copy_inventory_item(gAgent.getID(),
+ item->getPermissions().getOwner(),
+ item->getUUID(),
+ dst_id,
+ item->getName(),
+ cb);
+ break;
+ }
+ default:
+ // Ignore non-outfit asset types
+ break;
}
- else
+ }
+}
+
+BOOL LLAppearanceManager::getCanMakeFolderIntoOutfit(const LLUUID& folder_id)
+{
+ // These are the wearable items that are required for considering this
+ // folder as containing a complete outfit.
+ U32 required_wearables = 0;
+ required_wearables |= 1LL << WT_SHAPE;
+ required_wearables |= 1LL << WT_SKIN;
+ required_wearables |= 1LL << WT_HAIR;
+ required_wearables |= 1LL << WT_EYES;
+
+ // These are the wearables that the folder actually contains.
+ U32 folder_wearables = 0;
+ LLInventoryModel::cat_array_t* cats;
+ LLInventoryModel::item_array_t* items;
+ gInventory.getDirectDescendentsOf(folder_id, cats, items);
+ for (LLInventoryModel::item_array_t::const_iterator iter = items->begin();
+ iter != items->end();
+ ++iter)
+ {
+ const LLViewerInventoryItem* item = (*iter);
+ if (item->isWearableType())
{
- copy_inventory_item(
- gAgent.getID(),
- item->getPermissions().getOwner(),
- item->getUUID(),
- dst_id,
- item->getName(),
- cb);
+ const EWearableType wearable_type = item->getWearableType();
+ folder_wearables |= 1LL << wearable_type;
}
}
+
+ // If the folder contains the required wearables, return TRUE.
+ return ((required_wearables & folder_wearables) == required_wearables);
}
+
void LLAppearanceManager::purgeBaseOutfitLink(const LLUUID& category)
{
LLInventoryModel::cat_array_t cats;
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index e7e2f3352067dd834e08b0125eb3b901ada87b32..9d6cd34ad7d4153d13a30bf5f9577c39e36f4bb1 100644
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -60,6 +60,9 @@ class LLAppearanceManager: public LLSingleton<LLAppearanceManager>
void shallowCopyCategory(const LLUUID& src_id, const LLUUID& dst_id,
LLPointer<LLInventoryCallback> cb);
+ // Return whether this folder contains minimal contents suitable for making a full outfit.
+ BOOL getCanMakeFolderIntoOutfit(const LLUUID& folder_id);
+
// Copy all items in a category.
void shallowCopyCategoryContents(const LLUUID& src_id, const LLUUID& dst_id,
LLPointer<LLInventoryCallback> cb);
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 948d38befb7d4c89e4fa876948c19b663386aac2..6d4c90c2b95a9b368dc8c10c58f73fccacecdf90 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -304,7 +304,8 @@ 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_HRIGHT = 768;
//----------------------------------------------------------------------------
// List of entries from strings.xml to always replace
@@ -2362,12 +2363,35 @@ bool LLAppViewer::initWindow()
// store setting in a global for easy access and modification
gNoRender = gSavedSettings.getBOOL("DisableRendering");
+ S32 window_x = gSavedSettings.getS32("WindowX");
+ S32 window_y = gSavedSettings.getS32("WindowY");
+ S32 window_width = gSavedSettings.getS32("WindowWidth");
+ S32 window_height = gSavedSettings.getS32("WindowHeight");
+
+ bool show_maximized = gSavedSettings.getBOOL("WindowMaximized");
+
+ bool first_run = gSavedSettings.getBOOL("FirstLoginThisInstall");
+
+ if (first_run)//for first login
+ {
+ window_width = FIRST_RUN_WINDOW_WIDTH;//yep hardcoded
+ window_height = FIRST_RUN_WINDOW_HRIGHT;
+
+ //if screen resolution is lower then 1024*768 then show maximized
+ LLDisplayInfo display_info;
+ if(display_info.getDisplayWidth() <= FIRST_RUN_WINDOW_WIDTH
+ || display_info.getDisplayHeight()<=FIRST_RUN_WINDOW_HRIGHT)
+ {
+ show_maximized = true;
+ }
+ }
+
// always start windowed
BOOL ignorePixelDepth = gSavedSettings.getBOOL("IgnorePixelDepth");
gViewerWindow = new LLViewerWindow(gWindowTitle,
VIEWER_WINDOW_CLASSNAME,
- gSavedSettings.getS32("WindowX"), gSavedSettings.getS32("WindowY"),
- gSavedSettings.getS32("WindowWidth"), gSavedSettings.getS32("WindowHeight"),
+ window_x, window_y,
+ window_width, window_height,
FALSE, ignorePixelDepth);
LLNotificationsUI::LLNotificationManager::getInstance();
@@ -2378,7 +2402,7 @@ bool LLAppViewer::initWindow()
gViewerWindow->toggleFullscreen(FALSE);
}
- if (gSavedSettings.getBOOL("WindowMaximized"))
+ if (show_maximized)
{
gViewerWindow->mWindow->maximize();
gViewerWindow->getWindow()->setNativeAspectRatio(gSavedSettings.getF32("FullScreenAspectRatio"));
diff --git a/indra/newview/llfloatermediasettings.cpp b/indra/newview/llfloatermediasettings.cpp
index 62ec17f89a06b808623620cbba420fdead7f54c8..ee68faf84b7ec843e9cd47ac4dcf25f23825a04d 100644
--- a/indra/newview/llfloatermediasettings.cpp
+++ b/indra/newview/llfloatermediasettings.cpp
@@ -242,6 +242,12 @@ void LLFloaterMediaSettings::onBtnApply( void* userdata )
sInstance->commitFields();
sInstance->apply();
+
+ sInstance->mInitialValues.clear();
+ sInstance->mPanelMediaSettingsGeneral->getValues( sInstance->mInitialValues );
+ sInstance->mPanelMediaSettingsSecurity->getValues( sInstance->mInitialValues );
+ sInstance->mPanelMediaSettingsPermissions->getValues( sInstance->mInitialValues );
+
}
////////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 224514dd483c4548d3c20d81f21e77026d0e4517..8bffe9bf57a7aa8aa87eacf138db82356058fb20 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -537,10 +537,10 @@ void LLFloaterPreference::onOpen(const LLSD& key)
{
childSetText("maturity_desired_textbox", maturity_combo->getSelectedItemLabel());
childSetVisible("maturity_desired_combobox", false);
-
- // Display selected maturity icons.
- onChangeMaturity();
}
+
+ // Display selected maturity icons.
+ onChangeMaturity();
// Enabled/disabled popups, might have been changed by user actions
// while preferences floater was closed.
@@ -1289,7 +1289,7 @@ BOOL LLPanelPreference::postBuild()
if (hasChild("media_enabled"))
{
bool media_enabled = gSavedSettings.getBOOL("AudioStreamingMedia");
- getChild<LLCheckBoxCtrl>("voice_call_friends_only_check")->setCommitCallback(boost::bind(&showFriendsOnlyWarning, _1, _2));
+
getChild<LLCheckBoxCtrl>("media_enabled")->set(media_enabled);
getChild<LLCheckBoxCtrl>("autoplay_enabled")->setEnabled(media_enabled);
}
@@ -1297,7 +1297,11 @@ BOOL LLPanelPreference::postBuild()
{
getChild<LLCheckBoxCtrl>("music_enabled")->set(gSavedSettings.getBOOL("AudioStreamingMusic"));
}
-
+ if (hasChild("voice_call_friends_only_check"))
+ {
+ getChild<LLCheckBoxCtrl>("voice_call_friends_only_check")->setCommitCallback(boost::bind(&showFriendsOnlyWarning, _1, _2));
+ }
+
apply();
return true;
}
diff --git a/indra/newview/llfloaterscriptlimits.cpp b/indra/newview/llfloaterscriptlimits.cpp
index fdf128945e31128b5428577e91dbb001c8710124..122bdc8bc739b35ce2157642955d7ee7b6551f23 100644
--- a/indra/newview/llfloaterscriptlimits.cpp
+++ b/indra/newview/llfloaterscriptlimits.cpp
@@ -557,7 +557,7 @@ void LLPanelScriptLimitsRegionMemory::setParcelID(const LLUUID& parcel_id)
// virtual
void LLPanelScriptLimitsRegionMemory::setErrorStatus(U32 status, const std::string& reason)
{
- llerrs << "Can't handle remote parcel request."<< " Http Status: "<< status << ". Reason : "<< reason<<llendl;
+ llwarns << "Can't handle remote parcel request."<< " Http Status: "<< status << ". Reason : "<< reason<<llendl;
}
// callback from the name cache with an owner name to add to the list
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 8cdc50eb70537a2a344af25e7bfafdd011b2d8b0..77eaebb0bc70e7213a70b1301e0e2ed6b057ab3e 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -127,12 +127,6 @@ void LLIMFloater::onFocusReceived()
{
LLIMModel::getInstance()->setActiveSessionID(mSessionID);
- // return focus to the input field when active tab in the multitab container is clicked.
- if (isChatMultiTab() && mInputEditor)
- {
- mInputEditor->setFocus(TRUE);
- }
-
LLBottomTray::getInstance()->getChicletPanel()->setChicletToggleState(mSessionID, true);
}
@@ -682,15 +676,6 @@ void LLIMFloater::onInputEditorFocusReceived( LLFocusableElement* caller, void*
//in disconnected state IM input editor should be disabled
self->mInputEditor->setEnabled(!gDisconnected);
}
-
- // when IM Floater is a part of the multitab container LLTabContainer set focus to the first
- // child on tab button's mouse up. This leads input field lost focus. See EXT-3852.
- if (isChatMultiTab())
- {
- // So, clear control captured mouse to prevent LLTabContainer set focus on the panel's first child.
- // do not pass self->mInputEditor, this leads to have "Edit Text" mouse pointer wherever it is.
- gFocusMgr.setMouseCapture(NULL);
- }
}
// static
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 1dc601e26094d046272bb1b538cd2b042ac371db..b3f085ef6d566718a01243bbfbaf52077d52ca40 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -1565,7 +1565,7 @@ void LLCallDialog::onOpen(const LLSD& key)
LLDockableFloater::onOpen(key);
// it should be over the all floaters. EXT-5116
- gFloaterView->bringToFront(this);
+ gFloaterView->bringToFront(this, FALSE);
}
void LLCallDialog::setIcon(const LLSD& session_id, const LLSD& participant_id)
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 326f2a5577a652c5446db3708fc5faccb4ddeca6..83a466a243c2e2408ce27c5bfb2711edc01cf1ae 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1542,7 +1542,7 @@ void LLInventoryModel::bulkFetch(std::string url)
U32 folder_count=0;
U32 max_batch_size=5;
- U32 sort_order = gSavedSettings.getU32("InventorySortOrder") & 0x1;
+ U32 sort_order = gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER) & 0x1;
LLSD body;
LLSD body_lib;
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 37b03dbd7de75f3dbb5dd07c99e46ace408cd564..928a458b84296281fa1e5619616398651084fe3b 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -65,10 +65,6 @@ class LLInventoryPanel : public LLPanel
// Data
//--------------------------------------------------------------------
public:
- static const std::string DEFAULT_SORT_ORDER;
- static const std::string RECENTITEMS_SORT_ORDER;
- static const std::string INHERIT_SORT_ORDER;
-
struct Filter : public LLInitParam::Block<Filter>
{
Optional<U32> sort_order;
@@ -142,8 +138,6 @@ class LLInventoryPanel : public LLPanel
U32 getFilterPermMask() const { return mFolders->getFilterPermissions(); }
void setFilterSubString(const std::string& string);
const std::string getFilterSubString() { return mFolders->getFilterSubString(); }
- void setSortOrder(U32 order);
- U32 getSortOrder() { return mFolders->getSortOrder(); }
void setSinceLogoff(BOOL sl);
void setHoursAgo(U32 hours);
BOOL getSinceLogoff();
@@ -182,7 +176,6 @@ class LLInventoryPanel : public LLPanel
LLInventoryModel* mInventory;
LLInventoryObserver* mInventoryObserver;
BOOL mAllowMultiSelect;
- std::string mSortOrderSetting;
LLFolderView* mFolders;
LLScrollContainer* mScroller;
@@ -196,6 +189,20 @@ class LLInventoryPanel : public LLPanel
*/
const LLInventoryFVBridgeBuilder* mInvFVBridgeBuilder;
+
+ //--------------------------------------------------------------------
+ // Sorting
+ //--------------------------------------------------------------------
+public:
+ static const std::string DEFAULT_SORT_ORDER;
+ static const std::string RECENTITEMS_SORT_ORDER;
+ static const std::string INHERIT_SORT_ORDER;
+
+ void setSortOrder(U32 order);
+ U32 getSortOrder() const { return mFolders->getSortOrder(); }
+private:
+ std::string mSortOrderSetting;
+
//--------------------------------------------------------------------
// Hidden folders
//--------------------------------------------------------------------
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp
index 546017f0286dc0bc3527abf495e28fc70c66868c..88bb769109530adc7ab6af0b19d325ac356f8725 100644
--- a/indra/newview/llnotificationhandlerutil.cpp
+++ b/indra/newview/llnotificationhandlerutil.cpp
@@ -82,7 +82,7 @@ void LLSysHandler::removeExclusiveNotifications(const LLNotificationPtr& notif)
}
bool matches(const LLNotificationPtr notification) const
{
- for (std::set<std::string>::iterator it = mExclGroup.begin(); it
+ for (std::set<std::string>::const_iterator it = mExclGroup.begin(); it
!= mExclGroup.end(); it++)
{
std::string from_name = LLHandlerUtil::getSubstitutionName(notification);
diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp
index 03c4da93c4cde6e78d5faff3fe1ffd5ccbc5c9e7..5c6636676ceee4928d5c1c3db9f3cdfd755a94af 100644
--- a/indra/newview/llpanelclassified.cpp
+++ b/indra/newview/llpanelclassified.cpp
@@ -1183,6 +1183,7 @@ LLPanelClassifiedInfo::LLPanelClassifiedInfo()
, mTeleportClicksNew(0)
, mMapClicksNew(0)
, mProfileClicksNew(0)
+ , mSnapshotCtrl(NULL)
{
sAllPanels.push_back(this);
}
@@ -1212,7 +1213,8 @@ BOOL LLPanelClassifiedInfo::postBuild()
mScrollingPanelMinHeight = mScrollContainer->getScrolledViewRect().getHeight();
mScrollingPanelWidth = mScrollingPanel->getRect().getWidth();
- mSnapshotRect = getChild<LLUICtrl>("classified_snapshot")->getRect();
+ mSnapshotCtrl = getChild<LLTextureCtrl>("classified_snapshot");
+ mSnapshotRect = getDefaultSnapshotRect();
return TRUE;
}
@@ -1246,7 +1248,8 @@ void LLPanelClassifiedInfo::reshape(S32 width, S32 height, BOOL called_from_pare
mScrollingPanel->reshape(mScrollingPanelWidth + scrollbar_size, scroll_height);
}
- mSnapshotRect = getChild<LLUICtrl>("classified_snapshot")->getRect();
+ mSnapshotRect = getDefaultSnapshotRect();
+ stretchSnapshot();
}
void LLPanelClassifiedInfo::onOpen(const LLSD& key)
@@ -1266,6 +1269,7 @@ void LLPanelClassifiedInfo::onOpen(const LLSD& key)
resetData();
resetControls();
+ scrollToTop();
setClassifiedId(key["classified_id"]);
setClassifiedName(key["classified_name"]);
@@ -1321,7 +1325,10 @@ void LLPanelClassifiedInfo::processProperties(void* data, EAvatarProcessorType t
bool mature = is_cf_mature(c_info->flags);
childSetValue("content_type", mature ? mature_str : pg_str);
- childSetValue("auto_renew", is_cf_auto_renew(c_info->flags));
+
+ std::string auto_renew_str = is_cf_auto_renew(c_info->flags) ?
+ getString("auto_renew_on") : getString("auto_renew_off");
+ childSetValue("auto_renew", auto_renew_str);
price_str.setArg("[PRICE]", llformat("%d", c_info->price_for_listing));
childSetValue("price_for_listing", LLSD(price_str));
@@ -1355,8 +1362,12 @@ void LLPanelClassifiedInfo::resetData()
mMapClicksNew = 0;
mProfileClicksNew = 0;
- childSetValue("category", LLStringUtil::null);
- childSetValue("content_type", LLStringUtil::null);
+ childSetText("category", LLStringUtil::null);
+ childSetText("content_type", LLStringUtil::null);
+ childSetText("click_through_text", LLStringUtil::null);
+ childSetText("price_for_listing", LLStringUtil::null);
+ childSetText("auto_renew", LLStringUtil::null);
+ childSetText("creation_date", LLStringUtil::null);
childSetText("click_through_text", LLStringUtil::null);
}
@@ -1397,12 +1408,7 @@ void LLPanelClassifiedInfo::setClassifiedLocation(const std::string& location)
void LLPanelClassifiedInfo::setSnapshotId(const LLUUID& id)
{
- childSetValue("classified_snapshot", id);
- if(!mSnapshotStreched)
- {
- LLUICtrl* snapshot = getChild<LLUICtrl>("classified_snapshot");
- snapshot->setRect(mSnapshotRect);
- }
+ mSnapshotCtrl->setValue(id);
mSnapshotStreched = false;
}
@@ -1412,7 +1418,10 @@ void LLPanelClassifiedInfo::draw()
// Stretch in draw because it takes some time to load a texture,
// going to try to stretch snapshot until texture is loaded
- stretchSnapshot();
+ if(!mSnapshotStreched)
+ {
+ stretchSnapshot();
+ }
}
LLUUID LLPanelClassifiedInfo::getSnapshotId()
@@ -1471,6 +1480,7 @@ void LLPanelClassifiedInfo::setClickThrough(
ct_str.setArg("[TELEPORT]", llformat("%d", self->mTeleportClicksNew + self->mTeleportClicksOld));
ct_str.setArg("[MAP]", llformat("%d", self->mMapClicksNew + self->mMapClicksOld));
ct_str.setArg("[PROFILE]", llformat("%d", self->mProfileClicksNew + self->mProfileClicksOld));
+
self->childSetText("click_through_text", ct_str.getString());
// *HACK: remove this when there is enough room for click stats in the info panel
self->childSetToolTip("click_through_text", ct_str.getString());
@@ -1518,10 +1528,9 @@ void LLPanelClassifiedInfo::stretchSnapshot()
// *NOTE dzaporozhan
// Could be moved to LLTextureCtrl
- LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>("classified_snapshot");
- LLViewerFetchedTexture* texture = texture_ctrl->getTexture();
+ LLViewerFetchedTexture* texture = mSnapshotCtrl->getTexture();
- if(!texture || mSnapshotStreched)
+ if(!texture)
{
return;
}
@@ -1529,11 +1538,16 @@ void LLPanelClassifiedInfo::stretchSnapshot()
if(0 == texture->getOriginalWidth() || 0 == texture->getOriginalHeight())
{
// looks like texture is not loaded yet
- llinfos << "Missing image size" << llendl;
return;
}
LLRect rc = mSnapshotRect;
+ // *HACK dzaporozhan
+ // LLTextureCtrl uses BTN_HEIGHT_SMALL as bottom for texture which causes
+ // drawn texture to be smaller than expected. (see LLTextureCtrl::draw())
+ // Lets increase texture height to force texture look as expected.
+ rc.mBottom -= BTN_HEIGHT_SMALL;
+
F32 t_width = texture->getFullWidth();
F32 t_height = texture->getFullHeight();
@@ -1543,11 +1557,26 @@ void LLPanelClassifiedInfo::stretchSnapshot()
t_height *= ratio;
rc.setCenterAndSize(rc.getCenterX(), rc.getCenterY(), llfloor(t_width), llfloor(t_height));
- texture_ctrl->setRect(rc);
+ mSnapshotCtrl->setShape(rc);
mSnapshotStreched = true;
}
+LLRect LLPanelClassifiedInfo::getDefaultSnapshotRect()
+{
+ // Using scroll container makes getting default rect a hard task
+ // because rect in postBuild() and in first reshape() is not the same.
+ // Using snapshot_panel makes it easier to reshape snapshot.
+ return getChild<LLUICtrl>("snapshot_panel")->getLocalRect();
+}
+
+void LLPanelClassifiedInfo::scrollToTop()
+{
+ LLScrollContainer* scrollContainer = findChild<LLScrollContainer>("profile_scroll");
+ if (scrollContainer)
+ scrollContainer->goToTop();
+}
+
// static
// *TODO: move out of the panel
void LLPanelClassifiedInfo::sendClickMessage(
@@ -1574,7 +1603,6 @@ void LLPanelClassifiedInfo::sendClickMessage(
LLHTTPClient::post(url, body, new LLClassifiedClickMessageResponder());
}
-
void LLPanelClassifiedInfo::sendClickMessage(const std::string& type)
{
sendClickMessage(
@@ -1620,6 +1648,7 @@ LLPanelClassifiedEdit::LLPanelClassifiedEdit()
: LLPanelClassifiedInfo()
, mIsNew(false)
, mCanClose(false)
+ , mPublishFloater(NULL)
{
}
@@ -1671,6 +1700,8 @@ BOOL LLPanelClassifiedEdit::postBuild()
childSetAction("save_changes_btn", boost::bind(&LLPanelClassifiedEdit::onSaveClick, this));
childSetAction("set_to_curr_location_btn", boost::bind(&LLPanelClassifiedEdit::onSetLocationClick, this));
+ mSnapshotCtrl->setOnSelectCallback(boost::bind(&LLPanelClassifiedEdit::onTextureSelected, this));
+
return TRUE;
}
@@ -1680,6 +1711,8 @@ void LLPanelClassifiedEdit::onOpen(const LLSD& key)
mIsNew = classified_id.isNull();
+ scrollToTop();
+
if(mIsNew)
{
setAvatarId(gAgent.getID());
@@ -1725,6 +1758,9 @@ void LLPanelClassifiedEdit::onOpen(const LLSD& key)
enableEditing(false);
}
+ std::string save_btn_label = isNew() ? getString("publish_label") : getString("save_label");
+ childSetLabelArg("save_changes_btn", "[LABEL]", save_btn_label);
+
resetDirty();
setInfoLoaded(false);
}
@@ -1744,7 +1780,8 @@ void LLPanelClassifiedEdit::processProperties(void* data, EAvatarProcessorType t
setPosGlobal(c_info->pos_global);
setClassifiedLocation(createLocationText(c_info->parcel_name, c_info->sim_name, c_info->pos_global));
- getChild<LLComboBox>("category")->setCurrentByIndex(c_info->category + 1);
+ // *HACK see LLPanelClassifiedEdit::sendUpdate()
+ getChild<LLComboBox>("category")->setCurrentByIndex(c_info->category - 1);
getChild<LLComboBox>("category")->resetDirty();
bool mature = is_cf_mature(c_info->flags);
@@ -1753,6 +1790,7 @@ void LLPanelClassifiedEdit::processProperties(void* data, EAvatarProcessorType t
getChild<LLComboBox>("content_type")->setCurrentByIndex(mature ? CB_ITEM_MATURE : CB_ITEM_PG);
childSetValue("auto_renew", auto_renew);
childSetValue("price_for_listing", c_info->price_for_listing);
+ childSetEnabled("price_for_listing", isNew());
resetDirty();
setInfoLoaded(true);
@@ -1793,12 +1831,12 @@ void LLPanelClassifiedEdit::resetDirty()
getChild<LLUICtrl>("price_for_listing")->resetDirty();
}
-void LLPanelClassifiedEdit::setSaveCallback(const commit_callback_t& cb)
+void LLPanelClassifiedEdit::setSaveCallback(const commit_signal_t::slot_type& cb)
{
- getChild<LLButton>("save_changes_btn")->setClickedCallback(cb);
+ mSaveButtonClickedSignal.connect(cb);
}
-void LLPanelClassifiedEdit::setCancelCallback(const commit_callback_t& cb)
+void LLPanelClassifiedEdit::setCancelCallback(const commit_signal_t::slot_type& cb)
{
getChild<LLButton>("cancel_btn")->setClickedCallback(cb);
}
@@ -1811,6 +1849,7 @@ void LLPanelClassifiedEdit::resetControls()
getChild<LLComboBox>("content_type")->setCurrentByIndex(0);
childSetValue("auto_renew", false);
childSetValue("price_for_listing", MINIMUM_PRICE_FOR_LISTING);
+ childSetEnabled("price_for_listing", TRUE);
}
bool LLPanelClassifiedEdit::canClose()
@@ -1818,6 +1857,22 @@ bool LLPanelClassifiedEdit::canClose()
return mCanClose;
}
+void LLPanelClassifiedEdit::draw()
+{
+ LLPanel::draw();
+
+ // Need to re-stretch on every draw because LLTextureCtrl::onSelectCallback
+ // does not trigger callbacks when user navigates through images.
+ stretchSnapshot();
+}
+
+void LLPanelClassifiedEdit::stretchSnapshot()
+{
+ LLPanelClassifiedInfo::stretchSnapshot();
+
+ getChild<LLUICtrl>("edit_icon")->setShape(mSnapshotCtrl->getRect());
+}
+
void LLPanelClassifiedEdit::sendUpdate()
{
LLAvatarClassifiedInfo c_data;
@@ -1831,7 +1886,9 @@ void LLPanelClassifiedEdit::sendUpdate()
c_data.agent_id = gAgent.getID();
c_data.classified_id = getClassifiedId();
- c_data.category = getCategory();
+ // *HACK
+ // Categories on server start with 1 while combo-box index starts with 0
+ c_data.category = getCategory() + 1;
c_data.name = getClassifiedName();
c_data.description = getDescription();
c_data.parcel_id = getParcelId();
@@ -1846,7 +1903,7 @@ void LLPanelClassifiedEdit::sendUpdate()
U32 LLPanelClassifiedEdit::getCategory()
{
LLComboBox* cat_cb = getChild<LLComboBox>("category");
- return cat_cb->getCurrentIndex() + 1;
+ return cat_cb->getCurrentIndex();
}
U8 LLPanelClassifiedEdit::getFlags()
@@ -1905,6 +1962,11 @@ S32 LLPanelClassifiedEdit::getPriceForListing()
return childGetValue("price_for_listing").asInteger();
}
+void LLPanelClassifiedEdit::setPriceForListing(S32 price)
+{
+ childSetValue("price_for_listing", price);
+}
+
void LLPanelClassifiedEdit::onSetLocationClick()
{
setPosGlobal(gAgent.getPositionGlobal());
@@ -1948,9 +2010,45 @@ void LLPanelClassifiedEdit::onSaveClick()
}
}
+ if(isNew())
+ {
+ mPublishFloater = LLFloaterReg::findTypedInstance<LLPublishClassifiedFloater>(
+ "publish_classified", LLSD());
+
+ if(!mPublishFloater)
+ {
+ mPublishFloater = LLFloaterReg::getTypedInstance<LLPublishClassifiedFloater>(
+ "publish_classified", LLSD());
+
+ mPublishFloater->setPublishClickedCallback(boost::bind
+ (&LLPanelClassifiedEdit::onPublishFloaterPublishClicked, this));
+ }
+
+ // set spinner value before it has focus or value wont be set
+ mPublishFloater->setPrice(getPriceForListing());
+ mPublishFloater->openFloater(mPublishFloater->getKey());
+ mPublishFloater->center();
+ }
+ else
+ {
+ doSave();
+ }
+}
+
+void LLPanelClassifiedEdit::doSave()
+{
mCanClose = true;
sendUpdate();
resetDirty();
+
+ mSaveButtonClickedSignal(this, LLSD());
+}
+
+void LLPanelClassifiedEdit::onPublishFloaterPublishClicked()
+{
+ setPriceForListing(mPublishFloater->getPrice());
+
+ doSave();
}
std::string LLPanelClassifiedEdit::getLocationNotice()
@@ -1997,4 +2095,52 @@ void LLPanelClassifiedEdit::onTexturePickerMouseLeave(LLUICtrl* ctrl)
ctrl->setVisible(FALSE);
}
+void LLPanelClassifiedEdit::onTextureSelected()
+{
+ setSnapshotId(mSnapshotCtrl->getValue().asUUID());
+}
+
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+
+LLPublishClassifiedFloater::LLPublishClassifiedFloater(const LLSD& key)
+ : LLFloater(key)
+{
+}
+
+LLPublishClassifiedFloater::~LLPublishClassifiedFloater()
+{
+}
+
+BOOL LLPublishClassifiedFloater::postBuild()
+{
+ LLFloater::postBuild();
+
+ childSetAction("publish_btn", boost::bind(&LLFloater::closeFloater, this, false));
+ childSetAction("cancel_btn", boost::bind(&LLFloater::closeFloater, this, false));
+
+ return TRUE;
+}
+
+void LLPublishClassifiedFloater::setPrice(S32 price)
+{
+ childSetValue("price_for_listing", price);
+}
+
+S32 LLPublishClassifiedFloater::getPrice()
+{
+ return childGetValue("price_for_listing").asInteger();
+}
+
+void LLPublishClassifiedFloater::setPublishClickedCallback(const commit_signal_t::slot_type& cb)
+{
+ getChild<LLButton>("publish_btn")->setClickedCallback(cb);
+}
+
+void LLPublishClassifiedFloater::setCancelClickedCallback(const commit_signal_t::slot_type& cb)
+{
+ getChild<LLButton>("cancel_btn")->setClickedCallback(cb);
+}
+
//EOF
diff --git a/indra/newview/llpanelclassified.h b/indra/newview/llpanelclassified.h
index 31f585e9cc567e6727b302992cb065012b683298..58e7c9a4b41ba0598eb6dbd3d9d3597b46b8997d 100644
--- a/indra/newview/llpanelclassified.h
+++ b/indra/newview/llpanelclassified.h
@@ -202,6 +202,23 @@ class LLFloaterPriceForListing
void* mUserData;
};
+class LLPublishClassifiedFloater : public LLFloater
+{
+public:
+ LLPublishClassifiedFloater(const LLSD& key);
+ virtual ~LLPublishClassifiedFloater();
+
+ /*virtual*/ BOOL postBuild();
+
+ void setPrice(S32 price);
+ S32 getPrice();
+
+ void setPublishClickedCallback(const commit_signal_t::slot_type& cb);
+ void setCancelClickedCallback(const commit_signal_t::slot_type& cb);
+
+private:
+};
+
class LLPanelClassifiedInfo : public LLPanel, public LLAvatarPropertiesObserver
{
LOG_CLASS(LLPanelClassifiedInfo);
@@ -298,10 +315,18 @@ class LLPanelClassifiedInfo : public LLPanel, public LLAvatarPropertiesObserver
void stretchSnapshot();
void sendClickMessage(const std::string& type);
+ LLRect getDefaultSnapshotRect();
+
+ void scrollToTop();
+
void onMapClick();
void onTeleportClick();
void onExit();
+ bool mSnapshotStreched;
+ LLRect mSnapshotRect;
+ LLTextureCtrl* mSnapshotCtrl;
+
private:
LLUUID mAvatarId;
@@ -312,9 +337,6 @@ class LLPanelClassifiedInfo : public LLPanel, public LLAvatarPropertiesObserver
bool mFromSearch;
bool mInfoLoaded;
- bool mSnapshotStreched;
- LLRect mSnapshotRect;
-
LLScrollContainer* mScrollContainer;
LLPanel* mScrollingPanel;
@@ -352,9 +374,9 @@ class LLPanelClassifiedEdit : public LLPanelClassifiedInfo
/*virtual*/ void resetDirty();
- void setSaveCallback(const commit_callback_t& cb);
+ void setSaveCallback(const commit_signal_t::slot_type& cb);
- void setCancelCallback(const commit_callback_t& cb);
+ void setCancelCallback(const commit_signal_t::slot_type& cb);
/*virtual*/ void resetControls();
@@ -362,6 +384,10 @@ class LLPanelClassifiedEdit : public LLPanelClassifiedInfo
bool canClose();
+ void draw();
+
+ void stretchSnapshot();
+
protected:
LLPanelClassifiedEdit();
@@ -378,6 +404,8 @@ class LLPanelClassifiedEdit : public LLPanelClassifiedInfo
S32 getPriceForListing();
+ void setPriceForListing(S32 price);
+
U8 getFlags();
std::string getLocationNotice();
@@ -390,12 +418,22 @@ class LLPanelClassifiedEdit : public LLPanelClassifiedInfo
void onChange();
void onSaveClick();
+ void doSave();
+
+ void onPublishFloaterPublishClicked();
+
void onTexturePickerMouseEnter(LLUICtrl* ctrl);
void onTexturePickerMouseLeave(LLUICtrl* ctrl);
+ void onTextureSelected();
+
private:
bool mIsNew;
bool mCanClose;
+
+ LLPublishClassifiedFloater* mPublishFloater;
+
+ commit_signal_t mSaveButtonClickedSignal;
};
#endif // LL_LLPANELCLASSIFIED_H
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 50cfc7d17775011cd9297eb2d8c3e0b4cc790f56..421c9df9a1584e8c1b913c07db9f991f61c7b685 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -117,7 +117,7 @@ LLPanelMainInventory::LLPanelMainInventory()
// Controls
// *TODO: Just use persistant settings for each of these
- U32 sort_order = gSavedSettings.getU32("InventorySortOrder");
+ U32 sort_order = gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER);
BOOL sort_by_name = ! ( sort_order & LLInventoryFilter::SO_DATE );
BOOL sort_folders_by_name = ( sort_order & LLInventoryFilter::SO_FOLDERS_BY_NAME );
BOOL sort_system_folders_to_top = ( sort_order & LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP );
@@ -145,7 +145,7 @@ BOOL LLPanelMainInventory::postBuild()
if (mActivePanel)
{
// "All Items" is the previous only view, so it gets the InventorySortOrder
- mActivePanel->setSortOrder(gSavedSettings.getU32("InventorySortOrder"));
+ mActivePanel->setSortOrder(gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER));
mActivePanel->getFilter()->markDefault();
mActivePanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState);
mActivePanel->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, mActivePanel, _1, _2));
diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp
index 0630981d7e9e231b0049c81703c549d39939f852..6ebe55e3625baa155cbd3d140bf4b7b6f8f460f3 100644
--- a/indra/newview/llsidepaneltaskinfo.cpp
+++ b/indra/newview/llsidepaneltaskinfo.cpp
@@ -100,6 +100,8 @@ BOOL LLSidepanelTaskInfo::postBuild()
mPayBtn->setClickedCallback(boost::bind(&LLSidepanelTaskInfo::onPayButtonClicked, this));
mBuyBtn = getChild<LLButton>("buy_btn");
mBuyBtn->setClickedCallback(boost::bind(&LLSidepanelTaskInfo::onBuyButtonClicked, this));
+ mDetailsBtn = getChild<LLButton>("details_btn");
+ mDetailsBtn->setClickedCallback(boost::bind(&LLSidepanelTaskInfo::onDetailsButtonClicked, this));
mLabelGroupName = getChild<LLNameBox>("Group Name Proxy");
@@ -1122,6 +1124,15 @@ void LLSidepanelTaskInfo::updateVerbs()
//mEditBtn->setEnabled(obj && obj->permModify());
*/
+ LLSafeHandle<LLObjectSelection> object_selection = LLSelectMgr::getInstance()->getSelection();
+ const BOOL multi_select = (object_selection->getNumNodes() > 1);
+
+ mOpenBtn->setVisible(!multi_select);
+ mPayBtn->setVisible(!multi_select);
+ mBuyBtn->setVisible(!multi_select);
+ mDetailsBtn->setVisible(multi_select);
+ mDetailsBtn->setEnabled(multi_select);
+
mOpenBtn->setEnabled(enable_object_open());
mPayBtn->setEnabled(enable_pay_object());
mBuyBtn->setEnabled(enable_buy_object());
@@ -1145,6 +1156,11 @@ void LLSidepanelTaskInfo::onBuyButtonClicked()
doClickAction(CLICK_ACTION_BUY);
}
+void LLSidepanelTaskInfo::onDetailsButtonClicked()
+{
+ LLFloaterReg::showInstance("inspect", LLSD());
+}
+
// virtual
void LLSidepanelTaskInfo::save()
{
diff --git a/indra/newview/llsidepaneltaskinfo.h b/indra/newview/llsidepaneltaskinfo.h
index cf36c20767b9089ddcea0244fbbc4d5efd642deb..e41627435fdc852d64f2702c505c7953cdd26249 100644
--- a/indra/newview/llsidepaneltaskinfo.h
+++ b/indra/newview/llsidepaneltaskinfo.h
@@ -109,10 +109,12 @@ class LLSidepanelTaskInfo : public LLSidepanelInventorySubpanel
void onOpenButtonClicked();
void onPayButtonClicked();
void onBuyButtonClicked();
+ void onDetailsButtonClicked();
private:
LLButton* mOpenBtn;
LLButton* mPayBtn;
LLButton* mBuyBtn;
+ LLButton* mDetailsBtn;
protected:
LLViewerObject* getObject();
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 8370c98470d03136673844335f76b7acee38d708..65e9d8971a88e925d87481f861cacbd28f45bb0e 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -117,6 +117,7 @@
#include "llmoveview.h"
#include "llnearbychat.h"
#include "llpanelblockedlist.h"
+#include "llpanelclassified.h"
#include "llpreviewanim.h"
#include "llpreviewgesture.h"
#include "llpreviewnotecard.h"
@@ -219,6 +220,7 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("preview_sound", "floater_preview_sound.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewSound>, "preview");
LLFloaterReg::add("preview_texture", "floater_preview_texture.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewTexture>, "preview");
LLFloaterReg::add("properties", "floater_inventory_item_properties.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterProperties>);
+ LLFloaterReg::add("publish_classified", "floater_publish_classified.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPublishClassifiedFloater>);
LLFloaterReg::add("telehubs", "floater_telehub.xml",&LLFloaterReg::build<LLFloaterTelehub>);
LLFloaterReg::add("test_inspectors", "floater_test_inspectors.xml",
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index f02e854db6e20141b019a43b4fde75e65258d8e7..80336e5c5a52d00774faa5790cbcd76e7b6af719 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -48,6 +48,7 @@
#include "llsidetray.h"
#include "llinventorybridge.h"
+#include "llinventorypanel.h"
#include "llfloaterinventory.h"
#include "llviewerassettype.h"
@@ -525,7 +526,7 @@ bool LLViewerInventoryCategory::fetchDescendents()
// 2 = folders by date
// Need to mask off anything but the first bit.
// This comes from LLInventoryFilter from llfolderview.h
- U32 sort_order = gSavedSettings.getU32("InventorySortOrder") & 0x1;
+ U32 sort_order = gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER) & 0x1;
// *NOTE: For bug EXT-2879, originally commented out
// gAgent.getRegion()->getCapability in order to use the old
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 344c4c469b20302d9e623d12fd0f465c6b97c78d..8acd343cf5a86abfbddf71e8a255037394ba532a 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -700,9 +700,9 @@ void LLViewerMedia::updateMedia(void *dummy_arg)
impl_list::iterator iter = sViewerMediaImplList.begin();
impl_list::iterator end = sViewerMediaImplList.end();
- for(; iter != end; iter++)
+ for(; iter != end;)
{
- LLViewerMediaImpl* pimpl = *iter;
+ LLViewerMediaImpl* pimpl = *iter++;
pimpl->update();
pimpl->calculateInterest();
}
@@ -1229,6 +1229,19 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
std::string user_data_path = gDirUtilp->getOSUserAppDir();
user_data_path += gDirUtilp->getDirDelimiter();
+ // Fix for EXT-5960 - make browser profile specific to user (cache, cookies etc.)
+ // If the linden username returned is blank, that can only mean we are
+ // at the login page displaying login Web page or Web browser test via Develop menu.
+ // In this case we just use whatever gDirUtilp->getOSUserAppDir() gives us (this
+ // is what we always used before this change)
+ std::string linden_user_dir = gDirUtilp->getLindenUserDir();
+ if ( ! linden_user_dir.empty() )
+ {
+ // gDirUtilp->getLindenUserDir() is whole path, not just Linden name
+ user_data_path = linden_user_dir;
+ user_data_path += gDirUtilp->getDirDelimiter();
+ };
+
// See if the plugin executable exists
llstat s;
if(LLFile::stat(launcher_name, &s))
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 131c6ac1a1560b6ec89de64f66975609ebab5607..acd12099cd0d5a8aada6d0eea99e87a65f78acfd 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -1723,7 +1723,7 @@ BOOL LLVOAvatarSelf::canGrabLocalTexture(ETextureIndex type, U32 index) const
return FALSE;
}
- if (gAgent.isGodlike())
+ if (gAgent.isGodlikeWithoutAdminMenuFakery())
return TRUE;
// Check permissions of textures that show up in the
diff --git a/indra/newview/res/ll_icon.ico b/indra/newview/res/ll_icon.ico
index c35a3fa3a3423e3ce6de9568c28978930ca99fe8..87985b9285118128e6e9e3eb344fdde0b60481d7 100644
Binary files a/indra/newview/res/ll_icon.ico and b/indra/newview/res/ll_icon.ico differ
diff --git a/indra/newview/secondlife.icns b/indra/newview/secondlife.icns
index ceb6036e0ef7805a2386693a5baf872e87c5427e..4560d4bb2440bbeed09e95039ba4a42450d61af7 100644
Binary files a/indra/newview/secondlife.icns and b/indra/newview/secondlife.icns differ
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index c617dacec52f21ec76b44b4114ca80f6face312f..d45d6155dde786c8b9ec107eb36c1b1336dec077 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -344,7 +344,7 @@
value="0.92 0.92 1 0.78" />
<color
name="GridlineColor"
- reference="Red" />
+ reference="White" />
<color
name="GridlineShadowColor"
value="0 0 0 0.31" />
@@ -359,7 +359,7 @@
reference="White"/>
<color
name="GroupNotifyDimmedTextColor"
- reference="LtGray" />
+ reference="DkGray" />
<color
name="GroupOverTierColor"
value="0.43 0.06 0.06 1" />
diff --git a/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png b/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png
index 605073d786983847a87f732a0bc7c41524541777..95913dd55ba23810831b09edc29f8431b7a99008 100644
Binary files a/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png and b/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 4768cf14fb295195790ffe82948ffe59eb34d7b1..b1594816b21fb20b59a796d6d4571fae76960801 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -83,7 +83,7 @@ with the same filename but different name
<texture name="BottomTray_Scroll_Left" file_name="navbar/Arrow_Left_Off.png" preload="false" />
<texture name="BuyArrow_Off" file_name="navbar/BuyArrow_Off.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" />
- <texture name="BuyArrow_Over" file_name="navbar/BuyArrow_Over.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" />
+ <texture name="BuyArrow_Over" file_name="navbar/BuyArrow_Over.png" preload="true" scale.left="0" scale.top="1" scale.right="0" scale.bottom="0" />
<texture name="BuyArrow_Press" file_name="navbar/BuyArrow_Press.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" />
<texture name="Cam_Avatar_Disabled" file_name="bottomtray/Cam_Avatar_Disabled.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml
index eb63b5c975293a3aeeb79f2930ab151342cc8dc4..91db3c6b1cd09ccc5b769a2f218aa80821a5bc34 100644
--- a/indra/newview/skins/default/xui/da/floater_about.xml
+++ b/indra/newview/skins/default/xui/da/floater_about.xml
@@ -8,7 +8,7 @@
Bygget med [COMPILER] version [COMPILER_VERSION]
</floater.string>
<floater.string name="AboutPosition">
- Du er ved [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] i [REGION] lokaliseret på [HOSTNAME] ([HOSTIP])
+ Du er ved [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] i regionen [REGION] lokaliseret ved <nolink>[HOSTNAME]</nolink> ([HOSTIP])
[SERVER_VERSION]
[[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]]
</floater.string>
@@ -43,13 +43,9 @@ Vivox Version: [VIVOX_VERSION]
</panel>
<panel label="Tak til" name="credits_panel">
<text_editor name="credits_editor">
- Second Life er gjort muligt for dig af Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl and many others.
+ Second Life er gjort muligt for dig af Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les og mange flere.
-Tak til følgende beboerne for at bidrage til at sikre, at dette er den bedste version til dato: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
-
-
-
-I get by with a little help from my friends. --Richard Starkey
+Tak til følgende beboere for at sikre at denne klient er den bedste version indtil nu: (under udarbejdelse)
</text_editor>
</panel>
<panel label="Licenser" name="licenses_panel">
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 b4af42753899a9715432fe313bbca7167af109f5..9bda1397bc918952ce3f56eeeae217037bab388f 100644
--- a/indra/newview/skins/default/xui/da/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_about_land.xml
@@ -81,6 +81,9 @@ Gå til 'Verden' > 'Om land' eller vælg en anden parcel
<text name="Group:">
Gruppe:
</text>
+ <text name="GroupText">
+ Leyla Linden
+ </text>
<button label="Vælg..." label_selected="Vælg..." name="Set..."/>
<check_box label="Tillad dedikering til gruppe" name="check deed" tool_tip="En gruppe 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."/>
@@ -124,6 +127,7 @@ Gå til 'Verden' > 'Om land' eller vælg en anden parcel
0
</text>
<button label="Køb land..." label_selected="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..."/>
@@ -377,12 +381,9 @@ Kun større parceller kan vises i søgning.
</text>
<combo_box name="media type" tool_tip="Specificer om URL-adressen er til en film, hjemmeside eller et andet medie."/>
<text left="4" name="at URL:">
- Medie URL:
+ Hjemmeside:
</text>
<button label="Vælg..." label_selected="Vælg..." name="set_media_url"/>
- <text name="CurrentURL:">
- Nuværende side:
- </text>
<check_box label="Skjul medie URL" name="hide_media_url" tool_tip="Klik her for at skjule medie adressen så det kun er dig og evt. parcel gruppens ejer/administratorer der kan se den."/>
<text left="4" name="Description:">
Beskrivelse:
@@ -393,8 +394,8 @@ Kun større parceller kan vises i søgning.
</text>
<texture_picker label="" name="media texture" tool_tip="Klik for at vælge billede"/>
<text name="replace_texture_help">
- (Objekter der har denne tekstur vil vise filmen eller
-web-siden, efter du klikker på play knappen.)
+ Objekter der har denne tekstur vil vise filmen eller web-siden, efter du klikker på play knappen. Vælg
+ Objects using this texture will show the movie or web page after you click the play arrow. Select the thumbnail for at vælge anden tekstur.
</text>
<check_box label="Auto skalér" name="media_auto_scale" tool_tip="Vælg denne mulighed for at skalere indholdet for dette parcel automatisk. Det kan være lidt langsommere og have lavere kvalitet, men ingen anden tekstur skalering eller tilpasning vil være nødvendigt."/>
<text name="media_size" tool_tip="Størrelse for rendering af Web medie, benyt 0 for standard." width="105">
@@ -411,8 +412,10 @@ web-siden, efter du klikker på play knappen.)
<check_box label="Gentag afspil" name="media_loop" tool_tip="Gentager automatisk medie, når det er færdigt med at spille starter det automatisk forfra."/>
</panel>
<panel label="LYD" name="land_audio_panel">
+ <check_box label="Skjul URL" name="hide_music_url" tool_tip="Ved at vælge her, vil musik URL skjules for alle ikke autoriserede brugere der læser denne parcels information."/>
<check_box label="Tillad stemmer" name="parcel_enable_voice_channel"/>
<check_box label="Tillad stemmer (håndteret af estate)" name="parcel_enable_voice_channel_is_estate_disabled"/>
+ <check_box label="Begræns stemme chat til denne parcel" name="parcel_enable_voice_channel_local"/>
</panel>
<panel label="ADGANG" name="land_access_panel">
<panel.string name="access_estate_defined">
@@ -428,8 +431,8 @@ web-siden, efter du klikker på play knappen.)
<text name="Only Allow">
Blokér adgang for::
</text>
- <check_box label="Beboere der ikke har givet betalings oplysninger til Linden Lab [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Blokér beboere der ikke har afgivet identifikationsoplysninger."/>
- <check_box label="Alders verifikation [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Blokér beboere der ikke har verificeret deres alder. Se support.secondlife.com for mere information."/>
+ <check_box label="Beboere der ikke har givet betalings oplysninger til Linden Lab [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Blokér for uidentificerede beboere."/>
+ <check_box label="Alders verifikation [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Blokér for beboere som ikke er alders-verificerede. Se [SUPPORT_SITE] for mere information."/>
<check_box label="Tillad adgang til gruppen: [GROUP]" name="GroupCheck" tool_tip="Vælg gruppe under fanen 'generelt'."/>
<check_box label="Sælg adgang til:" name="PassCheck" tool_tip="Tillader midlertidig adgang til denne parcel"/>
<combo_box name="pass_combo">
diff --git a/indra/newview/skins/default/xui/da/floater_animation_preview.xml b/indra/newview/skins/default/xui/da/floater_animation_preview.xml
index 47e02f070443a2b8c3eee606d877e7d32bb31676..fdbfd737ba7c61facbe36f4a1dc5c5620f152a11 100644
--- a/indra/newview/skins/default/xui/da/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/da/floater_animation_preview.xml
@@ -106,6 +106,9 @@ Maksimal animations længde er [MAX_LENGTH] sekunder.
<floater.string name="E_ST_NO_XLT_EMOTE">
kan ikke læse "emote" navn.
</floater.string>
+ <floater.string name="E_ST_BAD_ROOT">
+ Incorrect root joint name, use "hip".
+ </floater.string>
<text name="name_label">
Navn:
</text>
diff --git a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
index 1111c5e18ba9371d4d20ab160babab5058fa0008..e405a1beb8430637ce2bc8764e8aa70c23bc49e3 100644
--- a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
@@ -7,26 +7,37 @@
Blandede teksturer
</text>
<button label="Drop" label_selected="Dump" name="Dump"/>
- <texture_picker label="HÃ¥r" name="hair_grain"/>
- <texture_picker label="Alpha - hår" name="hair_alpha"/>
- <texture_picker label="Makeup" name="head_bodypaint"/>
- <texture_picker label="Alpha - hoved" name="head_alpha"/>
- <texture_picker label="Tatovering hovede" name="head_tattoo"/>
- <texture_picker label="Øje" name="eyes_iris"/>
- <texture_picker label="Alpha - øjne" name="eyes_alpha"/>
- <texture_picker label="Bodypaint - overkrop" name="upper_bodypaint"/>
- <texture_picker label="Undertrøje" name="upper_undershirt"/>
- <texture_picker label="Handsker" name="upper_gloves"/>
- <texture_picker label="Trøje" name="upper_shirt"/>
- <texture_picker label="Øvre jakke" name="upper_jacket"/>
- <texture_picker label="Alpha - øvre" name="upper_alpha"/>
- <texture_picker label="Øvre tatovering" name="upper_tattoo"/>
- <texture_picker label="Bodypaint - underkrop" name="lower_bodypaint"/>
- <texture_picker label="Undertøj" name="lower_underpants"/>
- <texture_picker label="Strømper" name="lower_socks"/>
- <texture_picker label="Sko" name="lower_shoes"/>
- <texture_picker label="Bukser" name="lower_pants"/>
- <texture_picker label="Jakke" name="lower_jacket"/>
- <texture_picker label="Alpha - nedre" name="lower_alpha"/>
- <texture_picker label="Nedre tatovering" name="lower_tattoo"/>
+ <scroll_container name="profile_scroll">
+ <panel name="scroll_content_panel">
+ <texture_picker label="HÃ¥r" name="hair-baked"/>
+ <texture_picker label="HÃ¥r" name="hair_grain"/>
+ <texture_picker label="Alpha - hår" name="hair_alpha"/>
+ <texture_picker label="Hoved" name="head-baked"/>
+ <texture_picker label="Makeup" name="head_bodypaint"/>
+ <texture_picker label="Alpha - hoved" name="head_alpha"/>
+ <texture_picker label="Tatovering - hoved" name="head_tattoo"/>
+ <texture_picker label="Eyes" name="eyes-baked"/>
+ <texture_picker label="Øje" name="eyes_iris"/>
+ <texture_picker label="Alpha - øjne" name="eyes_alpha"/>
+ <texture_picker label="Overkrop" name="upper-baked"/>
+ <texture_picker label="Bodypaint - overkrop" name="upper_bodypaint"/>
+ <texture_picker label="Undertrøje" name="upper_undershirt"/>
+ <texture_picker label="Handsker" name="upper_gloves"/>
+ <texture_picker label="Trøje" name="upper_shirt"/>
+ <texture_picker label="Jakke - foroven" name="upper_jacket"/>
+ <texture_picker label="Alpha - øvre" name="upper_alpha"/>
+ <texture_picker label="Tatovering - øvre" name="upper_tattoo"/>
+ <texture_picker label="Ben" name="lower-baked"/>
+ <texture_picker label="Bodypaint - ben" name="lower_bodypaint"/>
+ <texture_picker label="Underbukser" name="lower_underpants"/>
+ <texture_picker label="Strømper" name="lower_socks"/>
+ <texture_picker label="Sko" name="lower_shoes"/>
+ <texture_picker label="Bukser" name="lower_pants"/>
+ <texture_picker label="Jakke" name="lower_jacket"/>
+ <texture_picker label="Alpha - nedre" name="lower_alpha"/>
+ <texture_picker label="Tatovering - nedre" name="lower_tattoo"/>
+ <texture_picker label="Nederdel" name="skirt-baked"/>
+ <texture_picker label="Nederdel" name="skirt"/>
+ </panel>
+ </scroll_container>
</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_beacons.xml b/indra/newview/skins/default/xui/da/floater_beacons.xml
index d67d859e7bb1ace289952441d076e5edcf71e048..8049b072cecb59ef8450a65f70158e0d2f2510a0 100644
--- a/indra/newview/skins/default/xui/da/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/da/floater_beacons.xml
@@ -2,7 +2,7 @@
<floater name="beacons" title="PEJLELYS">
<panel name="beacons_panel">
<text name="label_show">
- Vis:
+ Vis :
</text>
<check_box label="Pejlelys" name="beacons"/>
<check_box label="Fremhævninger" name="highlights"/>
diff --git a/indra/newview/skins/default/xui/da/floater_bulk_perms.xml b/indra/newview/skins/default/xui/da/floater_bulk_perms.xml
index 0dd1a4f6ba627784d5cba84c6a69457f3813711f..58a1c1b73e5f18fc54b7a1c0535936e81bc2a2bd 100644
--- a/indra/newview/skins/default/xui/da/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/da/floater_bulk_perms.xml
@@ -49,6 +49,6 @@
<check_box label="Redigere" name="next_owner_modify"/>
<check_box label="Kopiére" name="next_owner_copy"/>
<check_box initial_value="true" label="Overfør" name="next_owner_transfer" tool_tip="Næste ejer kan sælge eller forære dette objekt væk"/>
- <button label="Ok" name="apply"/>
+ <button label="OK" name="apply"/>
<button label="Annullér" name="close"/>
</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency.xml b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
index 18ee0e05978bf64bdef4ef62826c3d03ecd87e3e..49c22649567b02bf48f254cd91a01f04d34dd7ae 100644
--- a/indra/newview/skins/default/xui/da/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
@@ -46,7 +46,7 @@
L$ [AMT]
</text>
<text name="currency_links">
- [http://www.secondlife.com/ payment method] | [http://www.secondlife.com/ currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate]
+ [http://www.secondlife.com/my/account/payment_method_management.php payment method] | [http://www.secondlife.com/my/account/currency.php currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate]
</text>
<text name="exchange_rate_note">
Indtast beløbet for at se nyeste valutakurs.
diff --git a/indra/newview/skins/default/xui/da/floater_buy_land.xml b/indra/newview/skins/default/xui/da/floater_buy_land.xml
index 987ad6585f606ffdac1178aec0967bf7a2182149..57bcc7ad9d0308cd96737cd7e2b9c5a83a0ca5b9 100644
--- a/indra/newview/skins/default/xui/da/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_land.xml
@@ -1,5 +1,134 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="buy land" title="KØB LAND">
+ <floater.string name="can_resell">
+ Kan videresælges.
+ </floater.string>
+ <floater.string name="can_not_resell">
+ Kan ikke videresælges.
+ </floater.string>
+ <floater.string name="can_change">
+ Kan samles eller opdeles.
+ </floater.string>
+ <floater.string name="can_not_change">
+ Kan ikke samles eller opdeles.
+ </floater.string>
+ <floater.string name="cant_buy_for_group">
+ Du har ikke tilladelse til at købe land for din aktive gruppe.
+ </floater.string>
+ <floater.string name="no_land_selected">
+ Intet land er valgt.
+ </floater.string>
+ <floater.string name="multiple_parcels_selected">
+ Flere forskellige parceller er valgt.
+Prøv at vælge et mindre område.
+ </floater.string>
+ <floater.string name="no_permission">
+ Du har ikke tilladelse til at købe jord for din aktive gruppe.
+ </floater.string>
+ <floater.string name="parcel_not_for_sale">
+ Det udvalgte parcel er ikke til salg.
+ </floater.string>
+ <floater.string name="group_already_owns">
+ Gruppen ejer allerede parcellet.
+ </floater.string>
+ <floater.string name="you_already_own">
+ Du ejer allerede parcellet.
+ </floater.string>
+ <floater.string name="set_to_sell_to_other">
+ Det udvalgte parcel er sat til salg til en anden.
+ </floater.string>
+ <floater.string name="no_public_land">
+ Det valgte område har ingen offentlige arealer.
+ </floater.string>
+ <floater.string name="not_owned_by_you">
+ Jord, der ejes af en anden bruger er valgt.
+Prøv at vælge et mindre område.
+ </floater.string>
+ <floater.string name="processing">
+ Forarbejder dit køb...
+
+(Dette kan tage et minut eller to.)
+ </floater.string>
+ <floater.string name="fetching_error">
+ Der er sket en fejl under hentning af jord købs oplysninger.
+ </floater.string>
+ <floater.string name="buying_will">
+ Køb af dette areal vil:
+ </floater.string>
+ <floater.string name="buying_for_group">
+ Køb af dette areal vil:
+ </floater.string>
+ <floater.string name="cannot_buy_now">
+ Kan ikke købe nu:
+ </floater.string>
+ <floater.string name="not_for_sale">
+ Ikke til salg:
+ </floater.string>
+ <floater.string name="none_needed">
+ ikke nødvendigt
+ </floater.string>
+ <floater.string name="must_upgrade">
+ Din konto skal være opgraderet for at eje jord.
+ </floater.string>
+ <floater.string name="cant_own_land">
+ Din konto kan eje jord.
+ </floater.string>
+ <floater.string name="land_holdings">
+ Du ejer [BUYER] m² land.
+ </floater.string>
+ <floater.string name="pay_to_for_land">
+ Betal L$ [AMOUNT] til [SELLER] for dette stykke jord
+ </floater.string>
+ <floater.string name="buy_for_US">
+ Køb L$ [AMOUNT] for ca. [LOCAL_AMOUNT],
+ </floater.string>
+ <floater.string name="parcel_meters">
+ Denne parcel er på [AMOUNT] m²
+ </floater.string>
+ <floater.string name="premium_land">
+ Dette stykke jord er premium, og vil tælle som [AMOUNT] m².
+ </floater.string>
+ <floater.string name="discounted_land">
+ Dette stykke jord er på tilbud, og vil tælle som [AMOUNT] m².
+ </floater.string>
+ <floater.string name="meters_supports_object">
+ [AMOUNT] m²
+kan indeholde [AMOUNT2] objekter
+ </floater.string>
+ <floater.string name="sold_with_objects">
+ solgt med objekter
+ </floater.string>
+ <floater.string name="sold_without_objects">
+ objekter ikke inkluderet
+ </floater.string>
+ <floater.string name="info_price_string">
+ L$ [PRICE]
+(L$ [PRICE_PER_SQM]/m²)
+[SOLD_WITH_OBJECTS]
+ </floater.string>
+ <floater.string name="insufficient_land_credits">
+ Gruppen [GROUP] skal bruge nok tildelt jord brugs
+kredit for at dække dette parcel før købet vil blive
+gennemført.
+ </floater.string>
+ <floater.string name="have_enough_lindens">
+ Du har L$ [AMOUNT], hvilket er nok til at købe denne jord.
+ </floater.string>
+ <floater.string name="not_enough_lindens">
+ Du har kun L$ [AMOUNT], og har brug for yderligere L$ [AMOUNT2].
+ </floater.string>
+ <floater.string name="balance_left">
+ Efter købet, vil du have L$ [AMOUNT] tilbage.
+ </floater.string>
+ <floater.string name="balance_needed">
+ Du skal købe mindst L$ [AMOUNT] for at have råd til denne jord.
+ </floater.string>
+ <floater.string name="no_parcel_selected">
+ (intet parcel er valgt)
+ </floater.string>
+ <floater.string name="icon_PG" value="Parcel_PG_Dark"/>
+ <floater.string name="icon_M" value="Parcel_M_Dark"/>
+ <floater.string name="icon_R" value="Parcel_R_Dark"/>
<text name="region_name_label">
Region:
</text>
@@ -107,133 +236,4 @@ Denne parcel er på 512 m².
<check_box label="Fjern [AMOUNT] m² af bidrag fra gruppe." name="remove_contribution"/>
<button label="Køb" name="buy_btn"/>
<button label="Annullér" name="cancel_btn"/>
- <string name="can_resell">
- Kan videresælges.
- </string>
- <string name="can_not_resell">
- Kan ikke videresælges.
- </string>
- <string name="can_change">
- Kan samles eller opdeles.
- </string>
- <string name="can_not_change">
- Kan ikke samles eller opdeles.
- </string>
- <string name="cant_buy_for_group">
- Du har ikke tilladelse til at købe land for din aktive gruppe.
- </string>
- <string name="no_land_selected">
- Intet land er valgt.
- </string>
- <string name="multiple_parcels_selected">
- Flere forskellige parceller er valgt.
-Prøv at vælge et mindre område.
- </string>
- <string name="no_permission">
- Du har ikke tilladelse til at købe jord for din aktive gruppe.
- </string>
- <string name="parcel_not_for_sale">
- Det udvalgte parcel er ikke til salg.
- </string>
- <string name="group_already_owns">
- Gruppen ejer allerede parcellet.
- </string>
- <string name="you_already_own">
- Du ejer allerede parcellet.
- </string>
- <string name="set_to_sell_to_other">
- Det udvalgte parcel er sat til salg til en anden.
- </string>
- <string name="no_public_land">
- Det valgte område har ingen offentlige arealer.
- </string>
- <string name="not_owned_by_you">
- Jord, der ejes af en anden bruger er valgt.
-Prøv at vælge et mindre område.
- </string>
- <string name="processing">
- Forarbejder dit køb...
-
-(Dette kan tage et minut eller to.)
- </string>
- <string name="fetching_error">
- Der er sket en fejl under hentning af jord købs oplysninger.
- </string>
- <string name="buying_will">
- Køb af dette areal vil:
- </string>
- <string name="buying_for_group">
- Køb af dette areal vil:
- </string>
- <string name="cannot_buy_now">
- Kan ikke købe nu:
- </string>
- <string name="not_for_sale">
- Ikke til salg:
- </string>
- <string name="none_needed">
- ikke nødvendigt
- </string>
- <string name="must_upgrade">
- Din konto skal være opgraderet for at eje jord.
- </string>
- <string name="cant_own_land">
- Din konto kan eje jord.
- </string>
- <string name="land_holdings">
- Du ejer [BUYER] m² land.
- </string>
- <string name="pay_to_for_land">
- Betal L$ [AMOUNT] til [SELLER] for dette stykke jord
- </string>
- <string name="buy_for_US">
- Køb L$ [AMOUNT] for ca. [LOCAL_AMOUNT],
- </string>
- <string name="parcel_meters">
- Denne parcel er på [AMOUNT] m²
- </string>
- <string name="premium_land">
- Dette stykke jord er premium, og vil tælle som [AMOUNT] m².
- </string>
- <string name="discounted_land">
- Dette stykke jord er på tilbud, og vil tælle som [AMOUNT] m².
- </string>
- <string name="meters_supports_object">
- [AMOUNT] m²
-kan indeholde [AMOUNT2] objekter
- </string>
- <string name="sold_with_objects">
- solgt med objekter
- </string>
- <string name="sold_without_objects">
- objekter ikke inkluderet
- </string>
- <string name="info_price_string">
- L$ [PRICE]
-(L$ [PRICE_PER_SQM]/m²)
-[SOLD_WITH_OBJECTS]
- </string>
- <string name="insufficient_land_credits">
- Gruppen [GROUP] skal bruge nok tildelt jord brugs
-kredit for at dække dette parcel før købet vil blive
-gennemført.
- </string>
- <string name="have_enough_lindens">
- Du har L$ [AMOUNT], hvilket er nok til at købe denne jord.
- </string>
- <string name="not_enough_lindens">
- Du har kun L$ [AMOUNT], og har brug for yderligere L$ [AMOUNT2].
- </string>
- <string name="balance_left">
- Efter købet, vil du have L$ [AMOUNT] tilbage.
- </string>
- <string name="balance_needed">
- Du skal købe mindst L$ [AMOUNT] for at have råd til denne jord.
- </string>
- <string name="no_parcel_selected">
- (intet parcel er valgt)
- </string>
- <string name="buy_currency">
- Køb L$ [LINDENS] for omkring US$ [USD]
- </string>
</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_color_picker.xml b/indra/newview/skins/default/xui/da/floater_color_picker.xml
index 514b2c4331706749ed0acdc71dea689b178b14cc..f744b062773c5b5db234de6a1322a1425d696c38 100644
--- a/indra/newview/skins/default/xui/da/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/da/floater_color_picker.xml
@@ -21,7 +21,7 @@
<check_box label="Benyt nu" name="apply_immediate"/>
<button label="" label_selected="" name="color_pipette"/>
<button label="Annullér" label_selected="Annullér" name="cancel_btn"/>
- <button label="Ok" label_selected="Ok" name="select_btn"/>
+ <button label="OK" label_selected="OK" name="select_btn"/>
<text name="Current color:">
Nuværende Farve:
</text>
diff --git a/indra/newview/skins/default/xui/da/floater_customize.xml b/indra/newview/skins/default/xui/da/floater_customize.xml
index 379302ef6ad44a3d5e12b5c97709c1d922e4016d..b8b4b0327766b5b81523ec64863cdb1104d2c867 100644
--- a/indra/newview/skins/default/xui/da/floater_customize.xml
+++ b/indra/newview/skins/default/xui/da/floater_customize.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater customize" title="UDSEENDE" width="509">
<tab_container name="customize tab container" width="507">
- <placeholder label="Krops Dele" name="body_parts_placeholder"/>
+ <text label="Krops Dele" name="body_parts_placeholder">
+ Kropsdele
+ </text>
<panel label="Kropsbygning" name="Shape">
<button label="Annullér" label_selected="Annullér" name="Revert"/>
<button label="Krop" label_selected="Krop" name="Body"/>
@@ -14,8 +16,8 @@
<button label="Overkrop" label_selected="Overkrop" name="Torso"/>
<button label="Ben" label_selected="Ben" name="Legs"/>
<radio_group name="sex radio">
- <radio_item label="Kvinde" name="radio"/>
- <radio_item label="Mand" name="radio2"/>
+ <radio_item label="Kvinde" name="radio" value="0"/>
+ <radio_item label="Mand" name="radio2" value="1"/>
</radio_group>
<text name="title">
[DESC]
@@ -33,9 +35,7 @@
Fundet i [PATH]
</text>
<text name="not worn instructions">
- Vælg en ny krop ved at trække en sådan fra din beholdning
-over på din avatar. Du kan også oprette en fra bunden
-og bagefter 'tage den på'.
+ Vælg en ny kropsbygning ved at trække en sådan fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter 'tage den på'.
</text>
<text name="no modify instructions">
Du har ikke rettigheder til at redigere denne del.
@@ -68,9 +68,7 @@ og bagefter 'tage den på'.
Fundet i [PATH]
</text>
<text name="not worn instructions">
- Tag en ny hud på ved at trække en sådan fra din beholdning
-over på din avatar. Du kan også oprette en hud fra bunden
-og bagefter 'tage den på'.
+ Vælg en ny hud ved at trække en sådan fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter 'tage den på'.
</text>
<text name="no modify instructions">
Du har ikke rettigheder til at redigere denne del.
@@ -107,9 +105,7 @@ og bagefter 'tage den på'.
Fundet i [PATH]
</text>
<text name="not worn instructions">
- Tag et ny hår på ved at trække et fra din beholdning
-over på din avatar. Du kan også oprette et nyt hår fra bunden
-og bagefter 'tage det på'.
+ Vælg et nyt hår ved at trække et sådant fra din beholdning over på din avatar. Du kan også oprette et fra bunden og bagefter 'tage det på'.
</text>
<text name="no modify instructions">
Du har ikke rettigheder til at redigere denne del.
@@ -140,9 +136,7 @@ og bagefter 'tage det på'.
Fundet i [PATH]
</text>
<text name="not worn instructions">
- Tag et ny sæt øjne på ved at trække et sæt fra din beholdning
-over på din avatar. Du kan også oprette et nyt sæt øjne fra bunden
-og bagefter 'tage dem på'.
+ Vælg et nyt sæt øjne ved at trække et sådant par fra din beholdning over på din avatar. Du kan også oprette et par fra bunden og bagefter 'tage dem på'.
</text>
<text name="no modify instructions">
Du har ikke rettigheder til at redigere denne del.
@@ -156,12 +150,14 @@ og bagefter 'tage dem på'.
<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
<button label="Annullér" label_selected="Annullér" name="Revert"/>
</panel>
- <placeholder label="Tøje" name="clothes_placeholder"/>
+ <text label="Tøje" name="clothes_placeholder">
+ Tøj
+ </text>
<panel label="Trøje" name="Shirt">
<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
- <button label="Lav ny trøje" label_selected="Lav ny trøje" name="Create New"/>
<button label="Tag af" label_selected="Tag af" name="Take Off"/>
+ <button label="Lav ny trøje" label_selected="Lav ny trøje" name="Create New"/>
<button label="Gem" label_selected="Gem" name="Save"/>
<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
<button label="Annullér" label_selected="Annullér" name="Revert"/>
@@ -181,8 +177,7 @@ og bagefter 'tage dem på'.
Fundet i [PATH]
</text>
<text name="not worn instructions">
- Tag en ny Tøje på ved at trække en fra din beholdning over på din avatar.
-Du kan også oprette en ny Tøje fra bunden og bagefter 'tage den på'.
+ Vælg en ny trøje ved at trække en fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter 'tage den på'.
</text>
<text name="no modify instructions">
Du har ikke rettigheder til at redigere denne del.
@@ -194,8 +189,8 @@ Du kan også oprette en ny Tøje fra bunden og bagefter 'tage den på'
<panel label="Bukser" name="Pants">
<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
- <button label="Lav nye bukser" label_selected="Lav nye bukser" name="Create New"/>
<button label="Tag af" label_selected="Tag af" name="Take Off"/>
+ <button label="Lav nye bukser" label_selected="Lav nye bukser" name="Create New"/>
<button label="Gem" label_selected="Gem" name="Save"/>
<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
<button label="Annullér" label_selected="Annullér" name="Revert"/>
@@ -215,9 +210,7 @@ Du kan også oprette en ny Tøje fra bunden og bagefter 'tage den på'
Fundet i [PATH]
</text>
<text name="not worn instructions">
- Tag nyr bukser på ved at trække dem fra din beholdning over på
-din avatar. Du kan også oprette ny bukser fra bunden og bagefter
-'tage dem på'.
+ Vælg et nyt par bukser ved at trække et par fra din beholdning over på din avatar. Du kan også oprette et par fra bunden og bagefter 'tage dem på'.
</text>
<text name="no modify instructions">
Du har ikke rettigheder til at redigere denne del.
@@ -243,10 +236,9 @@ din avatar. Du kan også oprette ny bukser fra bunden og bagefter
Fundet i [PATH]
</text>
<text name="not worn instructions">
- Tag et ny par sko på ved at trække dem fra din beholdning
-over på din avatar. Du kan også oprette et nyt par sko fra bunden
-og bagefter 'tage dem på'.
+ Vælg et nyt par sko ved at trække et par fra din beholdning over på din avatar. Du kan også oprette et par fra bunden og bagefter 'tage dem på'.
</text>
+ <button label="Lav nye sko" label_selected="Lav nye sko" name="Create New"/>
<text name="no modify instructions">
Du har ikke rettigheder til at redigere denne del.
</text>
@@ -255,7 +247,6 @@ og bagefter 'tage dem på'.
</text>
<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
- <button label="Lav nye sko" label_selected="Lav nye sko" name="Create New"/>
<button label="Tag af" label_selected="Tag af" name="Take Off"/>
<button label="Gem" label_selected="Gem" name="Save"/>
<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
@@ -278,10 +269,9 @@ og bagefter 'tage dem på'.
Fundet i [PATH]
</text>
<text name="not worn instructions">
- Tag et ny par Strømper på ved at trække dem fra din beholdning
-over på din avatar. Du kan også oprette et nyt par Strømper fra bunden
-og bagefter 'tage dem på'.
+ Vælg et nyt par sokker ved at trække et par fra din beholdning over på din avatar. Du kan også oprette et par fra bunden og bagefter 'tage dem på'.
</text>
+ <button label="Lav nye strømper" label_selected="Lav nye strømper" name="Create New"/>
<text name="no modify instructions">
Du har ikke rettigheder til at redigere denne del.
</text>
@@ -290,7 +280,6 @@ og bagefter 'tage dem på'.
</text>
<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
- <button label="Lav nye strømper" label_selected="Lav nye strømper" name="Create New"/>
<button label="Tag af" label_selected="Tag af" name="Take Off"/>
<button label="Gem" label_selected="Gem" name="Save"/>
<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
@@ -313,9 +302,9 @@ og bagefter 'tage dem på'.
Fundet i [PATH]
</text>
<text name="not worn instructions">
- Tag en ny jakke på ved at trække en fra din beholdning over på din avatar.
-Du kan også oprette en ny jakke fra bunden og bagefter 'tage den på'.
+ Vælg en ny jakke ved at trække en fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter 'tage den på'.
</text>
+ <button label="Lav ny jakke" label_selected="Lav ny jakke" name="Create New"/>
<text name="no modify instructions">
Du har ikke rettigheder til at redigere denne del.
</text>
@@ -325,7 +314,6 @@ Du kan også oprette en ny jakke fra bunden og bagefter 'tage den på'
<texture_picker label="Stof øverst" name="Upper Fabric" tool_tip="Klik for at vælge et billede"/>
<texture_picker label="Stof nederst" name="Lower Fabric" tool_tip="Klik for at vælge et billede"/>
<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
- <button label="Lav ny jakke" label_selected="Lav ny jakke" name="Create New"/>
<button label="Tag af" label_selected="Tag af" name="Take Off"/>
<button label="Gem" label_selected="Gem" name="Save"/>
<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
@@ -348,10 +336,9 @@ Du kan også oprette en ny jakke fra bunden og bagefter 'tage den på'
Fundet i [PATH]
</text>
<text name="not worn instructions">
- Tag nye handsker på ved at trække et par fra din beholdning over på
-din avatar. Du kan også oprette nye handsker fra bunden
-og bagefter 'tage dem på'.
+ Vælg et sæt nye handsker ved at trække et par fra din beholdning over på din avatar. Du kan også oprette et par fra bunden og bagefter 'tage dem på'.
</text>
+ <button label="Lav nye handsker" label_selected="Lav nye handsker" name="Create New"/>
<text name="no modify instructions">
Du har ikke rettigheder til at redigere denne del.
</text>
@@ -360,7 +347,6 @@ og bagefter 'tage dem på'.
</text>
<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
- <button label="Lav nye handsker" label_selected="Lav nye handsker" name="Create New"/>
<button label="Tag af" label_selected="Tag af" name="Take Off"/>
<button label="Gem" label_selected="Gem" name="Save"/>
<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
@@ -383,10 +369,9 @@ og bagefter 'tage dem på'.
Fundet i [PATH]
</text>
<text name="not worn instructions">
- Tag en ny undertrøje på ved at trække en fra din beholdning over på
-din avatar. Du kan også oprette en ny undertrøje fra bunden
-og bagefter 'tage den på'.
+ Vælg en ny undertrøje ved at trække en fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter 'tage den på'.
</text>
+ <button label="Lav ny undertrøje" label_selected="Lav ny undertrøje" name="Create New"/>
<text name="no modify instructions">
Du har ikke rettigheder til at redigere denne del.
</text>
@@ -395,7 +380,6 @@ og bagefter 'tage den på'.
</text>
<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
- <button label="Lav ny undertrøje" label_selected="Lav ny undertrøje" name="Create New"/>
<button label="Tag af" label_selected="Tag af" name="Take Off"/>
<button label="Gem" label_selected="Gem" name="Save"/>
<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
@@ -418,10 +402,9 @@ og bagefter 'tage den på'.
Fundet i [PATH]
</text>
<text name="not worn instructions">
- Tag nye underbukser på ved at trække dem fra din beholdning over på
-din avatar. Du kan også oprette en par nye underbukser fra bunden
-og bagefter 'tage dem på'.
+ Vælg et nyt par underbukser ved at trække et par fra din beholdning over på din avatar. Du kan også oprette et par fra bunden og bagefter 'tage dem på'.
</text>
+ <button label="Lav nye underbukser" label_selected="Lav nye underbukser" name="Create New"/>
<text name="no modify instructions">
Du har ikke rettigheder til at redigere denne del.
</text>
@@ -430,7 +413,6 @@ og bagefter 'tage dem på'.
</text>
<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
- <button label="Lav nye underbukser" label_selected="Lav nye underbukser" name="Create New"/>
<button label="Tag af" label_selected="Tag af" name="Take Off"/>
<button label="Gem" label_selected="Gem" name="Save"/>
<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
@@ -453,10 +435,9 @@ og bagefter 'tage dem på'.
Fundet i [PATH]
</text>
<text name="not worn instructions">
- Tag en ny nederdel på ved at trække en fra din beholdning over på
-din avatar. Du kan også oprette en ny nederdel fra bunden
-og bagefter 'tage den på'.
+ Vælg en ny nederdel ved at trække en fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter 'tage den på'.
</text>
+ <button label="Lav ny nederdel" label_selected="Lav ny nederdel" name="Create New"/>
<text name="no modify instructions">
Du har ikke rettigheder til at redigere denne del.
</text>
@@ -465,13 +446,12 @@ og bagefter 'tage den på'.
</text>
<texture_picker label="Stof" name="Fabric" tool_tip="Klik for at vælge et billede"/>
<color_swatch label="Farve" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
- <button label="Lav ny nederdel" label_selected="Lav ny nederdel" name="Create New"/>
<button label="Tag af" label_selected="Tag af" name="Take Off"/>
<button label="Gem" label_selected="Gem" name="Save"/>
<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
<button label="Annullér" label_selected="Annullér" name="Revert"/>
</panel>
- <panel label="Alpha" name="Alpha">
+ <panel label="Tatovering" name="Tattoo">
<text name="title">
[DESC]
</text>
@@ -488,27 +468,24 @@ og bagefter 'tage den på'.
Placeret i [PATH]
</text>
<text name="not worn instructions">
- Brug en ny "alpha mask" ved at trække en fra din beholding til din avatar.
-Alternativt kan du lave en fra bunden og bære denne.
+ Vælg en ny tatovering ved at trække en fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter 'tage den på'.
</text>
+ <button label="lav ny tatovering" label_selected="Lav ny tatovering" name="Create New"/>
<text name="no modify instructions">
Du har ikke rettigheder til at ændre denne.
</text>
<text name="Item Action Label">
- Alpha:
+ Tatovering:
</text>
- <texture_picker label="Alpha - nedre" name="Lower Alpha" tool_tip="Klik for at vælge et billede"/>
- <texture_picker label="Øvre alpha" name="Upper Alpha" tool_tip="Klik for at vælge et billede"/>
- <texture_picker label="Alpha - hoved" name="Head Alpha" tool_tip="Klik for at vælge et billede"/>
- <texture_picker label="Alpha - øjne" name="Eye Alpha" tool_tip="Klik for at vælge et billede"/>
- <texture_picker label="Alpha - hår" name="Hair Alpha" tool_tip="Klik for at vælge et billede"/>
- <button label="Lav ny "Alpha"" label_selected="Lav ny "Alpha"" name="Create New"/>
+ <texture_picker label="Tatovering - hovede" name="Head Tattoo" tool_tip="Klik for at vælge et billede"/>
+ <texture_picker label="Øvre tatovering" name="Upper Tattoo" tool_tip="Klik for at vælge et billede"/>
+ <texture_picker label="Nedre tatovering" name="Lower Tattoo" tool_tip="Klik for at vælge et billede"/>
<button label="Tag af" label_selected="Tag af" name="Take Off"/>
<button label="Gem" label_selected="Gem" name="Save"/>
<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
<button label="Vend tilbage" label_selected="Vend tilbage" name="Revert"/>
</panel>
- <panel label="Tatovering" name="Tattoo">
+ <panel label="Alpha" name="Alpha">
<text name="title">
[DESC]
</text>
@@ -525,19 +502,20 @@ Alternativt kan du lave en fra bunden og bære denne.
Placeret i [PATH]
</text>
<text name="not worn instructions">
- Brug en ny tatovering ved at trække en fra din beholding til din avatar.
-Alternativt kan du lave en fra bunden og bære denne.
+ Vælg en ny 'alpha maske' ved at trække en fra din beholdning over på din avatar. Du kan også oprette en fra bunden og bagefter 'tage den på'.
</text>
+ <button label="Lav ny "Alpha"" label_selected="Lav ny "Alpha"" name="Create New"/>
<text name="no modify instructions">
Du har ikke rettigheder til at ændre denne.
</text>
<text name="Item Action Label">
- Tatovering:
+ Alpha:
</text>
- <texture_picker label="Tatovering - hovede" name="Head Tattoo" tool_tip="Klik for at vælge et billede"/>
- <texture_picker label="Øvre tatovering" name="Upper Tattoo" tool_tip="Klik for at vælge et billede"/>
- <texture_picker label="Nedre tatovering" name="Lower Tattoo" tool_tip="Klik for at vælge et billede"/>
- <button label="lav ny tatovering" label_selected="Lav ny tatovering" name="Create New"/>
+ <texture_picker label="Alpha - nedre" name="Lower Alpha" tool_tip="Klik for at vælge et billede"/>
+ <texture_picker label="Øvre alpha" name="Upper Alpha" tool_tip="Klik for at vælge et billede"/>
+ <texture_picker label="Alpha - hoved" name="Head Alpha" tool_tip="Klik for at vælge et billede"/>
+ <texture_picker label="Alpha - øjne" name="Eye Alpha" tool_tip="Klik for at vælge et billede"/>
+ <texture_picker label="Alpha - hår" name="Hair Alpha" tool_tip="Klik for at vælge et billede"/>
<button label="Tag af" label_selected="Tag af" name="Take Off"/>
<button label="Gem" label_selected="Gem" name="Save"/>
<button label="Gem som..." label_selected="Gem som..." name="Save As"/>
@@ -545,6 +523,7 @@ Alternativt kan du lave en fra bunden og bære denne.
</panel>
</tab_container>
<scroll_container left="212" name="panel_container"/>
+ <button label="Script info" label_selected="Script info" name="script_info" tool_tip="Vis scripts vedhæftet på din avatar"/>
<button label="Lav sæt" label_selected="Lav sæt" name="make_outfit_btn"/>
<button label="Annullér" label_selected="Annullér" name="Cancel"/>
<button label="OK" label_selected="OK" name="Ok"/>
diff --git a/indra/newview/skins/default/xui/da/floater_event.xml b/indra/newview/skins/default/xui/da/floater_event.xml
new file mode 100644
index 0000000000000000000000000000000000000000..267a36b26ce11c9ada1f8de9f24897cba34be03d
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_event.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="Event" name="Event" title="EVENT DETALJER">
+ <floater.string name="none">
+ ingen
+ </floater.string>
+ <floater.string name="notify">
+ Meddel
+ </floater.string>
+ <floater.string name="dont_notify">
+ Meddel ikke
+ </floater.string>
+ <layout_stack name="layout">
+ <layout_panel name="profile_stack">
+ <text name="event_name">
+ Event uden navn.
+ </text>
+ <text name="event_category">
+ (ingen kategori)
+ </text>
+ <text name="event_runby_label">
+ Afholdt af:
+ </text>
+ <text initial_value="(henter)" name="event_runby"/>
+ <text name="event_date">
+ 10/10/2010
+ </text>
+ <text name="event_duration">
+ 1 time
+ </text>
+ <text name="event_cover">
+ Gratis
+ </text>
+ <text name="event_location_label">
+ Lokation:
+ </text>
+ <text name="event_location" value="SampleParcel, Name Long (145, 228, 26)"/>
+ <text name="rating_label" value="Rating:"/>
+ <text name="rating_value" value="ukendt"/>
+ </layout_panel>
+ <layout_panel name="button_panel">
+ <button name="create_event_btn" tool_tip="Opret event"/>
+ <button name="god_delete_event_btn" tool_tip="Slet event"/>
+ <button label="Giv besked" name="notify_btn"/>
+ <button label="Teleport" name="teleport_btn"/>
+ <button label="Kort" name="map_btn"/>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_god_tools.xml b/indra/newview/skins/default/xui/da/floater_god_tools.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ea045538c5913157bcd852f120b5824c0acf5973
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_god_tools.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="godtools floater" title="GOD TOOLS">
+ <tab_container name="GodTools Tabs">
+ <panel label="Region" name="region">
+ <check_box label="Reset Home On Teleport" name="check reset home" tool_tip="Når beboere teleporterer væk, så sæt deres hjemmeadresse til deres destinations position."/>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_help_browser.xml b/indra/newview/skins/default/xui/da/floater_help_browser.xml
index fc52796344c91db49111200997553f4c5b37f3b0..4eba4aee1fc5b4916e7fa53640b2e2097a27888d 100644
--- a/indra/newview/skins/default/xui/da/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/da/floater_help_browser.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_help_browser" title="HJÆLP">
+ <floater.string name="loading_text">
+ Henter...
+ </floater.string>
<layout_stack name="stack1">
- <layout_panel name="external_controls">
- <button label="Ã…ben i min web browser" name="open_browser"/>
- </layout_panel>
+ <layout_panel name="external_controls"/>
</layout_stack>
</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_im.xml b/indra/newview/skins/default/xui/da/floater_im.xml
index 519a70d1d90252230064e02e6ca89ae7165787ee..2ef8a7ce36b532c5058082632437b51f52da426a 100644
--- a/indra/newview/skins/default/xui/da/floater_im.xml
+++ b/indra/newview/skins/default/xui/da/floater_im.xml
@@ -10,7 +10,7 @@
Tryk på [BUTTON NAME] knappen for at acceptére/tilslutte til denne stemme chat.
</string>
<string name="muted_message">
- Du har blokeret denne beboer. Hvis du sender besked vil denne blokering fjernes.
+ Du har blokeret denne beboer. Hvis du sender en besked til beboeren vil dette automatisk medføre fjernelse af blokeringen
</string>
<string name="generic_request_error">
Kunne ikke etablere forbindelse, prøv igen senere
diff --git a/indra/newview/skins/default/xui/da/floater_im_container.xml b/indra/newview/skins/default/xui/da/floater_im_container.xml
index da6f877f56a4cde7b512bdebbc8dc0a3ba1f0637..28b2f7f7ebc656eab9533f77d2f2b818e1cd5a98 100644
--- a/indra/newview/skins/default/xui/da/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/da/floater_im_container.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="Personlige beskeder"/>
+<multi_floater name="floater_im_box" title="SAMTALER"/>
diff --git a/indra/newview/skins/default/xui/da/floater_incoming_call.xml b/indra/newview/skins/default/xui/da/floater_incoming_call.xml
index 3a1ef2e47d73012159e3adbe34676569071c4526..2349174db29791fbc6a6252894977a8a1efb0af8 100644
--- a/indra/newview/skins/default/xui/da/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/da/floater_incoming_call.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="incoming call" title="UKENDT PERSON KALDER OP">
+ <floater.string name="lifetime">
+ 5
+ </floater.string>
<floater.string name="localchat">
Stemme chat nærved
</floater.string>
@@ -12,6 +15,9 @@
<floater.string name="VoiceInviteAdHoc">
har sluttet sig til stemme chat opkald med en konference chat.
</floater.string>
+ <floater.string name="VoiceInviteGroup">
+ deltager nu i Stemme chat opkald med denne gruppe [GROUP].
+ </floater.string>
<text name="question">
Ønsker du at forlade [CURRENT_CHAT] og slutte dig til denne stemme chat?
</text>
diff --git a/indra/newview/skins/default/xui/da/floater_inventory.xml b/indra/newview/skins/default/xui/da/floater_inventory.xml
index d80051fb844546ccd698e144aa8c095724091325..3a4b0fbd6bc0f3dc7bb82ef4d3559078d255ffba 100644
--- a/indra/newview/skins/default/xui/da/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/da/floater_inventory.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="BEHOLDNING">
+<floater name="Inventory" title="MIN BEHOLDNING">
<floater.string name="Title">
- Beholdning
+ MIN BEHOLDNING
</floater.string>
<floater.string name="TitleFetching">
- Beholdning (henter [ITEM_COUNT] genstande...) [FILTER]
+ MIN BEHOLDNING (Henter [ITEM_COUNT] genstande...) [FILTER]
</floater.string>
<floater.string name="TitleCompleted">
- Beholdning ([ITEM_COUNT] genstande) [FILTER]
+ MIN BEHOLDNING ([ITEM_COUNT] genstande) [FILTER]
</floater.string>
<floater.string name="Fetched">
Hentet
diff --git a/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml
index 4079ff9f38d51f74f8c4e878ab7faf947d6d1715..0cc13fd73617f6f657aeca708d8f30464bbb8c93 100644
--- a/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml
@@ -7,7 +7,7 @@
Kører
</floater.string>
<floater.string name="Title">
- Script: [NAME]
+ SCRIPT: [NAME]
</floater.string>
<button label="Nulstil" label_selected="Reset" name="Reset"/>
<check_box initial_value="true" label="Kører" name="running"/>
diff --git a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
index 2b008f133ce3b525a8c023d018087ce58c6b3be4..2594d6bb9df1c9f0341517541446a598704abf57 100644
--- a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script ed float" title="LSL WIKI">
+<floater name="script ed float" title="LSL REFERENCE">
<check_box label="Følg markøreren" name="lock_check"/>
<combo_box label="LÃ¥s" left_delta="114" name="history_combo" width="70"/>
<button label="Tilbage" name="back_btn"/>
diff --git a/indra/newview/skins/default/xui/da/floater_map.xml b/indra/newview/skins/default/xui/da/floater_map.xml
index f618548908a016a700533d79073d38df11c671a0..82897d545ad9eac4e21815bb38a6b90111b5f2d3 100644
--- a/indra/newview/skins/default/xui/da/floater_map.xml
+++ b/indra/newview/skins/default/xui/da/floater_map.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Map">
+<floater name="Map" title="Mini-kort">
<floater.string name="mini_map_north">
N
</floater.string>
diff --git a/indra/newview/skins/default/xui/da/floater_media_browser.xml b/indra/newview/skins/default/xui/da/floater_media_browser.xml
index 47667973ba32aa7d88d233fed92299b8d4911d21..d3028c32f9113611965956a356c80480ec50bc71 100644
--- a/indra/newview/skins/default/xui/da/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/da/floater_media_browser.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_about" title="MEDIE VÆLGER">
<layout_stack name="stack1">
<layout_panel name="nav_controls">
- <button label="Tilbage" name="back" />
- <button label="Frem" name="forward" />
- <button label="Opdater" name="reload" />
- <button label="GÃ¥ til" name="go" />
+ <button label="Tilbage" name="back"/>
+ <button label="Frem" name="forward"/>
+ <button label="Opdater" name="reload"/>
+ <button label="GÃ¥ til" name="go"/>
</layout_panel>
<layout_panel name="parcel_owner_controls">
- <button label="Send nuværende URL til parcel" name="assign" />
+ <button label="Send denne side til parcel" name="assign"/>
</layout_panel>
<layout_panel name="external_controls">
- <button label="Ã…ben i min browser" name="open_browser" />
- <check_box label="Ã…ben altid i min browser" name="open_always" />
- <button label="Luk" name="close" />
+ <button label="Ã…ben i min browser" name="open_browser"/>
+ <check_box label="Ã…ben altid i min browser" name="open_always"/>
+ <button label="Luk" name="close"/>
</layout_panel>
</layout_stack>
</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_moveview.xml b/indra/newview/skins/default/xui/da/floater_moveview.xml
index b00dc6bf4db554f25ec2a8f32d344ecedbefe854..258af489e751e0086a57293750b090f5da10e435 100644
--- a/indra/newview/skins/default/xui/da/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/da/floater_moveview.xml
@@ -19,11 +19,10 @@
Flyv baglæns (Tryk på Ned piletast eller S)
</string>
<panel name="panel_actions">
- <button label="" label_selected="" name="turn left btn" tool_tip="xxx
- Drej til venstre (Tryk på venstre piletast eller A)"/>
+ <button label="" label_selected="" name="turn left btn" tool_tip="xxx Drej til venstre (Tryk på venstre piletast eller A)"/>
<button label="" label_selected="" name="turn right btn" tool_tip="Drej til højre (Tryk på højre piletast eller D)"/>
- <button label="" label_selected="" name="move up btn" tool_tip="Flyv op, Tryk på "E""/>
- <button label="" label_selected="" name="move down btn" tool_tip="Flyv ned, Tryk på "C""/>
+ <button label="" label_selected="" name="move up btn" tool_tip="Flyv op, tryk E"/>
+ <button label="" label_selected="" name="move down btn" tool_tip="Flyv ned, tryk C"/>
<joystick_turn name="forward btn" tool_tip="Gå frem (Tryk på Op piletast eller W)"/>
<joystick_turn name="backward btn" tool_tip="Gå tilbage (Tryk på Ned piletast eller S)"/>
</panel>
diff --git a/indra/newview/skins/default/xui/da/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/da/floater_outfit_save_as.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0bcb96b151ad388099cc31120ac95bcdc8aa8f81
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_outfit_save_as.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="modal container" title="Gem sæt">
+ <button label="Gem" label_selected="Gem" name="Save"/>
+ <button label="Annullér" label_selected="Annullér" name="Cancel"/>
+ <text name="Save item as:">
+ Gem hvad jeg har på som et nyt sæt:
+ </text>
+ <line_editor name="name ed">
+ [DESC] (ny)
+ </line_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_outgoing_call.xml b/indra/newview/skins/default/xui/da/floater_outgoing_call.xml
index 5c98d9855fa2ed35f1e15ff88c6ec56d8692995e..ef4e22dd8f68eb993a3d88c171eca9ae486051be 100644
--- a/indra/newview/skins/default/xui/da/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/da/floater_outgoing_call.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="outgoing call" title="KALDER">
+ <floater.string name="lifetime">
+ 5
+ </floater.string>
<floater.string name="localchat">
Stemme chat nærved
</floater.string>
@@ -21,6 +24,15 @@
<text name="noanswer">
Intet svar. Prøv igen senere.
</text>
+ <text name="nearby">
+ Du er blevet koblet af fra [VOICE_CHANNEL_NAME]. [RECONNECT_NEARBY]
+ </text>
+ <text name="nearby_P2P_by_other">
+ [VOICE_CHANNEL_NAME] har afsluttet opkaldet. [RECONNECT_NEARBY]
+ </text>
+ <text name="nearby_P2P_by_agent">
+ Du har afsluttet opkaldet. [RECONNECT_NEARBY]
+ </text>
<text name="leaving">
Forlader [CURRENT_CHAT].
</text>
diff --git a/indra/newview/skins/default/xui/da/floater_pay_object.xml b/indra/newview/skins/default/xui/da/floater_pay_object.xml
index f74e097da29c0b868768c02190fab9924c799ecc..368d6786818411ff12861504b702748a29ad51bd 100644
--- a/indra/newview/skins/default/xui/da/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/da/floater_pay_object.xml
@@ -15,7 +15,7 @@
</text>
<icon name="icon_object" tool_tip="Objekter"/>
<text name="object_name_text">
- ...
+ Mit fantastiske objekt med et virkeligt langt navn
</text>
<button label="L$1" label_selected="L$1" name="fastpay 1"/>
<button label="L$5" label_selected="L$5" name="fastpay 5"/>
diff --git a/indra/newview/skins/default/xui/da/floater_preferences.xml b/indra/newview/skins/default/xui/da/floater_preferences.xml
index f0fe3472d0044c8220c997d72a83206936e8f7c7..a53586eaaf112d9485555ec9fe9fd290b11e75f9 100644
--- a/indra/newview/skins/default/xui/da/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/da/floater_preferences.xml
@@ -6,7 +6,7 @@
<panel label="Generelt" name="general"/>
<panel label="Grafik" name="display"/>
<panel label="Privatliv" name="im"/>
- <panel label="Sound" name="audio"/>
+ <panel label="Lyd & medier" name="audio"/>
<panel label="Chat" name="chat"/>
<panel label="Beskeder" name="msgs"/>
<panel label="Opsætning" name="input"/>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
index bfa3c150a9138d6423be0ac133fdc4f853a094bf..f49fd8c99a18952da791cd477c4ff8a6c0163d3f 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
@@ -24,6 +24,9 @@
<floater.string name="Title">
Bevægelse: [NAME]
</floater.string>
+ <text name="name_text">
+ Navn:
+ </text>
<text name="desc_label">
Beskrivelse:
</text>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
index 2ebec4462fa7812c91c44a1bd328f1faaa907baa..e600a774ec814ced34efae13192e916f53427635 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="preview notecard" title="NOTE:">
<floater.string name="no_object">
- Kunne ikke finde objekt der indeholder denne note.
+ Kunne ikke finde objekt som indeholder denne note.
</floater.string>
<floater.string name="not_allowed">
Du har ikke rettigheder til at se denne note.
diff --git a/indra/newview/skins/default/xui/da/floater_preview_texture.xml b/indra/newview/skins/default/xui/da/floater_preview_texture.xml
index ab7ddbcc72f629daa27bcf4aa596f3d55f9f4b6c..48cf53f563fb9ba4aa1c37bf5a2b4a9757dd2e07 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_texture.xml
@@ -12,6 +12,9 @@
<text name="dimensions">
[WIDTH]px x [HEIGHT]px
</text>
+ <text name="aspect_ratio">
+ Vis aspekt forhold
+ </text>
<combo_box name="combo_aspect_ratio" tool_tip="Forhåndsvisning med et bestemt billedformat">
<combo_item name="Unconstrained">
Ikke låst
@@ -38,7 +41,7 @@
2:1
</combo_item>
</combo_box>
- <button label="OK" name="keep"/>
- <button label="Annullér" name="discard"/>
+ <button label="OK" name="Keep"/>
+ <button label="Kassér" name="Discard"/>
<button label="Gem som" name="save_tex_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_report_abuse.xml b/indra/newview/skins/default/xui/da/floater_report_abuse.xml
index 9ef17a3cbbb0f3523fae97a8b6b4b37666917b18..07978792b9b9a3a66118f693a4b833ab9189edcf 100644
--- a/indra/newview/skins/default/xui/da/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/da/floater_report_abuse.xml
@@ -42,7 +42,7 @@
<combo_box.item label="Vælg kategori" name="Select_category"/>
<combo_box.item label="Alder > Falsk alder" name="Age__Age_play"/>
<combo_box.item label="Alder > Voksen beboer på Teen Second Life" name="Age__Adult_resident_on_Teen_Second_Life"/>
- <combo_box.item label="Alder > Mindreårig beboer udenfor Teen Second Life" name="Age__Underage_resident_outside_of_Teen_Second_Life"/>
+ <combo_box.item label="Alder > Mindreårig beboer uden for Teen Second Life" name="Age__Underage_resident_outside_of_Teen_Second_Life"/>
<combo_box.item label="Overfald > Kamp sandkasse / Usikkert område" name="Assault__Combat_sandbox___unsafe_area"/>
<combo_box.item label="Overfald > Sikkert område" name="Assault__Safe_area"/>
<combo_box.item label="Overfald > Sandkasse til våbentest" name="Assault__Weapons_testing_sandbox"/>
diff --git a/indra/newview/skins/default/xui/da/floater_script_limits.xml b/indra/newview/skins/default/xui/da/floater_script_limits.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a7f86a782a4e89b81d8cb9e44d7154349f01f71f
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_script_limits.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="scriptlimits" title="SCRIPT INFORMATION"/>
diff --git a/indra/newview/skins/default/xui/da/floater_script_preview.xml b/indra/newview/skins/default/xui/da/floater_script_preview.xml
index 1e8d869716a6c10ee2a457e370c29054e92faec3..1aacab6915ff029346b2622b059e71b982c321ac 100644
--- a/indra/newview/skins/default/xui/da/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/da/floater_script_preview.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="preview lsl text" title="SCRIPT: ROTATIONS SCRIPT">
<floater.string name="Title">
- Script: [NAME]
+ SCRIPT: [NAME]
</floater.string>
<text name="desc txt">
Beskrivelse:
diff --git a/indra/newview/skins/default/xui/da/floater_select_key.xml b/indra/newview/skins/default/xui/da/floater_select_key.xml
index fe0d31c6c35b89196030a4591a82651e455fa629..9f7aad5e038bd695dbb875c6fb91fef6c7e88826 100644
--- a/indra/newview/skins/default/xui/da/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/da/floater_select_key.xml
@@ -2,6 +2,6 @@
<floater name="modal container" title="">
<button label="Annullér" label_selected="Annullér" name="Cancel"/>
<text name="Save item as:">
- Tryk på en taste for at sætte din "Tale" knap udløser.
+ Tryk en taste for at angive trigger til at tale.
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_settings_debug.xml b/indra/newview/skins/default/xui/da/floater_settings_debug.xml
index 41cf100d94b3edbc9b5ff70b2bb6c6a4a6b2ca4b..016e5af378c0510372ee6c8d8596467d5801ce1e 100644
--- a/indra/newview/skins/default/xui/da/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/da/floater_settings_debug.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="settings_debug" title="DEBUG INDSTILLINGER">
- <combo_box name="boolean_combo">
- <combo_box.item label="SANDT" name="TRUE"/>
- <combo_box.item label="FALSK" name="FALSE"/>
- </combo_box>
+ <radio_group name="boolean_combo">
+ <radio_item label="SANDT" name="TRUE" value="sand"/>
+ <radio_item label="FALSK" name="FALSE" value=""/>
+ </radio_group>
<color_swatch label="Farve" name="val_color_swatch"/>
<spinner label="x" name="val_spinner_1"/>
<spinner label="x" name="val_spinner_2"/>
diff --git a/indra/newview/skins/default/xui/da/floater_snapshot.xml b/indra/newview/skins/default/xui/da/floater_snapshot.xml
index 5e8c64e21fee209767695f5ec2178a40ae739c5e..6140055d74930d8b094b3193fb79d9b73c6b0533 100644
--- a/indra/newview/skins/default/xui/da/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/da/floater_snapshot.xml
@@ -4,12 +4,12 @@
Hvor skal foto hen?
</text>
<radio_group label="Snapshot type" name="snapshot_type_radio">
- <radio_item label="Send via e-mail" name="postcard"/>
- <radio_item label="Gem i din beholdning (L$[AMOUNT])" name="texture"/>
- <radio_item label="Gem på din computer" name="local"/>
+ <radio_item label="Email" name="postcard"/>
+ <radio_item label="Min beholdning (L$[AMOUNT])" name="texture"/>
+ <radio_item label="Gem på min computer" name="local"/>
</radio_group>
<text name="file_size_label">
- Fil størrelse: [SIZE] KB
+ [SIZE] KB
</text>
<button label="Tag nyt foto" name="new_snapshot_btn"/>
<button label="Send" name="send_btn"/>
@@ -19,8 +19,8 @@
<flyout_button_item label="Gem som..." name="saveas_item"/>
</flyout_button>
<button label="Annullér" name="discard_btn"/>
- <button label="Mere >>" name="more_btn" tool_tip="Avancerede muligheder"/>
- <button label="<< Mindre" name="less_btn" tool_tip="Avancerede muligheder"/>
+ <button label="Mere" name="more_btn" tool_tip="Avancerede muligheder"/>
+ <button label="Mindre" name="less_btn" tool_tip="Avancerede muligheder"/>
<text name="type_label2">
Størrelse
</text>
@@ -59,7 +59,7 @@
<spinner label="Bredde" label_width="41" name="snapshot_width" width="101"/>
<spinner label="Højde" label_width="32" left="117" name="snapshot_height" width="92"/>
<check_box label="Fasthold proportioner" name="keep_aspect_check"/>
- <slider label="Billed-kvalitet" name="image_quality_slider"/>
+ <slider label="Billedkvalitet" name="image_quality_slider"/>
<text name="layer_type_label">
Benyt:
</text>
@@ -68,10 +68,10 @@
<combo_box.item label="Dybde" name="Depth"/>
<combo_box.item label="Materinger" name="ObjectMattes"/>
</combo_box>
- <check_box label="Vis brugerflade på foto" name="ui_check"/>
- <check_box label="Vis HUD objekter på foto" name="hud_check"/>
+ <check_box label="Snitflade" name="ui_check"/>
+ <check_box label="HUDs" name="hud_check"/>
<check_box label="Luk ikke vindue ved gemning" name="keep_open_check"/>
- <check_box label="Frys billede og vis" name="freeze_frame_check"/>
+ <check_box label="Fastfrys (fuldt billede)" name="freeze_frame_check"/>
<check_box label="Auto-opdater" name="auto_snapshot_check"/>
<string name="unknown">
ukendt
diff --git a/indra/newview/skins/default/xui/da/floater_sys_well.xml b/indra/newview/skins/default/xui/da/floater_sys_well.xml
index b5cecf93e950481dadeadec0ba77f0b7df20b4a8..f203c2504fb38f09dec89584fbfcfb542bf21a6c 100644
--- a/indra/newview/skins/default/xui/da/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/da/floater_sys_well.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="sys_well_window" title="BESKEDER">
<string name="title_im_well_window">
- IM SESSIONER
+ SAMTALER
</string>
<string name="title_notification_well_window">
BESKEDER
diff --git a/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml
index 00b49a9df9081ffca8279e3c27448a076ebdd093..fbc7fe23195ba4044fac93a35c9c486e968b919f 100644
--- a/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml
@@ -17,7 +17,7 @@
<check_box label="Benyt ny" name="apply_immediate_check"/>
<button label="" label_selected="" name="Pipette"/>
<button label="Annullér" label_selected="Annullér" name="Cancel"/>
- <button label="Ok" label_selected="Ok" name="Select"/>
+ <button label="OK" label_selected="OK" name="Select"/>
<string name="pick title">
Vælg:
</string>
diff --git a/indra/newview/skins/default/xui/da/floater_top_objects.xml b/indra/newview/skins/default/xui/da/floater_top_objects.xml
index 3f19350e30345e6c94850f3485f9eec78003120b..86c24d2c1962831bdc72d7295782d5a376b0e13d 100644
--- a/indra/newview/skins/default/xui/da/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/da/floater_top_objects.xml
@@ -1,15 +1,40 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="top_objects" title="Top objekter">
+ <floater.string name="top_scripts_title">
+ Mest krævende scripts
+ </floater.string>
+ <floater.string name="top_scripts_text">
+ [COUNT] scripts bruger ialt [TIME] ms
+ </floater.string>
+ <floater.string name="scripts_score_label">
+ Tid
+ </floater.string>
+ <floater.string name="scripts_mono_time_label">
+ Mono tid
+ </floater.string>
+ <floater.string name="top_colliders_title">
+ Mest kolliderende
+ </floater.string>
+ <floater.string name="top_colliders_text">
+ Top [COUNT] genstande der potentielt har mange kollisioner
+ </floater.string>
+ <floater.string name="colliders_score_label">
+ Point
+ </floater.string>
+ <floater.string name="none_descriptor">
+ Ingen fundet
+ </floater.string>
<text name="title_text">
Henter...
</text>
<scroll_list name="objects_list">
- <column label="Point" name="score"/>
- <column label="Navn" name="name"/>
- <column label="Ejer" name="owner"/>
- <column label="Lokation" name="location"/>
- <column label="Tid" name="time"/>
- <column label="Mono tid" name="mono_time"/>
+ <scroll_list.columns label="Point" name="score"/>
+ <scroll_list.columns label="Navn" name="name"/>
+ <scroll_list.columns label="Ejer" name="owner"/>
+ <scroll_list.columns label="Lokation" name="location"/>
+ <scroll_list.columns label="Tid" name="time"/>
+ <scroll_list.columns label="Mono tid" name="mono_time"/>
+ <scroll_list.columns label="URL'er" name="URLs"/>
</scroll_list>
<text name="id_text">
Objekt ID:
@@ -23,33 +48,9 @@
Ejer:
</text>
<button label="Filter" name="filter_owner_btn"/>
+ <button label="Genopfrisk" name="refresh_btn"/>
<button label="Returnér valgte" name="return_selected_btn"/>
<button label="Returnér alle" name="return_all_btn"/>
<button label="Afbryd valgte" name="disable_selected_btn"/>
<button label="Afbryd alle" name="disable_all_btn"/>
- <button label="Genopfrisk" name="refresh_btn"/>
- <string name="top_scripts_title">
- Mest krævende scripts
- </string>
- <string name="top_scripts_text">
- [COUNT] scripts bruger ialt [TIME] ms
- </string>
- <string name="scripts_score_label">
- Tid
- </string>
- <string name="scripts_mono_time_label">
- Mono tid
- </string>
- <string name="top_colliders_title">
- Mest kolliderende
- </string>
- <string name="top_colliders_text">
- Top [COUNT] genstande der potentielt har mange kollisioner
- </string>
- <string name="colliders_score_label">
- Point
- </string>
- <string name="none_descriptor">
- Ingen fundet
- </string>
</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_tos.xml b/indra/newview/skins/default/xui/da/floater_tos.xml
index 77906f0f46c9ea7ff243e2fab5846e26adf5553f..6f61d9b310bb77f40c6e2dbf31cc4e4fb0cb23be 100644
--- a/indra/newview/skins/default/xui/da/floater_tos.xml
+++ b/indra/newview/skins/default/xui/da/floater_tos.xml
@@ -4,7 +4,7 @@
<button label="Annullér" label_selected="Annullér" name="Cancel"/>
<check_box label="Jeg accepterer vilkårene for brug af tjenesten" name="agree_chk"/>
<text name="tos_heading">
- Læs venligst de almindelige bestemmelser og vilkår igennem, for at fortsætte til [SECOND LIFE] skal du acceptere vilkårene.
+ Læs venligst følgende servicebetingelser grundigt. For at kunne logge på [SECOND_LIFE], skal du acceptere aftalen.
</text>
<text_editor name="tos_text">
TOS_TEXT
diff --git a/indra/newview/skins/default/xui/da/floater_voice_controls.xml b/indra/newview/skins/default/xui/da/floater_voice_controls.xml
index 8651851233d28749432a189232f2bdf1b75afbec..05e9eb6cdd8552e4d86fcd3c519db3e543a819e0 100644
--- a/indra/newview/skins/default/xui/da/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/da/floater_voice_controls.xml
@@ -13,13 +13,14 @@
Opkald med [NAME]
</string>
<string name="no_one_near">
- Ingen nær
+ Ingen i nærheden har aktiveret stemmer
</string>
- <panel name="control_panel">
- <layout_stack>
- <layout_panel name="leave_btn_panel">
- <button label="Forlad opkald" name="leave_call_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
+ <layout_stack name="my_call_stack">
+ <layout_panel name="my_panel">
+ <text name="user_text" value="Min avatar:"/>
+ </layout_panel>
+ <layout_panel name="leave_call_btn_panel">
+ <button label="Forlad opkald" name="leave_call_btn"/>
+ </layout_panel>
+ </layout_stack>
</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml
index a70db6a6f1ea24ee4b97a2f679a097038020e858..17d5b9c205184905779c463a28aa851a59d4b3b2 100644
--- a/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml
+++ b/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="modal container" title="">
- <button label="Gem" label_selected="Gem" name="Save" />
- <button label="Annullér" label_selected="Annullér" name="Cancel" />
+ <button label="Gem" label_selected="Gem" name="Save"/>
+ <button label="Annullér" label_selected="Annullér" name="Cancel"/>
<text name="Save item as:">
- Gem ting som::
+ Gem genstand i min beholdning som:
</text>
<line_editor name="name ed">
Ny [DESC]
diff --git a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml
index d2f618579d8b8ae37d4c137619c8da5ec9f130ef..443e84b64aa666d99404a63a649eed47bfa5c57c 100644
--- a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="whitelist_entry">
+<floater name="whitelist_entry" title="GODKENDTE SIDER">
<text name="media_label">
Indtast en URL eller et URL mønster for at tilføje til listen med godkendte domæner
</text>
diff --git a/indra/newview/skins/default/xui/da/floater_window_size.xml b/indra/newview/skins/default/xui/da/floater_window_size.xml
new file mode 100644
index 0000000000000000000000000000000000000000..db8ead21bdbee3a2cb58d81b5b71497f667911e8
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_window_size.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="window_size" title="VINDUE STØRRELSE">
+ <string name="resolution_format">
+ [RES_X] x [RES_Y]
+ </string>
+ <text name="windowsize_text">
+ Sæt størrelse på vindue:
+ </text>
+ <combo_box name="window_size_combo" tool_tip="bredde x højde">
+ <combo_box.item label="1000 x 700 (standard)" name="item0"/>
+ <combo_box.item label="1024 x 768" name="item1"/>
+ <combo_box.item label="1280 x 720 (720p)" name="item2"/>
+ <combo_box.item label="1920 x 1080 (1080p)" name="item3"/>
+ </combo_box>
+ <button label="Sæt" name="set_btn"/>
+ <button label="Annullér" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_world_map.xml b/indra/newview/skins/default/xui/da/floater_world_map.xml
index b5ec1cb3022ec030bf8e02b661a96b36ca8a4e48..7d4a81d65565e6068e6e5d49d543b5cb7c398fc7 100644
--- a/indra/newview/skins/default/xui/da/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/da/floater_world_map.xml
@@ -5,70 +5,30 @@
Forklaring
</text>
</panel>
- <panel
- name="layout_panel_2">
- <button label="Vis min position" label_selected="Vis min position" name="Show My Location" tool_tip="Centrér kort om min avatars position"/>
- <text name="person_label">
+ <panel>
+ <text name="me_label">
Mig
</text>
- <check_box label="Beboer" name="people_chk"/>
- <check_box label="Infohub" name="infohub_chk"/>
- <text name="infohub_label">
- Infohub
+ <text name="person_label">
+ Person
</text>
- <check_box label="Land til salg" name="land_for_sale_chk"/>
- <text name="land_sale_label">
- Land til salg
+ <text name="by_owner_label">
+ efter ejer
</text>
<text name="auction_label">
- af ejer
+ land auktion
</text>
- <button label="Tag hjem" label_selected="Tag hjem" name="Go Home" tool_tip="Teleportér til min hjemmelokation"/>
- <text name="Home_label">
- Hjem
- </text>
- <text name="events_label">
- Events:
+ <text name="pg_label">
+ Generelt
</text>
- <check_box label="PG" name="event_chk"/>
- <check_box initial_value="true" label="Mature" name="event_mature_chk"/>
<text name="mature_label">
- Mature
+ Moderat
</text>
- <check_box label="Adult" name="event_adult_chk"/>
- </panel>
- <panel
- name="layout_panel_3">
- <text name="find_on_map_label">
- Find på kort
- </text>
- </panel>
- <panel
- name="layout_panel_4">
- <combo_box label="Venner online" name="friend combo" tool_tip="Vis venner på kort">
- <combo_box.item label="Mine venner online" name="item1"/>
- </combo_box>
- <combo_box label="Mine landemærker" name="landmark combo" tool_tip="Landemærke der skal vises på kort">
- <combo_box.item label="Mine landemærker" name="item1"/>
- </combo_box>
- <search_editor label="Regioner efter navn" name="location" tool_tip="Skriv navnet på en region"/>
- <button label="Find" name="DoSearch" tool_tip="Søg efter en region"/>
- <scroll_list name="search_results">
- <scroll_list.columns label="" name="icon"/>
- <scroll_list.columns label="" name="sim_name"/>
- </scroll_list>
- <button label="Teleport" label_selected="Teleport" name="Teleport" tool_tip="Teleportér til den valgte lokation"/>
- <button label="Kopiér SLurl" name="copy_slurl" tool_tip="Kopierer denne lokation som SLurl der kan bruges på web."/>
- <button label="Vis selektion" label_selected="Vis destination" name="Show Destination" tool_tip="Centrér kortet på valgte lokation"/>
- </panel>
- <panel
- name="layout_panel_5">
- <text name="zoom_label">
- Zoom
+ <text name="adult_label">
+ Voksen
</text>
</panel>
- <panel
- name="layout_panel_6">
- <slider label="Zoom" name="zoom slider"/>
+ <panel>
+ <button name="Clear" tool_tip="Fjern søgelinier og nulstil kort"/>
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/da/inspect_avatar.xml b/indra/newview/skins/default/xui/da/inspect_avatar.xml
index 1b85544303a429985c62aa4bee1b900a67df68c1..d4bc0813e5547bcd01285f6d9a138ca603765cd6 100644
--- a/indra/newview/skins/default/xui/da/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/da/inspect_avatar.xml
@@ -13,7 +13,7 @@
<slider name="volume_slider" tool_tip="Stemme lydstyrke" value="0.5"/>
<button label="Tilføj ven" name="add_friend_btn"/>
<button label="IM" name="im_btn"/>
- <button label="Mere" name="view_profile_btn"/>
+ <button label="Profil" name="view_profile_btn"/>
<panel name="moderator_panel">
<button label="Slå stemme-chat fra" name="disable_voice"/>
<button label="Slå stemme-chat til" name="enable_voice"/>
diff --git a/indra/newview/skins/default/xui/da/menu_avatar_self.xml b/indra/newview/skins/default/xui/da/menu_avatar_self.xml
index 29620fca271f1b8f8cade584d425aa43f0c79394..6a6831c2e3670991838861c3fa86ed42cc7d7a1c 100644
--- a/indra/newview/skins/default/xui/da/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/da/menu_avatar_self.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Self Pie">
<menu_item_call label="Stå op" name="Stand Up"/>
- <context_menu label="Tag af >" name="Take Off >">
- <context_menu label="Tøj >" name="Clothes >">
+ <context_menu label="Tag af â–¶" name="Take Off >">
+ <context_menu label="Tøj ▶" name="Clothes >">
<menu_item_call label="Trøje" name="Shirt"/>
<menu_item_call label="Bukser" name="Pants"/>
<menu_item_call label="Nederdel" name="Skirt"/>
@@ -16,8 +16,8 @@
<menu_item_call label="Alpha" name="Self Alpha"/>
<menu_item_call label="Alt tøj" name="All Clothes"/>
</context_menu>
- <context_menu label="HUD >" name="Object Detach HUD"/>
- <context_menu label="Tag af >" name="Object Detach"/>
+ <context_menu label="HUD â–¶" name="Object Detach HUD"/>
+ <context_menu label="Tag af â–¶" name="Object Detach"/>
<menu_item_call label="Tag alt af" name="Detach All"/>
</context_menu>
<menu_item_call label="Udseende" name="Appearance..."/>
diff --git a/indra/newview/skins/default/xui/da/menu_im_well_button.xml b/indra/newview/skins/default/xui/da/menu_im_well_button.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4889230919b28cec0dbb62efdcd33201725015d6
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/menu_im_well_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="IM Well Button Context Menu">
+ <menu_item_call label="Luk alle" name="Close All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml
index 5b8089bfe084b40ac49c40b556ce205338e42e8a..7434f2c3a28313b41139e4840d4d2dd8b2e7b288 100644
--- a/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml
@@ -7,6 +7,7 @@
<menu_item_call label="Teleportér" name="teleport"/>
<menu_item_call label="Invitér til gruppe" name="invite_to_group"/>
<menu_item_call label="Blokér" name="block"/>
+ <menu_item_call label="Fjern blokering" name="unblock"/>
<menu_item_call label="Rapportér" name="report"/>
<menu_item_call label="Frys" name="freeze"/>
<menu_item_call label="Smid ud" name="eject"/>
@@ -14,4 +15,5 @@
<menu_item_call label="Find på kort" name="find_on_map"/>
<menu_item_call label="Zoom ind" name="zoom_in"/>
<menu_item_call label="Betal" name="pay"/>
+ <menu_item_call label="Del" name="share"/>
</menu>
diff --git a/indra/newview/skins/default/xui/da/menu_inventory.xml b/indra/newview/skins/default/xui/da/menu_inventory.xml
index 376af507d0b3cad16daca232f34907d66db0813d..cdfcad9b1cec28aac50b68ddb2336ef77a494b73 100644
--- a/indra/newview/skins/default/xui/da/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/da/menu_inventory.xml
@@ -46,9 +46,10 @@
<menu_item_call label="Teleport" name="Landmark Open"/>
<menu_item_call label="Ã¥ben" name="Animation Open"/>
<menu_item_call label="Ã¥ben" name="Sound Open"/>
+ <menu_item_call label="Erstat påklædning" name="Replace Outfit"/>
+ <menu_item_call label="Tilføj til påklædning" name="Add To Outfit"/>
<menu_item_call label="Slet ting" name="Purge Item"/>
<menu_item_call label="Genskab ting" name="Restore Item"/>
- <menu_item_call label="GÃ¥ til link" name="Goto Link"/>
<menu_item_call label="Ã¥ben" name="Open"/>
<menu_item_call label="Egenskaber" name="Properties"/>
<menu_item_call label="Omdøb" name="Rename"/>
@@ -57,13 +58,11 @@
<menu_item_call label="Indsæt" name="Paste"/>
<menu_item_call label="Sæt ind som link" name="Paste As Link"/>
<menu_item_call label="Slet" name="Delete"/>
- <menu_item_call label="Tag ting af" name="Take Off Items"/>
- <menu_item_call label="Tilføj til påklædning" name="Add To Outfit"/>
- <menu_item_call label="Erstat påklædning" name="Replace Outfit"/>
+ <menu_item_call label="Slet systemfolder" name="Delete System Folder"/>
<menu_item_call label="start konference chat" name="Conference Chat Folder"/>
<menu_item_call label="Afspil" name="Sound Play"/>
<menu_item_call label="Om landemærke" name="About Landmark"/>
- <menu_item_call label="Afspil offentligt" name="Animation Play"/>
+ <menu_item_call label="Afspil i verden" name="Animation Play"/>
<menu_item_call label="Afspil lokalt" name="Animation Audition"/>
<menu_item_call label="Send privat besked (IM)" name="Send Instant Message"/>
<menu_item_call label="Tilbyd teleport..." name="Offer Teleport..."/>
diff --git a/indra/newview/skins/default/xui/da/menu_login.xml b/indra/newview/skins/default/xui/da/menu_login.xml
index 0942f1b807fba53d3fab6e6af2c33df6e8079e13..7fc7d43c201b135250f7f99cc92ccf495eaf6f21 100644
--- a/indra/newview/skins/default/xui/da/menu_login.xml
+++ b/indra/newview/skins/default/xui/da/menu_login.xml
@@ -21,8 +21,8 @@
</menu>
<menu_item_call label="Vis debug opsætning" name="Debug Settings"/>
<menu_item_call label="UI/farve opsætning" name="UI/Color Settings"/>
- <menu_item_call label="Vis sidebakke" name="Show Side Tray"/>
<menu label="UI tests" name="UI Tests"/>
+ <menu_item_call label="Sæt vinduesstørrelse" name="Set Window Size..."/>
<menu_item_call label="Vis betingelser" name="TOS"/>
<menu_item_call label="Vis vigtig besked" name="Critical"/>
<menu_item_call label="Test i web browser" name="Web Browser Test"/>
diff --git a/indra/newview/skins/default/xui/da/menu_notification_well_button.xml b/indra/newview/skins/default/xui/da/menu_notification_well_button.xml
new file mode 100644
index 0000000000000000000000000000000000000000..40b35b5fdd201adc51bb732f335c3a88987812f9
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/menu_notification_well_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Notification Well Button Context Menu">
+ <menu_item_call label="Luk alle" name="Close All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_object.xml b/indra/newview/skins/default/xui/da/menu_object.xml
index 0714b67ec3b961c1a56d3c159901b2d53fb5d560..232f3f64e28185e1b2aa3f3351538cd5abf7335f 100644
--- a/indra/newview/skins/default/xui/da/menu_object.xml
+++ b/indra/newview/skins/default/xui/da/menu_object.xml
@@ -6,18 +6,20 @@
<menu_item_call label="Ã…ben" name="Open"/>
<menu_item_call label="Sid her" name="Object Sit"/>
<menu_item_call label="Objekt profil" name="Object Inspect"/>
- <context_menu label="Sæt på >" name="Put On">
+ <menu_item_call label="Zoom In" name="Zoom In"/>
+ <context_menu label="Tag på ▶" name="Put On">
<menu_item_call label="Tag på" name="Wear"/>
- <context_menu label="Vedhæft >" name="Object Attach"/>
- <context_menu label="Vedhæft HUD >" name="Object Attach HUD"/>
+ <context_menu label="Vedhæft ▶" name="Object Attach"/>
+ <context_menu label="Vedhæft HUD ▶" name="Object Attach HUD"/>
</context_menu>
- <context_menu label="Fjern >" name="Remove">
- <menu_item_call label="Tag" name="Pie Object Take"/>
+ <context_menu label="Fjern â–¶" name="Remove">
<menu_item_call label="Rapportér misbrug" name="Report Abuse..."/>
<menu_item_call label="Blokér" name="Object Mute"/>
<menu_item_call label="Returnér" name="Return..."/>
<menu_item_call label="Slet" name="Delete"/>
</context_menu>
+ <menu_item_call label="Køb" name="Pie Object Bye"/>
+ <menu_item_call label="Tag" name="Pie Object Take"/>
<menu_item_call label="Tag kopi" name="Take Copy"/>
<menu_item_call label="Betal" name="Pay..."/>
<menu_item_call label="Køb" name="Buy..."/>
diff --git a/indra/newview/skins/default/xui/da/menu_participant_list.xml b/indra/newview/skins/default/xui/da/menu_participant_list.xml
index 44a016026c1e7578f34230f52ed6f2f50e86deb9..c2595dcb3dd812fdab74cfc50307e3d0d30366d7 100644
--- a/indra/newview/skins/default/xui/da/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/da/menu_participant_list.xml
@@ -1,16 +1,20 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Participant List Context Menu">
+ <menu_item_check label="Sortér efter navn" name="SortByName"/>
+ <menu_item_check label="Sortér efter nylige talere" name="SortByRecentSpeakers"/>
<menu_item_call label="Profil" name="View Profile"/>
<menu_item_call label="Tilføj ven" name="Add Friend"/>
<menu_item_call label="Send besked" name="IM"/>
<menu_item_call label="Opkald" name="Call"/>
<menu_item_call label="Del" name="Share"/>
<menu_item_call label="Betal" name="Pay"/>
- <menu_item_check label="Blokér/Fjern blokering" name="Block/Unblock"/>
- <menu_item_check label="Sluk for tekst" name="MuteText"/>
- <menu_item_check label="Tillad tekst chat" name="AllowTextChat"/>
- <menu_item_call label="Sluk for denne deltager" name="ModerateVoiceMuteSelected"/>
- <menu_item_call label="Sluk for alle andre" name="ModerateVoiceMuteOthers"/>
- <menu_item_call label="Ã…ben for denne deltager" name="ModerateVoiceUnMuteSelected"/>
- <menu_item_call label="Ã…ben for alle andre" name="ModerateVoiceUnMuteOthers"/>
+ <menu_item_check label="Blokér stemme" name="Block/Unblock"/>
+ <menu_item_check label="Blokér tekst" name="MuteText"/>
+ <context_menu label="Moderator muligheder >" name="Moderator Options">
+ <menu_item_check label="Tillad tekst chat" name="AllowTextChat"/>
+ <menu_item_call label="Sluk for denne deltager" name="ModerateVoiceMuteSelected"/>
+ <menu_item_call label="Sluk for alle andre" name="ModerateVoiceMuteOthers"/>
+ <menu_item_call label="Fjern slukning for denne deltager" name="ModerateVoiceUnMuteSelected"/>
+ <menu_item_call label="Fjern slukning for alle andre" name="ModerateVoiceUnMuteOthers"/>
+ </context_menu>
</context_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_people_groups.xml b/indra/newview/skins/default/xui/da/menu_people_groups.xml
new file mode 100644
index 0000000000000000000000000000000000000000..841f58b61914a678177b59075c289d88d292c261
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/menu_people_groups.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+ <menu_item_call label="Se info" name="View Info"/>
+ <menu_item_call label="Chat" name="Chat"/>
+ <menu_item_call label="Opkald" name="Call"/>
+ <menu_item_call label="Aktivér" name="Activate"/>
+ <menu_item_call label="Forlad" name="Leave"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby.xml b/indra/newview/skins/default/xui/da/menu_people_nearby.xml
index 224190149b2450351b841307f0d232b7ca4ce511..5470c327617ba7305cef7b6644007758fe353c06 100644
--- a/indra/newview/skins/default/xui/da/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/da/menu_people_nearby.xml
@@ -2,9 +2,12 @@
<context_menu name="Avatar Context Menu">
<menu_item_call label="Profil" name="View Profile"/>
<menu_item_call label="Tilføj ven" name="Add Friend"/>
+ <menu_item_call label="Fjern ven" name="Remove Friend"/>
<menu_item_call label="Besked" name="IM"/>
<menu_item_call label="Opkald" name="Call"/>
+ <menu_item_call label="Kort" name="Map"/>
<menu_item_call label="Del" name="Share"/>
<menu_item_call label="Betal" name="Pay"/>
<menu_item_check label="Blokér/Fjern blokering" name="Block/Unblock"/>
+ <menu_item_call label="Tilbyd teleport" name="teleport"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml
index 92c6d2c960d41bc7500fd5e8249a081cb3762a24..08b7136b97c983a8521f095de8a0f70bd7a0ea68 100644
--- a/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Multi-Selected People Context Menu">
<menu_item_call label="Tilføj venner" name="Add Friends"/>
+ <menu_item_call label="Fjern venner" name="Remove Friend"/>
<menu_item_call label="Besked" name="IM"/>
<menu_item_call label="Opkald" name="Call"/>
<menu_item_call label="Del" name="Share"/>
diff --git a/indra/newview/skins/default/xui/da/menu_profile_overflow.xml b/indra/newview/skins/default/xui/da/menu_profile_overflow.xml
index 58fbc62643d42190ebc7c647e6a3410ca535a459..9609b424a193870ff990289a32d7b73b9746e106 100644
--- a/indra/newview/skins/default/xui/da/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/da/menu_profile_overflow.xml
@@ -2,4 +2,10 @@
<toggleable_menu name="profile_overflow_menu">
<menu_item_call label="Betal" name="pay"/>
<menu_item_call label="Del" name="share"/>
+ <menu_item_call label="Blokér" name="block"/>
+ <menu_item_call label="Fjern blokering" name="unblock"/>
+ <menu_item_call label="Spark" name="kick"/>
+ <menu_item_call label="Frys" name="freeze"/>
+ <menu_item_call label="Fjern frys" name="unfreeze"/>
+ <menu_item_call label="Kundeservicemedarbejder (CSR)" name="csr"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml
index ec0631d54fe8fd0125a6c4830f9b1a8a8cc922fd..18ad7cfffa0c39eba70be40c803ef852a7e3a97d 100644
--- a/indra/newview/skins/default/xui/da/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/da/menu_viewer.xml
@@ -7,8 +7,8 @@
<menu_item_call label="Profil" name="Profile"/>
<menu_item_call label="Udseende" name="Appearance"/>
<menu_item_check label="Beholdning" name="Inventory"/>
- <menu_item_call label="Vis beholdning i sidebakke" name="ShowSidetrayInventory"/>
- <menu_item_call label="Mine bevægelser" name="Gestures"/>
+ <menu_item_check label="Min beholdning" name="ShowSidetrayInventory"/>
+ <menu_item_check label="Mine bevægelser" name="Gestures"/>
<menu label="Min status" name="Status">
<menu_item_call label="Væk" name="Set Away"/>
<menu_item_call label="Optaget" name="Set Busy"/>
@@ -22,35 +22,36 @@
<menu_item_call label="Grupper" name="My Groups"/>
<menu_item_check label="Chat i nærheden" name="Nearby Chat"/>
<menu_item_call label="Personer tæt på" name="Active Speakers"/>
- <menu_item_check label="Media i nærheden" name="Nearby Media"/>
</menu>
<menu label="Verden" name="World">
- <menu_item_check label="Flyt" name="Movement Controls"/>
- <menu_item_check label="Vis" name="Camera Controls"/>
- <menu_item_call label="Om land" name="About Land"/>
- <menu_item_call label="Region/Estate" name="Region/Estate"/>
- <menu_item_call label="Køb land" name="Buy Land"/>
+ <menu_item_check label="Mini-kort" name="Mini-Map"/>
+ <menu_item_check label="Verdenskort" name="World Map"/>
+ <menu_item_call label="Foto" name="Take Snapshot"/>
+ <menu_item_call label="Opret landemærke for dette sted" name="Create Landmark Here"/>
+ <menu label="Profil for sted" name="Land">
+ <menu_item_call label="Om land" name="About Land"/>
+ <menu_item_call label="Region/Estate" name="Region/Estate"/>
+ </menu>
+ <menu_item_call label="Køb dette land" name="Buy Land"/>
<menu_item_call label="Mit land" name="My Land"/>
- <menu label="Vis" name="Land">
- <menu_item_check label="Ban Lines" name="Ban Lines"/>
+ <menu label="Vis" name="LandShow">
+ <menu_item_check label="Bevægelses kontrol" name="Movement Controls"/>
+ <menu_item_check label="Vis kontroller" name="Camera Controls"/>
+ <menu_item_check label="'Ingen adgang' markering" name="Ban Lines"/>
<menu_item_check label="Pejlelys" name="beacons"/>
<menu_item_check label="Parcel skel" name="Property Lines"/>
- <menu_item_check label="Land-ejere" name="Land Owners"/>
- </menu>
- <menu label="Landemærker" name="Landmarks">
- <menu_item_call label="Opret landemærke her" name="Create Landmark Here"/>
- <menu_item_call label="Sæt hjem til her" name="Set Home to Here"/>
+ <menu_item_check label="Grundejere" name="Land Owners"/>
+ <menu_item_check label="Koordinater" name="Coordinates"/>
+ <menu_item_check label="Parcel egenskaber" name="Parcel Properties"/>
</menu>
- <menu_item_call label="Hjem" name="Teleport Home"/>
- <menu_item_check label="Mini-kort" name="Mini-Map"/>
- <menu_item_check label="Verdenskort" name="World Map"/>
- <menu_item_call label="Foto" name="Take Snapshot"/>
+ <menu_item_call label="Teleport hjem" name="Teleport Home"/>
+ <menu_item_call label="Sæt dette sted som 'Hjem'" name="Set Home to Here"/>
<menu label="Sol" name="Environment Settings">
<menu_item_call label="Solopgang" name="Sunrise"/>
<menu_item_call label="Middag" name="Noon"/>
<menu_item_call label="Solnedgang" name="Sunset"/>
<menu_item_call label="Midnat" name="Midnight"/>
- <menu_item_call label="Benyt tid fra estate" name="Revert to Region Default"/>
+ <menu_item_call label="Estate tid" name="Revert to Region Default"/>
<menu_item_call label="Redigering af omgivelser" name="Environment Editor"/>
</menu>
</menu>
@@ -76,10 +77,12 @@
</menu>
<menu_item_call label="Sammenkæde" name="Link"/>
<menu_item_call label="Adskil" name="Unlink"/>
+ <menu_item_check label="Redigér sammekædede objekter" name="Edit Linked Parts"/>
<menu_item_call label="Fokusér på valgte" name="Focus on Selection"/>
<menu_item_call label="Zoom til valgte" name="Zoom to Selection"/>
<menu label="Objekt" name="Object">
- <menu_item_call label="Køb" name="Menu Object Take"/>
+ <menu_item_call label="Køb" name="Menu Object Buy"/>
+ <menu_item_call label="Tag" name="Menu Object Take"/>
<menu_item_call label="Tag kopi" name="Take Copy"/>
<menu_item_call label="Opdatér ændringer til beholdning" name="Save Object Back to My Inventory"/>
<menu_item_call label="Opdater ændringer i indhold til objekt" name="Save Object Back to Object Contents"/>
@@ -92,25 +95,18 @@
<menu_item_call label="Sæt scripts til "Not Running"" name="Set Scripts to Not Running"/>
</menu>
<menu label="Valg" name="Options">
- <menu_item_check label="Redigér sammenlænkede dele" name="Edit Linked Parts"/>
<menu_item_call label="Sæt standard rettigheder" name="perm prefs"/>
<menu_item_check label="Vis avancerede rettigheder" name="DebugPermissions"/>
- <menu label="Selektion" name="Selection">
- <menu_item_check label="Vælg kun egne objekter" name="Select Only My Objects"/>
- <menu_item_check label="Vælg kun flytbare objekter" name="Select Only Movable Objects"/>
- <menu_item_check label="Vælg ved at omkrandse" name="Select By Surrounding"/>
- </menu>
- <menu label="Vis" name="Show">
- <menu_item_check label="Vis skjult selektion" name="Show Hidden Selection"/>
- <menu_item_check label="Vis lys-radius for valgte" name="Show Light Radius for Selection"/>
- <menu_item_check label="Vis udvælgelses stråle" name="Show Selection Beam"/>
- </menu>
- <menu label="Gitter" name="Grid">
- <menu_item_check label="Ret ind til gitter" name="Snap to Grid"/>
- <menu_item_call label="Ret XY for objekt ind til gitter" name="Snap Object XY to Grid"/>
- <menu_item_call label="Benyt valgte som grundlag for gitter" name="Use Selection for Grid"/>
- <menu_item_call label="Gitter valg" name="Grid Options"/>
- </menu>
+ <menu_item_check label="Vælg kun egne objekter" name="Select Only My Objects"/>
+ <menu_item_check label="Vis kun flytbare objekter" name="Select Only Movable Objects"/>
+ <menu_item_check label="Vælg ved at omkrandse" name="Select By Surrounding"/>
+ <menu_item_check label="Vis skjulte objekter" name="Show Hidden Selection"/>
+ <menu_item_check label="Vis lys-radius for valgte" name="Show Light Radius for Selection"/>
+ <menu_item_check label="Vis pejlelys for valgte" name="Show Selection Beam"/>
+ <menu_item_check label="Ret ind til gitter" name="Snap to Grid"/>
+ <menu_item_call label="Ret XY for objekt ind til gitter" name="Snap Object XY to Grid"/>
+ <menu_item_call label="Benyt valgte som grundlag for gitter" name="Use Selection for Grid"/>
+ <menu_item_call label="Gitter indstillinger" name="Grid Options"/>
</menu>
<menu label="Vis lænkede dele" name="Select Linked Parts">
<menu_item_call label="Vælg næste del" name="Select Next Part"/>
@@ -121,15 +117,14 @@
</menu>
<menu label="Hjælp" name="Help">
<menu_item_call label="[SECOND_LIFE] Help" name="Second Life Help"/>
- <menu_item_call label="Tutorial" name="Tutorial"/>
<menu_item_call label="Rapporter misbrug" name="Report Abuse"/>
<menu_item_call label="Rapportér fejl" name="Report Bug"/>
</menu>
<menu label="Avanceret" name="Advanced">
- <menu_item_check label="Sæt til "væk" efter 30 minutter" name="Go Away/AFK When Idle"/>
<menu_item_call label="Stop animering af min avatar" name="Stop Animating My Avatar"/>
<menu_item_call label="Gendan teksturer" name="Rebake Texture"/>
<menu_item_call label="Sæt UI størrelse til standard" name="Set UI Size to Default"/>
+ <menu_item_call label="Vælg vinduesstørrelse..." name="Set Window Size..."/>
<menu_item_check label="Begræns valg afstand" name="Limit Select Distance"/>
<menu_item_check label="Fjern kamerabegrænsninger" name="Disable Camera Distance"/>
<menu_item_check label="Højopløsningsfoto" name="HighResSnapshot"/>
@@ -176,8 +171,8 @@
<menu_item_check label="Kør flere tråde" name="Run Multiple Threads"/>
<menu_item_call label="Tøm gruppe cache" name="ClearGroupCache"/>
<menu_item_check label="Muse udjævning" name="Mouse Smoothing"/>
- <menu_item_check label="Vis IM's i lokal chat" name="IMInChat"/>
<menu label="Shortcuts" name="Shortcuts">
+ <menu_item_call label="Billede (L$[COST])..." name="Upload Image"/>
<menu_item_check label="Søg" name="Search"/>
<menu_item_call label="Frigør taster" name="Release Keys"/>
<menu_item_call label="Sæt UI størrelse til standard" name="Set UI Size to Default"/>
@@ -217,6 +212,7 @@
<menu_item_call label="Vis Regionsinfo i debug-konsol" name="Region Info to Debug Console"/>
<menu_item_check label="Kamera" name="Camera"/>
<menu_item_check label="Vind" name="Wind"/>
+ <menu_item_check label="Badge" name="Badge"/>
</menu>
<menu label="Vis info" name="Display Info">
<menu_item_check label="Vis tid" name="Show Time"/>
diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml
index 42eac1be7a4e83426e4d99d90c84fafdbffe9a79..9193bd43e8e82d171afd6e8bdc92b6749c8f3e8f 100644
--- a/indra/newview/skins/default/xui/da/notifications.xml
+++ b/indra/newview/skins/default/xui/da/notifications.xml
@@ -11,18 +11,29 @@
</global>
<template name="okbutton">
<form>
- <button name="OK" text="$yestext"/>
+ <button name="OK_okbutton" text="$yestext"/>
+ </form>
+ </template>
+ <template name="okignore">
+ <form>
+ <button name="OK_okignore" text="$yestext"/>
</form>
</template>
- <template name="okignore"/>
<template name="okcancelbuttons">
<form>
- <button name="Cancel" text="$notext"/>
+ <button name="OK_okcancelbuttons" text="$yestext"/>
+ <button name="Cancel_okcancelbuttons" text="$notext"/>
+ </form>
+ </template>
+ <template name="okcancelignore">
+ <form>
+ <button name="OK_okcancelignore" text="$yestext"/>
+ <button name="Cancel_okcancelignore" text="$notext"/>
</form>
</template>
- <template name="okcancelignore"/>
<template name="okhelpbuttons">
<form>
+ <button name="OK_okhelpbuttons" text="$yestext"/>
<button name="Help" text="$helptext"/>
</form>
</template>
@@ -30,6 +41,7 @@
<form>
<button name="Yes" text="$yestext"/>
<button name="No" text="$notext"/>
+ <button name="Cancel_yesnocancelbuttons" text="$canceltext"/>
</form>
</template>
<notification functor="GenericAcknowledge" label="Ukendt notificeringsbesked" name="MissingAlert">
@@ -93,13 +105,17 @@ Vælg kun en genstand, og prøv igen.
Gem alle ændringer til tøj/krops dele?
<usetemplate canceltext="Annullér" name="yesnocancelbuttons" notext="Gem Ikke" yestext="Gem Alt"/>
</notification>
+ <notification name="FriendsAndGroupsOnly">
+ 'Ikke-venner' vil ikke vide, at du har valgt at ignorere deres opkald og personlige beskeder (IM)
+ <usetemplate name="okbutton" yestext="Ja"/>
+ </notification>
<notification name="GrantModifyRights">
- At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage alle genstande, du måtte have i verden. Vær meget forsigtig når uddeler denne tilladelse.
+ At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage ALLE genstande, du måtte have i verden. Vær MEGET forsigtig når uddeler denne tilladelse.
Ønsker du at ændre rettigheder for [FIRST_NAME] [LAST_NAME]?
<usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/>
</notification>
<notification name="GrantModifyRightsMultiple">
- At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage alle genstande, du måtte have i verden. Vær meget forsigtig når uddeler denne tilladelse.
+ At give redigerings rettigheder til en anden beboer, giver dem mulighed for at ændre, slette eller tage ALLE genstande, du måtte have i verden. Vær MEGET forsigtig når uddeler denne tilladelse.
Ønsker du at ændre rettigheder for de valgte beboere?
<usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/>
</notification>
@@ -142,8 +158,15 @@ Ethvert medlem i en rolle med denne evne kan tildele sig selv -- og et andet med
Add this Ability to '[ROLE_NAME]'?
<usetemplate name="okcancelbuttons" notext="Nej" yestext="Ja"/>
</notification>
- <notification name="ClickUnimplemented">
- Beklager, ikke implementeret endnu.
+ <notification name="AttachmentDrop">
+ Du er ved at smide et vedhæng.
+ Er du sikker på at du vil fortsætte?
+ <usetemplate ignoretext="Bekræft før vedhæng smides" name="okcancelignore" notext="Nej" yestext="Ja"/>
+ </notification>
+ <notification name="JoinGroupNoCost">
+ Du melder dig ind i gruppen [NAME].
+Ønsker du at fortsætte?
+ <usetemplate name="okcancelbuttons" notext="Annullér" yestext="Bliv medlem"/>
</notification>
<notification name="JoinGroupCannotAfford">
Tilmelding til denne gruppe koster L$[COST].
@@ -197,13 +220,9 @@ Jo mere du betaler, jo højere oppe på listen vises annoncen, og den vil også
Er du sikker på at du vil fortsætte?
<usetemplate ignoretext="Bekræft før jeg slette media i et objekt" name="okcancelignore" notext="Nej" yestext="Ja"/>
</notification>
- <notification name="ResetShowNextTimeDialogs">
- Vil du gerne genaktivere alle disse popups, som du tidligere har bedt om ikke at få vist?
- <usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/>
- </notification>
- <notification name="SkipShowNextTimeDialogs">
- Vil du deaktivere alle popups som kan undværes?
- <usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/>
+ <notification name="ClassifiedInsufficientFunds">
+ Ikke nok penge til at oprette annonce.
+ <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="CacheWillClear">
Cache vil blive tømt ved næste genstart af [APP_NAME].
@@ -224,11 +243,14 @@ Indtast venligst navn på region i Start lokation feltet eller vælg "Min s
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="UnsupportedHardware">
+ Bare så du ved det, din computer opfylder ikke minimumskravene til [APP_NAME]. Du kan opleve dårlig hastighed. Desværre kan [SUPPORT_SITE] ikke give teknisk support til ikke-supporterede konfigurationer.
+MINSPECS
+Besøg [_URL] for mere information?
<usetemplate ignoretext="Din computer hardware understøttes ikke" name="okcancelignore" notext="No" yestext="Yes"/>
</notification>
<notification name="UnknownGPU">
- Dit system har et grafikkort som er ukendt for [APP_NAME] lige nu.
-Dette er tilfældet med nyt hardware som endnu ikke er blevet testet med [APP_NAME]. [APP_NAME] vil sandsynligvis kunne køre normalt, men det kan være nødvendigt at justere opsætningen af grafik.
+ Dit system indeholder et grafikkort som [APP_NAME] ikke kan genkende.
+Dette skyldes ofte nyt hardware som endnu ikke er blevet testet med [APP_NAME]. Kortet vil sandsynligvis virke fint, med det kan være nødvendigt at justere grafik opsætningen.
(Mig > Indstillinger > Grafik).
<form name="form">
<ignore name="ignore" text="Dit grafikkort kunne ikke identificeres"/>
@@ -260,9 +282,17 @@ Gå til [_URL] for information om køb af L$?
<notification name="LandmarkCreated">
Du har tilføjet "[LANDMARK_NAME]" til din [FOLDER_NAME] mappe.
</notification>
+ <notification name="LandmarkAlreadyExists">
+ Du har allerede et landemærke for denne lokation.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="CannotOpenScriptObjectNoMod">
Ikke muligt at åbne script i objekt uden 'Redigére' rettigheder.
</notification>
+ <notification name="CouldNotTeleportReason">
+ Teleport fejlede.
+[REASON]
+ </notification>
<notification name="invalid_tport">
Der opstod et problem ved din teleport. Det kan være nødvendigt at logge ind igen, før du kan teleporte.
Hvis du bliver ved med at få denne fejl, check venligst [SUPPORT_SITE].
@@ -305,6 +335,10 @@ Prøv evt. igen om lidt.
<notification name="no_inventory_host">
Beholdningssystemet er ikke tilgængelig lige nu.
</notification>
+ <notification name="ForceOwnerAuctionWarning">
+ Denne parcel er sat på auktion. Gennemtving ejerskab vil annullere denne auktion og måske irritere nogen beboere hvis bud allerede er afgivet.
+Gennemtving ejerskab?
+ </notification>
<notification name="CannotBuyLandNoRegion">
Ikke i stand til at købe land:
Kan ikke finde region som dette land er i.
@@ -315,13 +349,6 @@ Kan ikke finde region som dette land er i.
<notification name="CannotDeedLandNoRegion">
Land kunne ikke dedikeres:
Kunne ikke finde den region land ligger i.
- </notification>
- <notification name="ParcelCanPlayMedia">
- Dette sted kan afspille 'streaming media'.
-'Streaming media' kræver en hurtig internet opkobling.
-
-Afspil altid 'streaming media' når det er tilgængeligt?
-(Du kan ændre dette valg senere under Indstillinger > Privatliv.)
</notification>
<notification name="CannotReleaseLandRegionNotFound">
Kunne ikke efterlade land:
@@ -340,9 +367,8 @@ Kan ikke finde den region landet ligger i.
Dette er typisk en midlertidig fejl. Venligst rediger og gem igen om et par minutter.
</notification>
<notification name="YouHaveBeenLoggedOut">
- Du er blevet logget af [SECOND_LIFE]:
+ Du er blevet logget af [SECOND_LIFE]
[MESSAGE]
-Du kan stadig se igangværende samtaler (IM) og chat ved at klikke på 'Se IM & chat. Ellers klik på 'Afslut' for at lukke [APP_NAME] med det samme.
<usetemplate name="okcancelbuttons" notext="Afslut" yestext="Se PB & Chat"/>
</notification>
<notification label="Tilføj ven" name="AddFriend">
@@ -365,6 +391,9 @@ Tilbyd venskab til [NAME]?
<button name="Cancel" text="Annullér"/>
</form>
</notification>
+ <notification name="ErrorMessage">
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="AvatarMovedDesired">
Den ønskede lokation er ikke tilgængelig lige nu.
Du er blevet flyttet til en region in nærheden.
@@ -511,9 +540,12 @@ Chat og personlige beskeder vil blive skjult. Personlige beskeder vil få din &a
<usetemplate ignoretext="Jeg skrifter min status til 'optaget" name="okignore" yestext="OK"/>
</notification>
<notification name="JoinedTooManyGroupsMember">
- Du har nået det maksimale antal grupper. Du skal forlade en anden gruppe for at kunne være med i denne - eller afvis tilbudet.
-[NAME] har inviteret dig til at være medlem af en gruppe.
-[INVITE]
+ Du er oppe på det maksimale antal grupper. Forlad venligst en anden gruppe inden du melder dig ind i denne, eller afvis tilbuddet.
+[NAME] har inviteret dig til en gruppe.
+ </notification>
+ <notification name="JoinedTooManyGroups">
+ Du er oppe på det maksimale antal grupper. Forlad venligst en gruppe inden du melder dig ind i enndnu en gruppe eller opretter en ny.
+ <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="OfferTeleport">
<form name="form">
@@ -525,6 +557,7 @@ Chat og personlige beskeder vil blive skjult. Personlige beskeder vil få din &a
</form>
</notification>
<notification name="TeleportFromLandmark">
+ Er du sikker på at du vil teleportere til <nolink>[LOCATION]</nolink>?
<usetemplate ignoretext="Bekræft at jeg vil teleportere til et landemærke" name="okcancelignore" notext="Cancel" yestext="Teleport"/>
</notification>
<notification name="TeleportToPick">
@@ -626,6 +659,12 @@ Du kan klikke på 'Ændre præference' for at ændre din indholdsratin
Indeholder denne gruppe 'Mature' indhold?
<usetemplate canceltext="Annullér" name="yesnocancelbuttons" notext="Nej" yestext="Ja"/>
</notification>
+ <notification label="Changed Region Maturity" name="RegionMaturityChange">
+ Ratingen for denne region er ændret.
+Det kan tage noget tid inden ændringen slår igennem på kortet.
+
+For at få adgang til voksen regioner, skal beboere være alders-checket, enten via aldersverifikation eller betalingsverifikation.
+ </notification>
<notification label="Voice Version Mismatch" name="VoiceVersionMismatch">
Denne version af [APP_NAME] er ikke kompatibel med stemme chat funktionen i denne region. For at kunne få stemme chat til at fungere skal du opdatere [APP_NAME].
</notification>
@@ -649,9 +688,9 @@ Du kan klikke på 'Ændre præference' for at ændre din indholdsratin
<usetemplate ignoretext="Bekræft før jeg afslutter" name="okcancelignore" notext="Afslut ikke" yestext="Quit"/>
</notification>
<notification name="HelpReportAbuseEmailLL">
- Benyt dette værktøj til at rapportere Use this tool to report krænkelser af [http://secondlife.com/corporate/tos.php Terms of Service] og [http://secondlife.com/corporate/cs.php Community Standards].
+ Benyt dette værktøj til at rapportere krænkninger af [http://secondlife.com/corporate/tos.php Terms of Service] og [http://secondlife.com/corporate/cs.php Community Standards].
-Alle indrapporterede krænkelser er undersøgt og and afgjort. Du kan se løsning ved at læse [http://secondlife.com/support/incidentreport.php Incident Report].
+Alle rapporter om krænkninger vil blive undersøgt og behandlet.
</notification>
<notification name="HelpReportAbuseContainsCopyright">
Kære beboer,
@@ -792,8 +831,7 @@ Henvis til dette fra en hjemmeside for at give andre nem adgang til denne lokati
Bevægelsen [NAME] mangler i databasen.
</notification>
<notification name="UnableToLoadGesture">
- Ikke muligt at indlæse gestus [NAME].
-Prøv venligst igen.
+ Kunne ikke indlæse læse bevægelse [NAME].
</notification>
<notification name="LandmarkMissing">
Landmærke mangler i databasen.
@@ -885,10 +923,9 @@ Click on any landmark to select it, then click 'Teleport' at the botto
(You can also double-click on the landmark, or right-click it and choose 'Teleport'.)
</notification>
<notification name="TeleportToPerson">
- Du kan kontakte beboere som f.eks. '[NAME]' ved at åbne 'Personer' panelet til højre på skærmen.
-Vælg beboeren fra listen og klik så på 'IM' i bunden af panelet.
-(Du kan også dobbelt-klikke på navnet i listen eller højreklikke og vælge 'IM')
-(You can also double-click on their name in the list, or right-click and choose 'IM').
+ Du kan kontakte beboere som '[NAME]' ved at åbne Personer panelet til højre på skærmen.
+Vælg beboeren fra listen og klik så 'IM' i bundet af panelet.
+(Du kan også dobbelt-klikke på navnet i listen, eller højre-klikke og vælge 'IM').
</notification>
<notification name="CantSelectLandFromMultipleRegions">
Kan ikke vælge land på tværs af grænser.
@@ -959,7 +996,7 @@ Prøv venligst at geninstallere plugin eller kontakt leverandøren hvis probleme
Genstandene på det valgte stykke land der er ejet af [FIRST] [LAST] er blevet returneret til hans eller hendes beholdning.
</notification>
<notification name="OtherObjectsReturned2">
- Genstandene på det valgte stykke land der er ejet af beboeren '[NAME]' er blevet returneret til deres ejere.
+ Objekterne i den valgte parcel, ejet af beboeren '[NAME]', er blevet returneret til deres ejer.
</notification>
<notification name="GroupObjectsReturned">
Genstandene på det valgte stykke land, delt med gruppen [GROUPNAME], er blevet returneret til deres ejeres beholdninger.
@@ -971,7 +1008,7 @@ Genstande, der ikke kan overføres og som er dedikeret til gruppen, er blevet sl
</notification>
<notification name="ServerObjectMessage">
Besked fra [NAME]:
-[MSG]
+<nolink>[MSG]</nolink>
</notification>
<notification name="NotSafe">
Dette land er åbnet for 'skade'.
@@ -1080,7 +1117,7 @@ Prøv igen om lidt.
No valid parcel could be found.
</notification>
<notification name="ObjectGiveItem">
- Et objekt med navnet [OBJECTFROMNAME], ejet af [NAME_SLURL], har givet dig [OBJECTTYPE]:
+ Et objekt med navnet [OBJECTFROMNAME] ejet af [NAME_SLURL] har givet dig denne/dette [OBJECTTYPE]:
[ITEM_SLURL]
<form name="form">
<button name="Keep" text="Behold"/>
@@ -1089,7 +1126,7 @@ Prøv igen om lidt.
</form>
</notification>
<notification name="ObjectGiveItemUnknownUser">
- Et objekt med navnet [OBJECTFROMNAME], ejet af en ukendt beboer, har givet dig [OBJECTTYPE]:
+ Et objekt med navnet [OBJECTFROMNAME] ejet af (en ukendt beboer) har givet dig denne/dette [OBJECTTYPE]:
[ITEM_SLURL]
<form name="form">
<button name="Keep" text="Behold"/>
@@ -1098,12 +1135,12 @@ Prøv igen om lidt.
</form>
</notification>
<notification name="UserGiveItem">
- [NAME_SLURL] har givet dig [OBJECTTYPE]:
+ [NAME_SLURL] har givet dig denne/dette [OBJECTTYPE]:
[ITEM_SLURL]
<form name="form">
- <button name="Keep" text="Behold"/>
<button name="Show" text="Vis"/>
<button name="Discard" text="Smid væk"/>
+ <button name="Mute" text="Blokér"/>
</form>
</notification>
<notification name="GodMessage">
@@ -1128,6 +1165,9 @@ Prøv igen om lidt.
<button name="Cancel" text="Annullér"/>
</form>
</notification>
+ <notification name="TeleportOfferSent">
+ Tilbud om teleport sendt til [TO_NAME]
+ </notification>
<notification name="GotoURL">
[MESSAGE]
[URL]
@@ -1154,9 +1194,15 @@ Som standard vil du kunne se andres onlinestatus.
<notification name="FriendshipDeclined">
[NAME] afviste dit tilbud om venskab.
</notification>
+ <notification name="FriendshipAcceptedByMe">
+ Tilbud om venskab accepteret.
+ </notification>
+ <notification name="FriendshipDeclinedByMe">
+ Tilbud om venskab afvist.
+ </notification>
<notification name="OfferCallingCard">
- [FIRST] [LAST] tilbyder vedkommendes visitkort.
-Dette vil tilføje et bogmærke i din beholdning, så du hurtigt kan sende en personlig besked (IM) til denne beboer.
+ [FIRST] [LAST] tilbyder dig et visitkort.
+Dette vil lave et bogmørke i din beholding, så du hurtigt kan sende en IM til denne beboer.
<form name="form">
<button name="Accept" text="Acceptér"/>
<button name="Decline" text="Afvis"/>
@@ -1235,14 +1281,6 @@ Tillad denne anmodning?
<button name="Block" text="Blokér"/>
</form>
</notification>
- <notification name="FirstBalanceIncrease">
- Du har netop modtaget [AMOUNT] L$.
-Din balance vises øverst til højre.
- </notification>
- <notification name="FirstBalanceDecrease">
- Du har netop betalt [AMOUNT] L$.
-Din balance vises øverst til højre.
- </notification>
<notification name="BuyLindenDollarSuccess">
Tak for din betaling!
@@ -1250,58 +1288,17 @@ Din L$ balance vil blive opdateret når transaktionen er gennemført. Ved transa
Status for din betaling kan ses i din 'Transaction History' side på din [http://secondlife.com/account/ Dashboard]
</notification>
- <notification name="FirstSit">
- Du sidder ned.
-Benyt piletasterne (eller AWSD) til at se rundt.
-Klik på 'Stå op' tasten for at rejse dig.
- </notification>
- <notification name="FirstMap">
- Klik og træk på kortet for at se rundt.
-Dobbelt-klik for at teleportere.
-Benyt kontrollerne til højre for at finde ting og se forskellige baggrunde.
- </notification>
- <notification name="FirstBuild">
- Du har åbnet bygge værktøjer. Alle objekter du ser omkring dig er lavet via disse værktøjer.
- </notification>
- <notification name="FirstTeleport">
- Du kan kun teleportere til bestemte områder i denne region. Pilen peger på din specifikke destination. Klik på pilen for at fjerne den.
- </notification>
<notification name="FirstOverrideKeys">
Dine bevælgelsestaster bliver nu håndteret af et objekt.
Brug piletasterne eller AWSD for at se, hvad de gør.
Nogle genstande (som skydevåben) kræver at du går ind i musevisning for at bruge dem.
Tryk på 'M' for at gåre det.
- </notification>
- <notification name="FirstAppearance">
- Du redigerer dit udseende.
-Benyt piletasterne til at se rundt.
-Når du er færdig, tryk på 'Gem alt'.
- </notification>
- <notification name="FirstInventory">
- Dette er din beholdning, som indeholder de genstande du ejer.
-
-* For at tage noget på, træk det over på dig selv.
-* For at 'rezze' noget, træk det over på jorden.
-* For at læse en note, dobbelt-klik på den.
</notification>
<notification name="FirstSandbox">
Dette er et sandkasse område. Her kan beboere lære ast bygge.
De ting du bygger vil blive slettet senere, så glem ikke at højre-klikke og vælge "Tag" for at tage en kopi af din kreation til din beholdning.
</notification>
- <notification name="FirstFlexible">
- Dette objekt er fleksibelt/blødt. Sådanne objekter skal være 'uden masse' og ikke fysiske.
- </notification>
- <notification name="FirstDebugMenus">
- Du har åbnet menuen 'Avanceret'.
-
-For at slå denne menu fra og til,
- Windows: Ctrl+Alt+D
- Mac: ⌥⌘D
- </notification>
- <notification name="FirstSculptedPrim">
- Du redigerer en 'Sculpted prim'. Sådanne objekter kræver en speciel tekstur for at definere faconen.
- </notification>
<notification name="MaxListSelectMessage">
Du må kun vælge op til [MAX_SELECT] genstande på denne liste.
</notification>
@@ -1408,6 +1405,10 @@ De vil blive blokeret nogle få sekunder af sikkerhedsmæssige årsager.
<button name="respondbutton" text="Svar"/>
</form>
</notification>
+ <notification name="ConfirmCloseAll">
+ Er du sikker på at du vil lukke alle personlige samtaler (IM)?
+ <usetemplate name="okcancelignore" notext="Annullér" yestext="OK"/>
+ </notification>
<notification name="AttachmentSaved">
Vedhæng er blevet gemt.
</notification>
diff --git a/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml
index ab2e7a6e31e464cba4b22578a3f6a915fa3d1e75..1953fad31fa2750d75acb6948d5649ea2025b627 100644
--- a/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_im_control_panel">
- <panel name="panel_call_buttons">
- <button label="Opkald" name="call_btn"/>
- <button label="Forlad samtale" name="end_call_btn"/>
- <button label="Stemmekontroller" name="voice_ctrls_btn"/>
- </panel>
+ <layout_stack name="vertical_stack">
+ <layout_panel name="call_btn_panel">
+ <button label="Opkald" name="call_btn"/>
+ </layout_panel>
+ <layout_panel name="end_call_btn_panel">
+ <button label="Forlad opkald" name="end_call_btn"/>
+ </layout_panel>
+ <layout_panel name="voice_ctrls_btn_panel">
+ <button label="Stemmekontroller" name="voice_ctrls_btn"/>
+ </layout_panel>
+ </layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml
index a9d5ba73acf40482a120626072d2635abfdb3766..56332c00e614871e20c9ef59c1266704e9543ceb 100644
--- a/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml
@@ -22,4 +22,5 @@
[COUNT]Ã¥
</string>
<text name="avatar_name" value="Ukendt"/>
+ <button name="profile_btn" tool_tip="Vis profil"/>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml
index 986a4131de397f5133c731becdb3a5b956498947..4f5041ad543619be288fcaefd18ca4d0a1e44fac 100644
--- a/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="block_list_panel">
<text name="title_text">
- Blokérede avatarer
+ Blokerede
</text>
- <scroll_list name="blocked" tool_tip="Vis liste over blokerede avatarer"/>
+ <scroll_list name="blocked" tool_tip="Liste med beboerer der p.t. er blokeret"/>
<button label="Blokér beboer..." label_selected="Blokér beboer..." name="Block resident..." tool_tip="Vælg en beboer der skal blokeres"/>
<button label="Blokér objekt via navn..." label_selected="Blokér objekt via navn..." name="Block object by name..."/>
- <button label="Fjern blokering" label_selected="Fjern blokering" name="Unblock" tool_tip="Fjern beboer fra liste med blokeringer"/>
+ <button label="Fjern blokering" label_selected="Fjern blokering" name="Unblock" tool_tip="Fjerm en beboer fra blokeringslisten"/>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray.xml b/indra/newview/skins/default/xui/da/panel_bottomtray.xml
index 2085840bb5923b133d191dced05e5f334a2c169c..4a038e89ba8ea4861e5773e1310faf339a15ad3d 100644
--- a/indra/newview/skins/default/xui/da/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/da/panel_bottomtray.xml
@@ -7,8 +7,13 @@
Skjuler/viser stemme kontrol panel
</string>
<layout_stack name="toolbar_stack">
+ <layout_panel name="speak_panel">
+ <talk_button name="talk">
+ <speak_button label="Tal" label_selected="Tal" name="speak_btn"/>
+ </talk_button>
+ </layout_panel>
<layout_panel name="gesture_panel">
- <gesture_combo_box label="Bevægelse" name="Gesture" tool_tip="Skjuler/viser bevægelser"/>
+ <gesture_combo_list label="Bevægelse" name="Gesture" tool_tip="Skjuler/viser bevægelser"/>
</layout_panel>
<layout_panel name="movement_panel">
<button label="Flyt" name="movement_btn" tool_tip="Vis/skjul bevægelseskontroller"/>
@@ -19,5 +24,15 @@
<layout_panel name="snapshot_panel">
<button label="" name="snapshots" tool_tip="Tag foto"/>
</layout_panel>
+ <layout_panel name="im_well_panel">
+ <chiclet_im_well name="im_well">
+ <button name="Unread IM messages" tool_tip="Konversationer"/>
+ </chiclet_im_well>
+ </layout_panel>
+ <layout_panel name="notification_well_panel">
+ <chiclet_notification name="notification_well">
+ <button name="Unread" tool_tip="Notifikationer"/>
+ </chiclet_notification>
+ </layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bd31253ca42579ff5aa2232ccaaa316c637bd558
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="bottom_tray_lite">
+ <layout_stack name="toolbar_stack_lite">
+ <layout_panel name="gesture_panel">
+ <gesture_combo_list label="Bevægelse" name="Gesture" tool_tip="Vis/skjul bevægelser"/>
+ </layout_panel>
+ </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_classified_info.xml b/indra/newview/skins/default/xui/da/panel_classified_info.xml
index a9cce7bf4533203591704b39a3584496f656773b..6eba024981975c0abdeef25f8a022b15dd9a1864 100644
--- a/indra/newview/skins/default/xui/da/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/da/panel_classified_info.xml
@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_classified_info">
+ <panel.string name="l$_price">
+ L$[PRICE]
+ </panel.string>
<text name="title" value="Annonce info"/>
<scroll_container name="profile_scroll">
<panel name="scroll_content_panel">
- <text name="classified_name" value="[name]"/>
- <text name="classified_location" value="[loading...]"/>
- <text name="content_type" value="[content type]"/>
- <text name="category" value="[category]"/>
+ <text_editor name="classified_name" value="[name]"/>
+ <text_editor name="classified_location" value="[loading...]"/>
+ <text_editor name="content_type" value="[content type]"/>
+ <text_editor name="category" value="[category]"/>
<check_box label="Forny automatisk hver uge" name="auto_renew"/>
- <text name="price_for_listing" tool_tip="Pris for optagelse.">
- L$[PRICE]
- </text>
- <text name="classified_desc" value="[description]"/>
+ <text_editor name="price_for_listing" tool_tip="Pris for optagelse."/>
+ <text_editor name="classified_desc" value="[description]"/>
</panel>
</scroll_container>
<panel name="buttons">
diff --git a/indra/newview/skins/default/xui/da/panel_edit_profile.xml b/indra/newview/skins/default/xui/da/panel_edit_profile.xml
index d3cfdbba52f5501c892fb35a18588af13352f9d2..85461e23a7945af04e503adff9e802d2b7c2d8ad 100644
--- a/indra/newview/skins/default/xui/da/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_profile.xml
@@ -35,9 +35,12 @@
</text>
<check_box label="Vis mig i søgeresultater" name="show_in_search_checkbox"/>
<text name="title_acc_status_text" value="Min konto:"/>
+ <text_editor name="acc_status_text" value="Beboer. Ingen betalingsinfo."/>
<text name="my_account_link" value="[[URL] Go to My Dashboard]"/>
- <text name="acc_status_text" value="Beboer. Ingen betalingsinfo."/>
<text name="title_partner_text" value="Min partner:"/>
+ <panel name="partner_data_panel">
+ <name_box initial_value="(henter)" name="partner_text"/>
+ </panel>
<text name="partner_edit_link" value="[[URL] Edit]"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_friends.xml b/indra/newview/skins/default/xui/da/panel_friends.xml
index a41eaf20c19e750007204593101e44e1e3e45e1c..a1a25bdc77533006b4c786c741f8ab5c8c7fa878 100644
--- a/indra/newview/skins/default/xui/da/panel_friends.xml
+++ b/indra/newview/skins/default/xui/da/panel_friends.xml
@@ -16,5 +16,5 @@
<button label="Teleport" name="offer_teleport_btn" tool_tip="Tilbyd denne ven at blive teleporteret til din nuværende position"/>
<button label="Betal" name="pay_btn" tool_tip="Giv Linden dollars (L$) til denne ven"/>
<button label="Fjern" name="remove_btn" tool_tip="Fjern denne beboer fra din venneliste"/>
- <button label="Tilføj" name="add_btn" tool_tip="Tilbyd venskab til denne beboer"/>
+ <button label="Tilføj" name="add_btn" tool_tip="Tilbyd venskab til en beboer"/>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_control_panel.xml b/indra/newview/skins/default/xui/da/panel_group_control_panel.xml
index 1db2db45af285dec62cd31f897baf6e4f01bb3c7..26fe4f6ebe0184fe87d626dfc9ac7beb0d503fba 100644
--- a/indra/newview/skins/default/xui/da/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_control_panel.xml
@@ -1,9 +1,17 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_im_control_panel">
- <button label="Group Profile" name="group_info_btn"/>
- <panel name="panel_call_buttons">
- <button label="Opkaldsgruppe" name="call_btn"/>
- <button label="Forlad samtale" name="end_call_btn"/>
- <button label="Kontroller for åben stemmechat" name="voice_ctrls_btn"/>
- </panel>
+ <layout_stack name="vertical_stack">
+ <layout_panel name="group_info_btn_panel">
+ <button label="Gruppe profil" name="group_info_btn"/>
+ </layout_panel>
+ <layout_panel name="call_btn_panel">
+ <button label="Opkald gruppe" name="call_btn"/>
+ </layout_panel>
+ <layout_panel name="end_call_btn_panel">
+ <button label="Forlad opkald" name="end_call_btn"/>
+ </layout_panel>
+ <layout_panel name="voice_ctrls_btn_panel">
+ <button label="Ã…ben stemmekontroller" name="voice_ctrls_btn"/>
+ </layout_panel>
+ </layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_general.xml b/indra/newview/skins/default/xui/da/panel_group_general.xml
index ec957e60942134e121d39f1d81f5531ba5c35ebb..becb5ab70ac41d1243d028bac44f9be99bd9e230 100644
--- a/indra/newview/skins/default/xui/da/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_general.xml
@@ -9,20 +9,38 @@
<panel.string name="incomplete_member_data_str">
Henter medlemsinformationer
</panel.string>
+ <panel name="group_info_top">
+ <texture_picker label="" name="insignia" tool_tip="Klik for at vælge et billede"/>
+ <text name="prepend_founded_by">
+ Grundlagt af:
+ </text>
+ <name_box initial_value="(henter)" name="founder_name"/>
+ <text name="join_cost_text">
+ Gratis
+ </text>
+ <button label="TILMELD NU!" name="btn_join"/>
+ </panel>
<text_editor name="charter">
Gruppens formål
</text_editor>
<name_list name="visible_members">
<name_list.columns label="Medlem" name="name"/>
<name_list.columns label="Titel" name="title"/>
+ <name_list.columns label="Status" name="status"/>
</name_list>
+ <text name="my_group_settngs_label">
+ MeMig
+ </text>
<text name="active_title_label">
- Min titel
+ Min titel:
</text>
<combo_box name="active_title" tool_tip="Angiver den titel der vises i din avatars navnefelt, når denne gruppe er aktiv"/>
<check_box label="Modtag gruppeinformationer" name="receive_notices" tool_tip="Angiver om du vil modtage informationer fra denne gruppe. Fjern markeringen i boksen hvis gruppen spammer dig."/>
<check_box label="Vis gruppen i min profil" name="list_groups_in_profile" tool_tip="Angiver om du vil vise denne gruppe i dine profilinformationer"/>
<panel name="preferences_container">
+ <text name="group_settngs_label">
+ Gruppe
+ </text>
<check_box label="Ã…ben tilmelding" name="open_enrollement" tool_tip="Angiver om denne gruppe tillader nye medlemmer at tilmelde sig, uden de er inviteret."/>
<check_box label="Tilmeldingsgebyr" name="check_enrollment_fee" tool_tip="Angiver om der kræves et gebyr, for at tilmelde sig gruppen"/>
<spinner label="L$" left_delta="130" name="spin_enrollment_fee" tool_tip="Nye medlemmer skal betale dette gebyr for at tilmelde sig gruppen, når "Tilmeldingsgebyr" er valgt." width="60"/>
diff --git a/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml
index 9940ebbd4db88c07a515b01c4c8c4dc1afcef1c4..a7aa8424391bb170b51163a2080612ae84e6c771 100644
--- a/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Gruppe info" name="GroupInfo">
+<panel label="Gruppe profil" name="GroupInfo">
<panel.string name="default_needs_apply_text">
- Der er ændringer på denne fane der ikke er gemt
+ Der er ændringer der ikke er gemt
</panel.string>
<panel.string name="want_apply_text">
Ønsker du at gemme disse ændringer?
@@ -12,25 +12,24 @@
<panel.string name="group_join_free">
Gratis
</panel.string>
- <text name="group_name" value="(Henter...)"/>
- <line_editor label="Indtast dit nye gruppenavn her" name="group_name_editor"/>
- <texture_picker label="" name="insignia" tool_tip="Klik for at vælge bilede"/>
- <text name="prepend_founded_by">
- Grundlægger:
- </text>
- <name_box initial_value="(finder)" name="founder_name"/>
- <text name="join_cost_text">
- Gratis
- </text>
- <button label="MELD IND NU!" name="btn_join"/>
- <accordion name="groups_accordion">
- <accordion_tab name="group_general_tab" title="Generelt"/>
- <accordion_tab name="group_roles_tab" title="Roller"/>
- <accordion_tab name="group_notices_tab" title="Beskeder"/>
- <accordion_tab name="group_land_tab" title="Land/Aktiver"/>
- </accordion>
- <panel name="button_row">
- <button label="Lav" label_selected="Ny gruppe" name="btn_create"/>
- <button label="Gem" label_selected="Gem" name="btn_apply"/>
+ <panel name="group_info_top">
+ <text name="group_name" value="(Henter...)"/>
+ <line_editor label="Indtast nyt gruppenavn her" name="group_name_editor"/>
</panel>
+ <layout_stack name="layout">
+ <layout_panel name="group_accordions">
+ <accordion name="groups_accordion">
+ <accordion_tab name="group_general_tab" title="Generelt"/>
+ <accordion_tab name="group_roles_tab" title="Roller"/>
+ <accordion_tab name="group_notices_tab" title="Noter"/>
+ <accordion_tab name="group_land_tab" title="Land/Aktiver"/>
+ </accordion>
+ </layout_panel>
+ <layout_panel name="button_row">
+ <button label="Chat" name="btn_chat"/>
+ <button label="Gruppeopkald" name="btn_call" tool_tip="Opkald til denne gruppe"/>
+ <button label="Gem" label_selected="Save" name="btn_apply"/>
+ <button label="Opret gruppe" name="btn_create" tool_tip="Opret en ny gruppe"/>
+ </layout_panel>
+ </layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_invite.xml b/indra/newview/skins/default/xui/da/panel_group_invite.xml
index 1e00642c295012b9768cb7dcf8addb49247b50c5..49daf6c9f23bf3d61e5816d3731366cafcc5710d 100644
--- a/indra/newview/skins/default/xui/da/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_invite.xml
@@ -7,17 +7,14 @@
(indlæser...)
</panel.string>
<panel.string name="already_in_group">
- Nogen af avatarerne var allerede i gruppen og blev ikke inviteret
+ Nogle af de beboere du vælger er allerede i gruppen, så de får ikke tilsendt en invitation.
</panel.string>
<text name="help_text">
- Du kan invitere flere beboere ad
-gangen til at blive medlem af din
-gruppe. Klik 'Åben personvælger' for
-at begynde.
+ Du kan invitere flere beboere ad gangen til at blive medlem af din gruppe. Klik 'Åben personvælger' for at begynde.
</text>
<button bottom_delta="-30" label="Åben personvælger" name="add_button"/>
- <name_list name="invitee_list" tool_tip="Hold Ctrl knappen nede og klik på beboer navne for at vælge flere"/>
- <button label="Fjern valgte fra listen" name="remove_button" tool_tip="Fjern beboere valgt ovenfor fra invitationslisten"/>
+ <name_list name="invitee_list" tool_tip="Hold Ctrl-tasten nede og klik på beboere for at vælge flere."/>
+ <button label="Fjern valgte fra listen" name="remove_button" tool_tip="Fjerner beboere, der er valgt på ovenstående invitationsliste."/>
<text name="role_text">
Vælg hvilken rolle, du vil tildele dem:
</text>
diff --git a/indra/newview/skins/default/xui/da/panel_group_land_money.xml b/indra/newview/skins/default/xui/da/panel_group_land_money.xml
index c73d7c807d3c0da8e55458c22cfa4c736cda1696..9b0267529ca41a5a3dfbf2736a0fe8347c90d9b7 100644
--- a/indra/newview/skins/default/xui/da/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_land_money.xml
@@ -1,65 +1,62 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Land & L$" name="land_money_tab">
- <string name="help_text">
+ <panel.string name="help_text">
En advarsel vises indtil Total land i brug er mindre end eller lig med det totale bidrag.
- </string>
- <button label="?" name="help_button"/>
- <string name="cant_view_group_land_text">
+ </panel.string>
+ <panel.string name="cant_view_group_land_text">
Du har ikke tilladelse til at se gruppeejet land.
- </string>
- <string name="cant_view_group_accounting_text">
+ </panel.string>
+ <panel.string name="cant_view_group_accounting_text">
Du har ikke tilladelse til at se gruppens økonomiinformationer.
- </string>
- <string name="loading_txt">
+ </panel.string>
+ <panel.string name="loading_txt">
Indlæser...
- </string>
- <text name="group_land_heading">
- Gruppeejet land
- </text>
- <scroll_list name="group_parcel_list">
- <column label="Parcel" name="name"/>
- <column label="Region" name="location"/>
- <column label="Type" name="type"/>
- <column label="Område" name="area"/>
- <column label="" name="hidden"/>
- </scroll_list>
- <button label="Kort" label_selected="Kort" name="map_button"/>
- <text name="total_contributed_land_label">
- Totalt bidrag:
- </text>
- <text name="total_contributed_land_value">
- [AREA] m²
- </text>
- <text name="total_land_in_use_label">
- Totalt land i brug:
- </text>
- <text name="total_land_in_use_value">
- [AREA] m²
- </text>
- <text name="land_available_label">
- Ledigt land:
- </text>
- <text name="land_available_value">
- [AREA] m²
- </text>
- <text name="your_contribution_label">
- Dit bidrag:
- </text>
- <string name="land_contrib_error">
+ </panel.string>
+ <panel.string name="land_contrib_error">
Ikke muligt at lave dit bidrag til landet
- </string>
- <text name="your_contribution_units">
- m²
- </text>
- <text name="your_contribution_max_value">
- ([AMOUNT] maks.)
- </text>
- <text name="group_over_limit_text">
- Gruppemedlemmer må bidrag med mere, for at understøtte med det land der bliver brugt
- </text>
- <text name="group_money_heading">
- Gruppe L$
- </text>
+ </panel.string>
+ <panel name="layout_panel_landmoney">
+ <scroll_list name="group_parcel_list">
+ <scroll_list.columns label="Parcel" name="name"/>
+ <scroll_list.columns label="Region" name="location"/>
+ <scroll_list.columns label="Type" name="type"/>
+ <scroll_list.columns label="Areal" name="area"/>
+ </scroll_list>
+ <text name="total_contributed_land_label">
+ Totalt bidrag:
+ </text>
+ <text name="total_contributed_land_value">
+ [AREA] m²
+ </text>
+ <button label="Kort" label_selected="Kort" name="map_button"/>
+ <text name="total_land_in_use_label">
+ Totalt land i brug:
+ </text>
+ <text name="total_land_in_use_value">
+ [AREA] m²
+ </text>
+ <text name="land_available_label">
+ Land tilgængelgt:
+ </text>
+ <text name="land_available_value">
+ [AREA] m²
+ </text>
+ <text name="your_contribution_label">
+ Dit bidrag:
+ </text>
+ <text name="your_contribution_units">
+ m²
+ </text>
+ <text name="your_contribution_max_value">
+ ([BELØB] maks.)
+ </text>
+ <text name="group_over_limit_text">
+ Der kræves flere penge for at supportere det land der er i brug
+ </text>
+ <text name="group_money_heading">
+ Gruppe L$
+ </text>
+ </panel>
<tab_container name="group_money_tab_container">
<panel label="PLANLÆGNING" name="group_money_planning_tab">
<text_editor name="group_money_planning_text">
diff --git a/indra/newview/skins/default/xui/da/panel_group_list_item.xml b/indra/newview/skins/default/xui/da/panel_group_list_item.xml
index bfffdccc5e1f1ffc01eab85ee51ff4ee51368477..e77e5483406f5111cd06b03d94f382c06462db85 100644
--- a/indra/newview/skins/default/xui/da/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_list_item.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="group_list_item">
<text name="group_name" value="Ukendt"/>
+ <button name="profile_btn" tool_tip="Se profil"/>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_notices.xml b/indra/newview/skins/default/xui/da/panel_group_notices.xml
index ec503c37dcaa3f37e3c065c685e068f5d87b64c9..7046ac4d7c2816666a104d76831f3df1d27b6079 100644
--- a/indra/newview/skins/default/xui/da/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_notices.xml
@@ -42,7 +42,7 @@ Maksimum er 200 pr. gruppe pr. dag
<text name="string">
Træk og slip en gensand for at vedhæfte den:
</text>
- <button label="Fjern" label_selected="Fjern bilag" name="remove_attachment"/>
+ <button label="Fjern" label_selected="Fjern bilag" name="remove_attachment" tool_tip="Fjern vedhæng fra din note"/>
<button label="Send" label_selected="Send" name="send_notice"/>
<group_drop_target name="drop_target" tool_tip="Træk en genstand fra din beholdning til dette felt for at sende den med denne besked. Du skal have rettigheder til at kopiere og overdrage denne genstand for at kunne vedhæfte den."/>
</panel>
@@ -59,6 +59,6 @@ Maksimum er 200 pr. gruppe pr. dag
<text name="lbl4">
Besked:
</text>
- <button label="Ã…ben bilag" label_selected="Ã¥ben bilag" name="open_attachment"/>
+ <button label="Åben vedhæng" label_selected="åben bilag" name="open_attachment"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_notify.xml b/indra/newview/skins/default/xui/da/panel_group_notify.xml
index 43a84298e25d6a758432d97dbd93cadf662d3b9b..8a684ca031fef23e48fead32e5a3030f854ce83f 100644
--- a/indra/newview/skins/default/xui/da/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_notify.xml
@@ -4,5 +4,5 @@
<text name="title" value="Afsender navn / Gruppe navn"/>
</panel>
<text name="attachment" value="Bilag"/>
- <button label="Ok" name="btn_ok"/>
+ <button label="OK" name="btn_ok"/>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_group_roles.xml b/indra/newview/skins/default/xui/da/panel_group_roles.xml
index 74bea831fb886ebb3608bc7c0162e9e2a01e496c..3ab3dd8bf8f0ac6be529b5cb40f4aa8afcef4f95 100644
--- a/indra/newview/skins/default/xui/da/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_roles.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Medlemmer & roller" name="roles_tab">
<panel.string name="default_needs_apply_text">
- Der er ændringer her, der ikke er gemt.
+ Der er ændringer som ikke er gemt
</panel.string>
<panel.string name="want_apply_text">
Vil du gemme disse ændringer?
@@ -58,7 +58,7 @@ ting i denne gruppe. Der er en bred vifte af rettigheder.
</tab_container>
<panel name="members_footer">
<text name="static">
- Medlemmer
+ Tildelte roller
</text>
<scroll_list name="member_assigned_roles">
<scroll_list.columns label="" name="checkbox"/>
diff --git a/indra/newview/skins/default/xui/da/panel_im_control_panel.xml b/indra/newview/skins/default/xui/da/panel_im_control_panel.xml
index 0384652e5d09386c1315f3bd998b061ede3ae9b0..1ba6b8b97f5ddf583975a1b684b2dc328c4e5446 100644
--- a/indra/newview/skins/default/xui/da/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/da/panel_im_control_panel.xml
@@ -1,13 +1,29 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_im_control_panel">
- <text name="avatar_name" value="Ukendt"/>
- <button label="Profil" name="view_profile_btn"/>
- <button label="Tilføj ven" name="add_friend_btn"/>
- <button label="Teleportér" name="teleport_btn"/>
- <button label="Del" name="share_btn"/>
- <panel name="panel_call_buttons">
- <button label="Opkald" name="call_btn"/>
- <button label="Læg på" name="end_call_btn"/>
- <button label="Stemme opsætning" name="voice_ctrls_btn"/>
- </panel>
+ <layout_stack name="button_stack">
+ <layout_panel name="view_profile_btn_panel">
+ <button label="Profil" name="view_profile_btn"/>
+ </layout_panel>
+ <layout_panel name="add_friend_btn_panel">
+ <button label="Tilføj ven" name="add_friend_btn"/>
+ </layout_panel>
+ <layout_panel name="teleport_btn_panel">
+ <button label="Teleport" name="teleport_btn" tool_tip="Tilbyd teleport til denne person"/>
+ </layout_panel>
+ <layout_panel name="share_btn_panel">
+ <button label="Del" name="share_btn"/>
+ </layout_panel>
+ <layout_panel name="share_btn_panel">
+ <button label="Betal" name="pay_btn"/>
+ </layout_panel>
+ <layout_panel name="call_btn_panel">
+ <button label="Opkald" name="call_btn"/>
+ </layout_panel>
+ <layout_panel name="end_call_btn_panel">
+ <button label="Forlad opkald" name="end_call_btn"/>
+ </layout_panel>
+ <layout_panel name="voice_ctrls_btn_panel">
+ <button label="Stemme kontroller" name="voice_ctrls_btn"/>
+ </layout_panel>
+ </layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_landmark_info.xml b/indra/newview/skins/default/xui/da/panel_landmark_info.xml
index 202a4d46645a0278a49567b53c0b0885d4cc7639..8503a4176397f986445fe0195525162dc03f6db6 100644
--- a/indra/newview/skins/default/xui/da/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/da/panel_landmark_info.xml
@@ -18,6 +18,7 @@
<string name="acquired_date">
[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
</string>
+ <button name="back_btn" tool_tip="Tilbage"/>
<text name="title" value="Sted profil"/>
<scroll_container name="place_scroll">
<panel name="scrolling_panel">
diff --git a/indra/newview/skins/default/xui/da/panel_landmarks.xml b/indra/newview/skins/default/xui/da/panel_landmarks.xml
index 47487832cbbaa4303a52642e454bfb97f6a4fbc7..8adce2c819ab9ae5e1024d087ad79f623aebeebb 100644
--- a/indra/newview/skins/default/xui/da/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/da/panel_landmarks.xml
@@ -2,7 +2,7 @@
<panel name="Landmarks">
<accordion name="landmarks_accordion">
<accordion_tab name="tab_favorites" title="Favorites bjælke"/>
- <accordion_tab name="tab_landmarks" title="Landemærker"/>
+ <accordion_tab name="tab_landmarks" title="Mine landmærker"/>
<accordion_tab name="tab_inventory" title="Min beholdning"/>
<accordion_tab name="tab_library" title="Bibliotek"/>
</accordion>
diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml
index c8c275d84d0c80bece05067a6b0ba16abd754bdf..9276ff3a0968d261f3972916df78bdfc4e4d47e8 100644
--- a/indra/newview/skins/default/xui/da/panel_login.xml
+++ b/indra/newview/skins/default/xui/da/panel_login.xml
@@ -13,7 +13,7 @@
</text>
<line_editor label="Fornavn" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/>
<line_editor label="Efternavn" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/>
- <check_box label="Husk" name="remember_check"/>
+ <check_box label="Husk password" name="remember_check"/>
<text name="start_location_text">
Start ved:
</text>
diff --git a/indra/newview/skins/default/xui/da/panel_me.xml b/indra/newview/skins/default/xui/da/panel_me.xml
index 2cfd358d13569b8bb3b221d2784b2b97f51adf20..f98ced5f914cf22573528e50f1f2eae3549ad51e 100644
--- a/indra/newview/skins/default/xui/da/panel_me.xml
+++ b/indra/newview/skins/default/xui/da/panel_me.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Min profil" name="panel_me">
<tab_container name="tabs">
- <panel label="PROFIL" name="panel_profile"/>
- <panel label="FAVORITTER" name="panel_picks"/>
+ <panel label="MIN PROFIL" name="panel_profile"/>
+ <panel label="MINE FAVORITTER" name="panel_picks"/>
</tab_container>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_general.xml b/indra/newview/skins/default/xui/da/panel_media_settings_general.xml
index 7f1581888dc0c01b7d189673b324ed4d27081470..48f08b9dfdbd66740cf51e1bf87e2c243abb98c8 100644
--- a/indra/newview/skins/default/xui/da/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/da/panel_media_settings_general.xml
@@ -4,16 +4,16 @@
Hjemmeside:
</text>
<text name="home_fails_whitelist_label">
- (Denne side optræder ikke i godkendte sider)
+ (Siden er ikke på listen med godkendte sider)
</text>
- <line_editor name="home_url" tool_tip="Hjemmesiden for kilden til dette media"/>
+ <line_editor name="home_url" tool_tip="Hjemmesiden for kilden til dette medie"/>
<text name="preview_label">
Vis
</text>
<text name="current_url_label">
Nuværende side:
</text>
- <text name="current_url" tool_tip="Den nuværende hjemmeside for kilden til dette media" value=""/>
+ <text name="current_url" tool_tip="Nuværende side for kilden til dett medie" value=""/>
<button label="Nulstil" name="current_url_reset_btn"/>
<check_box initial_value="false" label="Gentag afspil" name="auto_loop"/>
<check_box initial_value="false" label="Første klik medfører interaktion" name="first_click_interact"/>
diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_security.xml b/indra/newview/skins/default/xui/da/panel_media_settings_security.xml
index ee341f91429d5f80bf603af13439c21cfc5fddd5..278fe0eeea2728929ad9306be338ac0037ea255e 100644
--- a/indra/newview/skins/default/xui/da/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/da/panel_media_settings_security.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Sikkerhed" name="Media Settings Security">
- <check_box initial_value="false" label="Tillad kun adgang til specifikke URL'er (via "prefix")" name="whitelist_enable"/>
+ <check_box initial_value="false" label="Tillad kun adgang til angivne URL mønstre" name="whitelist_enable"/>
<text name="home_url_fails_some_items_in_whitelist">
- Opslag som hjemmesiden fejler ved er markeret:
+ Angivelser som hjemmesiden fejler imod er markeret:
</text>
<button label="Tilføj" name="whitelist_add"/>
<button label="Slet" name="whitelist_del"/>
<text name="home_url_fails_whitelist">
- Advarsel: Hjemmesiden angive i "Generelt" fanen er ikke indeholdt i godkendte sider. Den er slået fra, indtil en gyldig værdi er tilføjet.
+ Advarsel: hjemmesiden specificeret i Generelt fanen opfylder ikke krav på listen med godkendte URL. Den er de-aktiveret indtil en gyldig hjemmeside er tilføjet.
</text>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_my_profile.xml b/indra/newview/skins/default/xui/da/panel_my_profile.xml
index 1dffc7323960af3fcd523f2452870fabcb65be69..7eb3c9f4e5dbecc65cf82d600d16694596b7de5c 100644
--- a/indra/newview/skins/default/xui/da/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/da/panel_my_profile.xml
@@ -1,37 +1,35 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Profil" name="panel_profile">
<string name="no_partner_text" value="Ingen"/>
+ <string name="no_group_text" value="Ingen"/>
<string name="RegisterDateFormat">
[REG_DATE] ([AGE])
</string>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="second_life_image_panel">
- <icon label="" name="2nd_life_edit_icon" tool_tip="Klik på Rediger Profil knappen nedenfor for at ændre billede"/>
- </panel>
- <panel name="first_life_image_panel">
- <icon label="" name="real_world_edit_icon" tool_tip="Klik på Rediger Profil knappen nedenfor for at ændre billede"/>
- <text name="title_rw_descr_text" value="RL:"/>
- </panel>
- <text name="me_homepage_text">
- Web:
- </text>
- <text name="title_member_text" value="Medlem siden:"/>
- <text name="title_acc_status_text" value="Konto:"/>
- <text name="acc_status_text" value="Beboer. Ingen betalingsinfo"/>
- <text name="title_partner_text" value="Partner:"/>
- <text name="title_groups_text" value="Grupper:"/>
- </panel>
- </scroll_container>
- <panel name="profile_buttons_panel">
- <button label="Tilføj ven" name="add_friend"/>
- <button label="IM" name="im"/>
- <button label="Opkald" name="call"/>
- <button label="Kort" name="show_on_map_btn"/>
- <button label="Teleportér" name="teleport"/>
- </panel>
- <panel name="profile_me_buttons_panel">
- <button label="Rediger profil" name="edit_profile_btn" tool_tip="Redigér personlig information"/>
- <button label="Ændre udseende" name="edit_appearance_btn" tool_tip="Ændre dit udseende: fysiske data, tøj m.v."/>
- </panel>
+ <layout_stack name="layout">
+ <layout_panel name="profile_stack">
+ <scroll_container name="profile_scroll">
+ <panel name="scroll_content_panel">
+ <panel name="second_life_image_panel">
+ <icon label="" name="2nd_life_edit_icon" tool_tip="Klik på Redigér profil knappen forneden for at ændre billede"/>
+ <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
+ </panel>
+ <panel name="first_life_image_panel">
+ <icon label="" name="real_world_edit_icon" tool_tip="Klik på Redigér profil knappen forneden for at ændre billede"/>
+ <text name="title_rw_descr_text" value="Real World:"/>
+ </panel>
+ <text name="title_member_text" value="Beboer siden:"/>
+ <text name="title_acc_status_text" value="Konto status:"/>
+ <text name="title_partner_text" value="Partner:"/>
+ <panel name="partner_data_panel">
+ <name_box initial_value="(henter)" name="partner_text"/>
+ </panel>
+ <text name="title_groups_text" value="Grupper:"/>
+ </panel>
+ </scroll_container>
+ </layout_panel>
+ <layout_panel name="profile_me_buttons_panel">
+ <button label="Redigér profil" name="edit_profile_btn" tool_tip="Redigér din personlige information"/>
+ <button label="Rediger udseende" name="edit_appearance_btn" tool_tip="Opret/tilret dit udseende: fysiske data, tøj m.v."/>
+ </layout_panel>
+ </layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_navigation_bar.xml b/indra/newview/skins/default/xui/da/panel_navigation_bar.xml
index 465bc75a1bf15878b719593461c0b63fe656de52..79f7e81b3561af4f05dd698555f7bc3450cbd852 100644
--- a/indra/newview/skins/default/xui/da/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/da/panel_navigation_bar.xml
@@ -1,15 +1,18 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="navigation_bar">
<panel name="navigation_panel">
- <button name="back_btn" tool_tip="GÃ¥ tilbage til min forrige lokation"/>
- <button name="forward_btn" tool_tip="GÃ¥ en lokation fremad"/>
+ <pull_button name="back_btn" tool_tip="GÃ¥ tilbage til min forrige lokation"/>
+ <pull_button name="forward_btn" tool_tip="GÃ¥ en lokation fremad"/>
<button name="home_btn" tool_tip="Teleport til min hjemme lokation"/>
<location_input label="Lokation" name="location_combo"/>
<search_combo_box label="Søg" name="search_combo_box" tool_tip="Søg">
<combo_editor label="Søg [SECOND_LIFE]" name="search_combo_editor"/>
</search_combo_box>
</panel>
- <favorites_bar name="favorite">
+ <favorites_bar name="favorite" tool_tip="Træk landemærker hertil for at få hurtig adgang til dine favoritsteder i Second Life!">
+ <label name="favorites_bar_label" tool_tip="Træk landemærker hertil for at få hurtig adgang til dine favoritsteder i Second Life!">
+ Favorit bar
+ </label>
<chevron_button name=">>" tool_tip="Søg mere af mine favoritter"/>
</favorites_bar>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_nearby_media.xml b/indra/newview/skins/default/xui/da/panel_nearby_media.xml
new file mode 100644
index 0000000000000000000000000000000000000000..32905a2deb50024e59e989b02b63e557028945a0
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_nearby_media.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="nearby_media">
+ <string name="empty_item_text">
+ <tom>
+ </string>
+ <string name="parcel_media_name">
+ Streaming Media dette sted
+ </string>
+ <string name="parcel_audio_name">
+ Streaming Audio dette sted
+ </string>
+ <string name="playing_suffix">
+ (afspilles)
+ </string>
+ <panel name="minimized_controls">
+ <button label="Stop alt" name="all_nearby_media_disable_btn" tool_tip="Stop al media tæt på"/>
+ <button label="Start alt" name="all_nearby_media_enable_btn" tool_tip="Tænd al media tæt på"/>
+ <button name="open_prefs_btn" tool_tip="Vis media preferencer"/>
+ <button label="Mere >>" label_selected="Mindre <<" name="more_less_btn" tool_tip="Avanceret opsætning"/>
+ </panel>
+ <panel name="nearby_media_panel">
+ <combo_box name="show_combo">
+ <combo_box.item label="Overalt" name="All"/>
+ <combo_box.item label="PÃ¥ dette sted" name="WithinParcel"/>
+ <combo_box.item label="Udenfor dette sted" name="OutsideParcel"/>
+ </combo_box>
+ <scroll_list name="media_list">
+ <scroll_list.columns label="I nærheden" name="media_proximity"/>
+ <scroll_list.columns label="Synligt" name="media_visibility"/>
+ <scroll_list.columns label="Klasse" name="media_class"/>
+ <scroll_list.columns label="Navn" name="media_name"/>
+ <scroll_list.columns label="Debug" name="media_debug"/>
+ </scroll_list>
+ <panel>
+ <layout_stack name="media_controls">
+ <layout_panel name="stop">
+ <button name="stop_btn" tool_tip="Stop valgte medie"/>
+ </layout_panel>
+ <layout_panel name="play">
+ <button name="play_btn" tool_tip="Afspil valgte medie"/>
+ </layout_panel>
+ <layout_panel name="pause">
+ <button name="pause_btn" tool_tip="Pause valgte medie"/>
+ </layout_panel>
+ <layout_panel name="volume_slider_ctrl">
+ <slider_bar initial_value="0.5" name="volume_slider" tool_tip="Volumen for valgte medie"/>
+ </layout_panel>
+ <layout_panel name="mute">
+ <button name="mute_btn" tool_tip="Sluk for lyd for valgte medie"/>
+ </layout_panel>
+ <layout_panel name="zoom">
+ <button name="zoom_btn" tool_tip="Zoom ind til valgte medie"/>
+ </layout_panel>
+ <layout_panel name="unzoom">
+ <button name="unzoom_btn" tool_tip="Zoom tilbage fra valgte medie"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_notes.xml b/indra/newview/skins/default/xui/da/panel_notes.xml
index f8d911b9e58017622cd66db678b1f12a99e5f008..5b3a2d09066de927b0e5bf3f9bbec08f081e046e 100644
--- a/indra/newview/skins/default/xui/da/panel_notes.xml
+++ b/indra/newview/skins/default/xui/da/panel_notes.xml
@@ -13,10 +13,10 @@
</scroll_container>
</panel>
<panel name="notes_buttons_panel">
- <button label="Tilføj" name="add_friend" tool_tip="Tilbyd venskab til beboeren"/>
+ <button label="Tilføj ven" name="add_friend" tool_tip="Tilbyd venskab til beboer"/>
<button label="IM" name="im" tool_tip="Ã…ben session med personlig besked (IM)"/>
<button label="Kald" name="call" tool_tip="Opkald til denne beboer"/>
- <button label="Kort" name="show_on_map_btn" tool_tip="Vis beboeren på kortet"/>
+ <button label="Kort" name="show_on_map_btn" tool_tip="Vis beboer på kort"/>
<button label="Teleport" name="teleport" tool_tip="Tilbyd teleport"/>
</panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/da/panel_online_status.xml b/indra/newview/skins/default/xui/da/panel_online_status.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fdc489f375ec6eabd344b633f4fb6eb00c3ccef3
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_online_status.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="friend_online_status" name="friend_online_status"/>
diff --git a/indra/newview/skins/default/xui/da/panel_online_status_toast.xml b/indra/newview/skins/default/xui/da/panel_online_status_toast.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fdc489f375ec6eabd344b633f4fb6eb00c3ccef3
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_online_status_toast.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="friend_online_status" name="friend_online_status"/>
diff --git a/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml
index 7d6401283e03ef6217f966e5213b3afff89ccf89..df00cfb2eba3987868dff8f6709c962e44c77ab0 100644
--- a/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="Outfits">
- <accordion name="outfits_accordion">
- <accordion_tab name="tab_cof" title="Nuværende sæt"/>
- <accordion_tab name="tab_outfits" title="Mine sæt"/>
- </accordion>
+<panel label="Ting" name="Outfits">
+ <tab_container name="appearance_tabs">
+ <inventory_panel label="MINE SÆT" name="outfitslist_tab"/>
+ <inventory_panel label="HAR PÃ…" name="cof_tab"/>
+ </tab_container>
+ <panel name="bottom_panel">
+ <button name="options_gear_btn" tool_tip="Vis flere muligheder"/>
+ <dnd_button name="trash_btn" tool_tip="Fjern valgte genstand"/>
+ <button label="Gem sæt" name="make_outfit_btn" tool_tip="Gem udseende som nyt sæt"/>
+ <button label="Tag på" name="wear_btn" tool_tip="Tag valgte sæt på"/>
+ <button label="M" name="look_edit_btn"/>
+ </panel>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml
index a6a796f6127be4b6111e2e917133c218cd71d02b..7b6469023b77296bccc95aec930b08ba7a730266 100644
--- a/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml
@@ -4,6 +4,6 @@
<menu_item_call label="Tilføj til nuværende sæt" name="add"/>
<menu_item_call label="Fjern fra nuværende sæt" name="remove"/>
<menu_item_call label="Omdøb" name="rename"/>
- <menu_item_call label="Fjern" name="remove_link"/>
- <menu_item_call label="Slet" name="delete"/>
+ <menu_item_call label="Fjern link" name="remove_link"/>
+ <menu_item_call label="Slet sæt" name="delete"/>
</menu>
diff --git a/indra/newview/skins/default/xui/da/panel_people.xml b/indra/newview/skins/default/xui/da/panel_people.xml
index 07b7f60810bc2b0a0e37869d2404599bb3510bff..ecfac67b1a8b62ba9f8dec73109971cc4f336e89 100644
--- a/indra/newview/skins/default/xui/da/panel_people.xml
+++ b/indra/newview/skins/default/xui/da/panel_people.xml
@@ -5,7 +5,6 @@
<string name="no_one_near" value="Ingen tæt på"/>
<string name="no_friends_online" value="Ingen venner online"/>
<string name="no_friends" value="Ingen venner"/>
- <string name="no_groups" value="Ingen grupper"/>
<string name="people_filter_label" value="Filtrér personer"/>
<string name="groups_filter_label" value="Filtrér grupper"/>
<filter_editor label="Filtrér" name="filter_input"/>
@@ -13,21 +12,25 @@
<panel label="TÆT PÅ" name="nearby_panel">
<panel label="bottom_panel" name="bottom_panel">
<button name="nearby_view_sort_btn" tool_tip="Valg"/>
- <button name="add_friend_btn" tool_tip="Tilføjer valgte beboere til din venneliste"/>
+ <button name="add_friend_btn" tool_tip="Tilføj valgte beboer til din venneliste"/>
</panel>
</panel>
- <panel label="VENNER" name="friends_panel">
+ <panel label="MINE VENNER" name="friends_panel">
<accordion name="friends_accordion">
<accordion_tab name="tab_online" title="Online"/>
<accordion_tab name="tab_all" title="Alle"/>
</accordion>
<panel label="bottom_panel" name="bottom_panel">
<button name="friends_viewsort_btn" tool_tip="Valg"/>
- <button name="add_btn" tool_tip="Tilbyd venskab til beboer"/>
+ <button name="add_btn" tool_tip="Tilbyd venskab til en beboer"/>
<button name="del_btn" tool_tip="Fjern valgte person fra din venneliste"/>
</panel>
+ <text name="no_friends_msg">
+ For at tilføje venner prøv [secondlife:///app/search/people global search] eller klik på en bruger for at tilføje dem som ven.
+Hvis du leder efter beboere at være sammen med, [secondlife:///app/worldmap prøv kortet].
+ </text>
</panel>
- <panel label="GRUPPER" name="groups_panel">
+ <panel label="MINE GRUPPER" name="groups_panel">
<panel label="bottom_panel" name="bottom_panel">
<button name="groups_viewsort_btn" tool_tip="Valg"/>
<button name="plus_btn" tool_tip="Bliv medlem af gruppe/Opret ny gruppe"/>
@@ -37,17 +40,18 @@
<panel label="NYLIGE" name="recent_panel">
<panel label="bottom_panel" name="bottom_panel">
<button name="recent_viewsort_btn" tool_tip="Valg"/>
- <button name="add_friend_btn" tool_tip="Tilføj valgte person til din venneliste"/>
+ <button name="add_friend_btn" tool_tip="Tilføj valgte beboer til din venneliste"/>
</panel>
</panel>
</tab_container>
<panel name="button_bar">
- <button label="Profil" name="view_profile_btn" tool_tip="Vis billede, grupper og anden information om beboer"/>
+ <button label="Profil" name="view_profile_btn" tool_tip="Vis billede, gruppe og anden information om beboer"/>
<button label="IM" name="im_btn" tool_tip="Chat privat med denne person"/>
<button label="Opkald" name="call_btn" tool_tip="Opkald til denne beboer"/>
<button label="Del" name="share_btn"/>
<button label="Teleport" name="teleport_btn" tool_tip="Tilbyd teleport"/>
<button label="Group profil" name="group_info_btn" tool_tip="Vis gruppe information"/>
<button label="Gruppe chat" name="chat_btn" tool_tip="Ã…ben chat session"/>
+ <button label="Gruppe opkald" name="group_call_btn" tool_tip="Opkald til denne gruppe"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_place_profile.xml b/indra/newview/skins/default/xui/da/panel_place_profile.xml
index 74753c64d4d16754aba596198e79a9ee12ca4e09..c1ed95f58027d2a6d7f005d1ff774d1df99e7396 100644
--- a/indra/newview/skins/default/xui/da/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/da/panel_place_profile.xml
@@ -6,7 +6,7 @@
<string name="available" value="ledig"/>
<string name="allocated" value="fordelt"/>
<string name="title_place" value="Sted profil"/>
- <string name="title_teleport_history" value="Teleport historik sted"/>
+ <string name="title_teleport_history" value="Teleport historik"/>
<string name="not_available" value="(N\A)"/>
<string name="unknown" value="(ukendt)"/>
<string name="public" value="(offentlig)"/>
@@ -41,62 +41,17 @@
<string name="acquired_date">
[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
</string>
+ <button name="back_btn" tool_tip="Tilbage"/>
<text name="title" value="Sted profil"/>
<scroll_container name="place_scroll">
<panel name="scrolling_panel">
<text name="owner_label" value="Ejer:"/>
<text name="maturity_value" value="ukendt"/>
<accordion name="advanced_info_accordion">
- <accordion_tab name="parcel_characteristics_tab" title="Parcel">
- <panel name="parcel_characteristics_panel">
- <text name="rating_label" value="Rating:"/>
- <text name="rating_value" value="ukendt"/>
- <text name="voice_label" value="Stem:"/>
- <text name="voice_value" value="Til"/>
- <text name="fly_label" value="Flyve:"/>
- <text name="fly_value" value="Til"/>
- <text name="push_label" value="Skub:"/>
- <text name="push_value" value="Fra"/>
- <text name="build_label" value="Byg:"/>
- <text name="build_value" value="Til"/>
- <text name="scripts_label" value="Scripts:"/>
- <text name="scripts_value" value="Til"/>
- <text name="damage_label" value="Skade:"/>
- <text name="damage_value" value="Fra"/>
- <button label="Om land" name="about_land_btn"/>
- </panel>
- </accordion_tab>
- <accordion_tab name="region_information_tab" title="Region">
- <panel name="region_information_panel">
- <text name="region_name_label" value="Region:"/>
- <text name="region_type_label" value="Type:"/>
- <text name="region_rating_label" value="Rating:"/>
- <text name="region_owner_label" value="Ejer:"/>
- <text name="region_group_label" value="Gruppe:"/>
- <button label="Region/Estate" name="region_info_btn"/>
- </panel>
- </accordion_tab>
- <accordion_tab name="estate_information_tab" title="Estate">
- <panel name="estate_information_panel">
- <text name="estate_name_label" value="Estate:"/>
- <text name="estate_rating_label" value="Rating:"/>
- <text name="estate_owner_label" value="Ejer:"/>
- <text name="covenant_label" value="Regler:"/>
- </panel>
- </accordion_tab>
- <accordion_tab name="sales_tab" title="Til salg">
- <panel name="sales_panel">
- <text name="sales_price_label" value="Pris:"/>
- <text name="area_label" value="Areal:"/>
- <text name="traffic_label" value="Trafik:"/>
- <text name="primitives_label" value="Prims:"/>
- <text name="parcel_scripts_label" value="Scripts:"/>
- <text name="terraform_limits_label" value="Terraform begrænsninger:"/>
- <text name="subdivide_label" value="Mulighed for at Opdele/samle:"/>
- <text name="resale_label" value="Mulighed for videresalg:"/>
- <text name="sale_to_label" value="Til salg til:"/>
- </panel>
- </accordion_tab>
+ <accordion_tab name="parcel_characteristics_tab" title="Parcel"/>
+ <accordion_tab name="region_information_tab" title="Region"/>
+ <accordion_tab name="estate_information_tab" title="Estate"/>
+ <accordion_tab name="sales_tab" title="Til salg"/>
</accordion>
</panel>
</scroll_container>
diff --git a/indra/newview/skins/default/xui/da/panel_places.xml b/indra/newview/skins/default/xui/da/panel_places.xml
index 052bf749cb7a646732d058a26ca282bfe51c6a29..3ac4ebaae9c120d6b2bf18c5285ecb4f99e444c4 100644
--- a/indra/newview/skins/default/xui/da/panel_places.xml
+++ b/indra/newview/skins/default/xui/da/panel_places.xml
@@ -2,13 +2,14 @@
<panel label="Steder" name="places panel">
<string name="landmarks_tab_title" value="MINE LANDEMÆRKER"/>
<string name="teleport_history_tab_title" value="TELEPORT HISTORIK"/>
- <filter_editor label="Filtrér steder" name="Filter"/>
+ <filter_editor label="Filtrér mine steder" name="Filter"/>
<panel name="button_panel">
- <button label="Teleportér" name="teleport_btn"/>
+ <button label="Teleportér" name="teleport_btn" tool_tip="Teleportér til det valgte område"/>
<button label="Kort" name="map_btn"/>
- <button label="Redigér" name="edit_btn"/>
- <button label="Luk" name="close_btn"/>
- <button label="Annullér" name="cancel_btn"/>
+ <button label="Redigér" name="edit_btn" tool_tip="Redigér landemærke information"/>
+ <button label="â–¼" name="overflow_btn" tool_tip="Vise flere valgmuligheder"/>
<button label="Gem" name="save_btn"/>
+ <button label="Annullér" name="cancel_btn"/>
+ <button label="Luk" name="close_btn"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
index 87b749b4eba226fb4b5fdd5a78d665e2c296ad90..30665dfa0ea531cb6b691a180583a453682d87fb 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
@@ -1,27 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<panel name="advanced">
- <panel.string name="resolution_format">
- [RES_X] x [RES_Y]
- </panel.string>
+<panel label="Avanceret" name="advanced">
<panel.string name="aspect_ratio_text">
[NUM]:[DEN]
</panel.string>
- <check_box label="Talebobler" name="bubble_text_chat"/>
- <color_swatch name="background" tool_tip="Vælg farve for talebobler"/>
- <slider label="Gennemsigtighed" name="bubble_chat_opacity"/>
- <text name="AspectRatioLabel1" tool_tip="bredde / højde">
- Format
- </text>
- <combo_box name="aspect_ratio" tool_tip="bredde/ højde">
- <combo_box.item label="4:3 (Standard CRT)" name="item1"/>
- <combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/>
- <combo_box.item label="8:5 (Widescreen)" name="item3"/>
- <combo_box.item label="16:9 (Widescreen)" name="item4"/>
- </combo_box>
- <check_box label="Registrér automatisk" name="aspect_auto_detect"/>
- <text name="heading1">
- Kamera:
- </text>
<slider label="Synsvinkel" name="camera_fov"/>
<slider label="Distance" name="camera_offset_scale"/>
<text name="heading2">
@@ -29,20 +10,20 @@
</text>
<check_box label="Byg/Redigér" name="edit_camera_movement" tool_tip="Benyt automatisk kamera positionering ved start og slut af editerings modus"/>
<check_box label="Udseende" name="appearance_camera_movement" tool_tip="Benyt automatisk kamera positionering ved redigering"/>
- <text name="heading3">
- Avatarer:
- </text>
<check_box label="Vis avatar i førsteperson" name="first_person_avatar_visible"/>
<check_box label="Piletaster bruges altid til bevægelse" name="arrow_keys_move_avatar_check"/>
<check_box label="Tast-tast-hold for at løbe" name="tap_tap_hold_to_run"/>
<check_box label="Bevæg avatarlæber når der tales" name="enable_lip_sync"/>
- <check_box label="Vis scriptfejl" name="show_script_errors"/>
+ <check_box label="Talebobler" name="bubble_text_chat"/>
+ <slider label="Gennemsigtighed" name="bubble_chat_opacity"/>
+ <color_swatch name="background" tool_tip="Vælg farve for talebobler"/>
+ <check_box label="Vis script fejl i:" name="show_script_errors"/>
<radio_group name="show_location">
- <radio_item label="I chat" name="0"/>
- <radio_item label="I et vindue" name="1"/>
+ <radio_item label="Chat" name="0"/>
+ <radio_item label="Separat vindue" name="1"/>
</radio_group>
- <check_box label="Knap til aktivering af mikrofon:" name="push_to_talk_toggle_check" tool_tip="I walkie-talkie-modus sendes stemme kun når knappen er trykket ned, ellers vil tryk på knap tænde og slukke mikrofon."/>
+ <check_box label="Knap til aktiverering af mikrofon:" name="push_to_talk_toggle_check" tool_tip="I walkie-talkie-modus sendes stemme kun når knappen er trykket ned, ellers vil tryk på knap tænde og slukke mikrofon."/>
<line_editor label="Brug walkie-talkie modus" name="modifier_combo"/>
<button label="Angiv taste" name="set_voice_hotkey_button"/>
- <button label="Midterste museknap" name="set_voice_middlemouse_button"/>
+ <button label="Midterste museknap" name="set_voice_middlemouse_button" tool_tip="Nulstil til midterste musetaste"/>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
index 479103375719429c69c3ab6dc95741e092ee033a..7caa17d514fa54985b5dbc52e05b47ac0d364d23 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
@@ -4,11 +4,11 @@
Vis mig når:
</text>
<check_box label="Når jeg bruger eller får L$" name="notify_money_change_checkbox"/>
- <check_box label="Når mine venner logger af eller på" name="friends_online_notify_checkbox"/>
+ <check_box label="Når mine venner logger på eller af" name="friends_online_notify_checkbox"/>
<text name="show_label">
- Vis altid disse beskeder:
+ Vis altid:
</text>
<text name="dont_show_label">
- Vis aldrig disse beskeder:
+ Vis aldrig:
</text>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
index 609512bc1b35ffebbfc61bfe0ae9d2eabb0fd673..3345bceff741a9b503c7a937ef6910e794a0da9c 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Tekst chat" name="chat">
<radio_group name="chat_font_size">
- <radio_item label="Lille" name="radio"/>
- <radio_item label="Mellem" name="radio2"/>
- <radio_item label="Stor" name="radio3"/>
+ <radio_item label="Lille" name="radio" value="0"/>
+ <radio_item label="Mellem" name="radio2" value="1"/>
+ <radio_item label="Stor" name="radio3" value="2"/>
</radio_group>
<color_swatch label="Dig" name="user"/>
<text name="text_box1">
@@ -39,8 +39,8 @@
</text>
<check_box initial_value="true" label="Afspil skrive animation ved chat" name="play_typing_animation"/>
<check_box label="Send e-mail til mig når jeg modtager IM og er offline" name="send_im_to_email"/>
- <radio_group name="chat_window" tool_tip="Vis dine personlige beskeder i separate vinduer eller i ét vindue med mange faner (ændring kræver genstart)">
- <radio_item label="Flere vinduer" name="radio"/>
- <radio_item label="Et vindue" name="radio2"/>
+ <radio_group name="chat_window" tool_tip="Vise dine personlige beskeder i separate vinduer, eller i ét vindue med flere faner (Kræver genstart)">
+ <radio_item label="Separate vinduer" name="radio" value="0"/>
+ <radio_item label="Faner" name="radio2" value="1"/>
</radio_group>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_general.xml b/indra/newview/skins/default/xui/da/panel_preferences_general.xml
index e17ccca4a18a00372ba69faa3fc07644c96b7cd1..f2c59f3d81f5be842989da60f8e8e857b1cb9847 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_general.xml
@@ -38,9 +38,9 @@
Navneskilte:
</text>
<radio_group name="Name_Tag_Preference">
- <radio_item label="Skjul" name="radio"/>
- <radio_item label="Vis" name="radio2"/>
- <radio_item label="Vis et øjeblik" name="radio3"/>
+ <radio_item label="Skjul" name="radio" value="0"/>
+ <radio_item label="Vis" name="radio2" value="1"/>
+ <radio_item label="Vis et øjeblik" name="radio3" value="2"/>
</radio_group>
<check_box label="Vis mit navn" name="show_my_name_checkbox1"/>
<check_box initial_value="true" label="Små avatar navne" name="small_avatar_names_checkbox"/>
@@ -48,14 +48,17 @@
<text name="effects_color_textbox">
Farve til mine effekter:
</text>
- <color_swatch label="" name="effect_color_swatch" tool_tip="Klik for at åbne farvevælger"/>
<text name="title_afk_text">
Tid inden "væk":
</text>
- <spinner label="Tid før inaktiv:" name="afk_timeout_spinner"/>
- <text name="seconds_textbox">
- sekunder
- </text>
+ <color_swatch label="" name="effect_color_swatch" tool_tip="Klik for at åbne farvevælger"/>
+ <combo_box label="Timeout før 'væk':" name="afk">
+ <combo_box.item label="2 minutter" name="item0"/>
+ <combo_box.item label="5 minutter" name="item1"/>
+ <combo_box.item label="10 minutter" name="item2"/>
+ <combo_box.item label="30 minutter" name="item3"/>
+ <combo_box.item label="aldrig" name="item4"/>
+ </combo_box>
<text name="text_box3">
Optaget autosvar:
</text>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
index bb1cacc7735afe473d78452b5c54fa33f02257b5..07e3aec72a1e4c60ce49465c1ea50e8389ec792a 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
@@ -88,8 +88,8 @@
Lys detaljer:
</text>
<radio_group name="LightingDetailRadio">
- <radio_item label="Kun sol og måne" name="SunMoon"/>
- <radio_item label="Lys i nærheden" name="LocalLights"/>
+ <radio_item label="Kun sol og måne" name="SunMoon" value="0"/>
+ <radio_item label="Lys i nærheden" name="LocalLights" value="1"/>
</radio_group>
<text name="TerrainDetailText">
Terræn detaljer:
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml
index c382b222eafc96264983c95f2d2b89fbdd657aff..cdb407dbad6f3740c4b3f6bf12d1e130cc660102 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml
@@ -3,7 +3,7 @@
<panel.string name="log_in_to_change">
log på for at ændre
</panel.string>
- <button label="Nulstil historik" name="clear_cache"/>
+ <button label="Nulstil historik" name="clear_cache" tool_tip="Fjern login billede, sidste lokation, teleport historik, samt web og tekstur cache"/>
<text name="cache_size_label_l">
(Lokationer, billeder, web, søge historik)
</text>
@@ -11,7 +11,6 @@
<check_box label="Kun venner og grupper kan sende besked til mig" name="voice_call_friends_only_check"/>
<check_box label="Slå mikrofon fra når opkald slutter" name="auto_disengage_mic_check"/>
<check_box label="Acceptér cookies" name="cookies_enabled"/>
- <check_box label="Tillad media autoplay" name="autoplay_enabled"/>
<text name="Logs:">
Logs:
</text>
@@ -19,7 +18,7 @@
<check_box label="Gem en log med private beskeder (IM) på min computer" name="log_instant_messages"/>
<check_box label="Tilføj tidsstempel" name="show_timestamps_check_im"/>
<text name="log_path_desc">
- Placering af logfiler
+ Placering af logfiler:
</text>
<button label="Ændre sti" label_selected="Ændre sti" left="150" name="log_path_button"/>
<button label="Liste med blokeringer" name="block_list"/>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
index 2dd0b71d8fe7a458f0f6511c666b469eb9bd286f..279e2880967750ef5013f1cce50d933ecaa5a407 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Input og kamera" name="Input panel">
+<panel label="Opsætning" name="Input panel">
<button label="Andre enheder" name="joystick_setup_button"/>
<text name="Mouselook:">
Første person:
@@ -18,29 +18,29 @@
kbps
</text>
<check_box label="Speciel port" name="connection_port_enabled"/>
- <spinner label="Port nummer:" name="web_proxy_port"/>
+ <spinner label="Port nummer:" name="connection_port"/>
<text name="cache_size_label_l">
Cache størrelse
</text>
<text name="text_box5">
MB
</text>
- <button label="Vælg" label_selected="Vælg" name="set_cache"/>
- <button label="Nulstil" label_selected="Gem" name="reset_cache"/>
<text name="Cache location">
- Cache lokation
+ Cache placering:
</text>
+ <button label="Vælg" label_selected="Vælg" name="set_cache"/>
+ <button label="Nulstil" label_selected="Nulstil" name="reset_cache"/>
<text name="Web:">
Web:
</text>
<radio_group name="use_external_browser">
- <radio_item label="Benyt den indbyggede browser" name="internal" tool_tip="Brug den indbyggede web browser til hjælp, web links m.v. Denne browser åbner et nyt vindue i [APP_NAME]."/>
- <radio_item label="Brug min normale browser (IE, Firefox)" name="external" tool_tip="Brug systemets standard web browser til hjælp, web links, m.v. Ikke anbefalet hvis du kører i fuld-skærm."/>
+ <radio_item label="Benyt den indbyggede browser" name="internal" tool_tip="Brug den indbyggede web browser til hjælp, web links m.v. Denne browser åbner et nyt vindue i [APP_NAME]." value="0"/>
+ <radio_item label="Benyt min browser(IE, Firefox, Safari)" name="external" tool_tip="Brug systemets standard web browser til hjælp, web links, m.v. Ikke anbefalet hvis du kører i fuld-skærm." value="1"/>
</radio_group>
- <check_box initial_value="false" label="Web proxy" name="web_proxy_enabled"/>
- <line_editor name="web_proxy_editor" tool_tip="Angiv navn eller IP addresse på den proxy du ønsker at anvende"/>
- <button label="Vælg" label_selected="Vælg" name="set_proxy"/>
+ <check_box initial_value="false" label="Aktivér web proxy" name="web_proxy_enabled"/>
<text name="Proxy location">
- Proxy placering
+ Proxy placering:
</text>
+ <line_editor name="web_proxy_editor" tool_tip="Angiv navn eller IP addresse på den proxy du ønsker at anvende"/>
+ <spinner label="Port nummer:" name="web_proxy_port"/>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
index ce77018f72046c257801043619c6c31c17c7292e..856f978ebd4820207e1941bd0bbef24383009f74 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
@@ -1,14 +1,21 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Lyde" name="Preference Media panel">
<slider label="Generel" name="System Volume"/>
- <check_box initial_value="true" label="Sluk lyd når vinduet er minimeret" name="mute_when_minimized"/>
- <slider label="Omgivelser" name="Wind Volume"/>
+ <check_box initial_value="true" label="Sluk lyd når minimeret" name="mute_when_minimized"/>
<slider label="Knapper" name="UI Volume"/>
- <slider label="Media" name="Media Volume"/>
- <slider label="Effekter" name="SFX Volume"/>
+ <slider label="Omgivelser" name="Wind Volume"/>
+ <slider label="Lyd effekter" name="SFX Volume"/>
<slider label="Musik" name="Music Volume"/>
- <check_box label="Tale" name="enable_voice_check"/>
- <slider label="Tale" name="Voice Volume"/>
+ <check_box label="Aktiveret" name="music_enabled"/>
+ <slider label="Media" name="Media Volume"/>
+ <check_box label="Aktiveret" name="enable_media"/>
+ <slider label="Stemme chat" name="Voice Volume"/>
+ <check_box label="Aktiveret" name="enable_voice_check"/>
+ <check_box label="Tillad media at afspilles automatisk" name="media_auto_play_btn" tool_tip="Vælg dette for at media afspille automatisk hvis det ønsker det" value="sandt"/>
+ <check_box label="Afspil media vedhæftet andre avatarer" name="media_show_on_others_btn" tool_tip="Deaktiver dette for at skjule vedhæftet media for avatarer i nærheden" value="sandt"/>
+ <text name="voice_chat_settings">
+ Stemme chat opsætning
+ </text>
<text name="Listen from">
Hør stemmer fra:
</text>
diff --git a/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml
index 987ba2a3f8172c4b1a5da0fbec7c940a16f139a1..d3b3c7e21ec149075592841b080b3cc0fe734e71 100644
--- a/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml
@@ -1,6 +1,47 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="MediaControls">
+ <string name="min_width">
+ 300
+ </string>
+ <string name="min_height">
+ 75
+ </string>
+ <string name="zoom_medium_padding">
+ 1.1
+ </string>
+ <string name="top_world_view_avoid_zone">
+ 50
+ </string>
+ <layout_stack name="progress_indicator_area">
+ <panel name="media_progress_indicator">
+ <progress_bar name="media_progress_bar" tool_tip="Medie hentes"/>
+ </panel>
+ </layout_stack>
<layout_stack name="media_controls">
+ <layout_panel name="back">
+ <button name="back_btn" tool_tip="Navigér tilbage"/>
+ </layout_panel>
+ <layout_panel name="fwd">
+ <button name="fwd_btn" tool_tip="Navigér frem"/>
+ </layout_panel>
+ <layout_panel name="home">
+ <button name="home_btn" tool_tip="Hjemmeside"/>
+ </layout_panel>
+ <layout_panel name="media_stop">
+ <button name="media_stop_btn" tool_tip="Stop medie"/>
+ </layout_panel>
+ <layout_panel name="reload">
+ <button name="reload_btn" tool_tip="Indlæs igen"/>
+ </layout_panel>
+ <layout_panel name="stop">
+ <button name="stop_btn" tool_tip="Stop indlæsning"/>
+ </layout_panel>
+ <layout_panel name="play">
+ <button name="play_btn" tool_tip="Afspil medie"/>
+ </layout_panel>
+ <layout_panel name="pause">
+ <button name="pause_btn" tool_tip="Pause medie"/>
+ </layout_panel>
<layout_panel name="media_address">
<line_editor name="media_address_url" tool_tip="Media URL"/>
<layout_stack name="media_address_url_icons">
@@ -15,14 +56,24 @@
<layout_panel name="media_play_position">
<slider_bar initial_value="0.5" name="media_play_slider" tool_tip="Filmafspilning fremskridt"/>
</layout_panel>
+ <layout_panel name="skip_back">
+ <button name="skip_back_btn" tool_tip="GÃ¥ tilbage"/>
+ </layout_panel>
+ <layout_panel name="skip_forward">
+ <button name="skip_forward_btn" tool_tip="GÃ¥ frem"/>
+ </layout_panel>
<layout_panel name="media_volume">
<button name="media_mute_button" tool_tip="Sluk for dette media"/>
<slider name="volume_slider" tool_tip="Media lydstyrke"/>
</layout_panel>
- </layout_stack>
- <layout_stack>
- <panel name="media_progress_indicator">
- <progress_bar name="media_progress_bar" tool_tip="Media hentes"/>
- </panel>
+ <layout_panel name="zoom_frame">
+ <button name="zoom_frame_btn" tool_tip="Zoom til medie"/>
+ </layout_panel>
+ <layout_panel name="close">
+ <button name="close_btn" tool_tip="Zoom tilbage"/>
+ </layout_panel>
+ <layout_panel name="new_window">
+ <button name="new_window_btn" tool_tip="Ã…ben URL i browser"/>
+ </layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_profile.xml b/indra/newview/skins/default/xui/da/panel_profile.xml
index ef7110ffcf5baeb3b6f5c7cd0071c53426829875..c5bfc3ae80e9010b35b958555b029bfd21b8c4a5 100644
--- a/indra/newview/skins/default/xui/da/panel_profile.xml
+++ b/indra/newview/skins/default/xui/da/panel_profile.xml
@@ -1,37 +1,41 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Profil" name="panel_profile">
<string name="no_partner_text" value="Ingen"/>
+ <string name="no_group_text" value="Ingen"/>
<string name="RegisterDateFormat">
[REG_DATE] ([AGE])
</string>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="second_life_image_panel">
- <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
- </panel>
- <panel name="first_life_image_panel">
- <text name="title_rw_descr_text" value="Real world:"/>
- </panel>
- <text name="me_homepage_text">
- Hjemmeside:
- </text>
- <text name="title_member_text" value="Medlem siden:"/>
- <text name="title_acc_status_text" value="Konto status:"/>
- <text name="acc_status_text" value="Beboer. Ingen betalingsinfo"/>
- <text name="title_partner_text" value="Partner:"/>
- <text name="title_groups_text" value="Grupper:"/>
- </panel>
- </scroll_container>
- <panel name="profile_buttons_panel">
- <button label="Tilføj ven" name="add_friend" tool_tip="Tilbyd venskab til denne beboer"/>
- <button label="IM" name="im" tool_tip="Skriv en personlig besked (IM)"/>
- <button label="Opkald" name="call" tool_tip="Opkald til denne beboer"/>
- <button label="Map" name="show_on_map_btn" tool_tip="Show the resident on the map"/>
- <button label="Tilbyd teleport" name="teleport" tool_tip="Tilbyd en teleport til denne beboer"/>
- <button label="â–¼" name="overflow_btn" tool_tip="Betal penge til eller del beholdning med denne beboer"/>
- </panel>
- <panel name="profile_me_buttons_panel">
- <button label="Redigér profil" name="edit_profile_btn"/>
- <button label="Redigér udseende" name="edit_appearance_btn"/>
- </panel>
+ <layout_stack name="layout">
+ <layout_panel name="profile_stack">
+ <scroll_container name="profile_scroll">
+ <panel name="profile_scroll_panel">
+ <panel name="second_life_image_panel">
+ <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
+ </panel>
+ <panel name="first_life_image_panel">
+ <text name="title_rw_descr_text" value="Real World:"/>
+ </panel>
+ <text name="title_member_text" value="Beboer siden:"/>
+ <text name="title_acc_status_text" value="Konto status:"/>
+ <text name="title_partner_text" value="Partner:"/>
+ <panel name="partner_data_panel">
+ <name_box initial_value="(henter)" name="partner_text"/>
+ </panel>
+ <text name="title_groups_text" value="Grupper:"/>
+ </panel>
+ </scroll_container>
+ </layout_panel>
+ <layout_panel name="profile_buttons_panel">
+ <button label="Tilføj ven" name="add_friend" tool_tip="Tilbyd venskab til beboeren"/>
+ <button label="IM" name="im" tool_tip="Ã…ben session med personlige beskeder (IM)"/>
+ <button label="Opkald" name="call" tool_tip="Opkald til denne beboer"/>
+ <button label="Kort" name="show_on_map_btn" tool_tip="Vis beboeren på kortet"/>
+ <button label="Teleport" name="teleport" tool_tip="Tilbyd teleport"/>
+ <button label="â–¼" name="overflow_btn" tool_tip="Betal penge til eller del beholdning med beboeren"/>
+ </layout_panel>
+ <layout_panel name="profile_me_buttons_panel">
+ <button label="Redigér profil" name="edit_profile_btn" tool_tip="Redigér din personlige information"/>
+ <button label="Redigér udseende" name="edit_appearance_btn" tool_tip="Opret/redigér dit udseende: fysiske data, tøj m.v."/>
+ </layout_panel>
+ </layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_region_covenant.xml b/indra/newview/skins/default/xui/da/panel_region_covenant.xml
index 0e8ab7556f96fc04e3aa4d6a0a1fbdd565caecc3..564d8e6665f70d651bf4a6c6469740b7f78c21f0 100644
--- a/indra/newview/skins/default/xui/da/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_covenant.xml
@@ -27,7 +27,7 @@
Ændringer i regler vil blive vist i alle parceller til denne estate.
</text>
<text name="covenant_instructions">
- Træk og slip en note for at ændre regler for denne estate.
+ Træk og slip et notecard her for at ændre regler for denne estate.
</text>
<text name="region_section_lbl">
Region
diff --git a/indra/newview/skins/default/xui/da/panel_region_estate.xml b/indra/newview/skins/default/xui/da/panel_region_estate.xml
index d726fedfe97ca8b798ccf5e704f413c8f136dec3..c21fd9db37a61b66b4298c8d8bb6103d3aa41f63 100644
--- a/indra/newview/skins/default/xui/da/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_estate.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Estate" name="Estate">
<text name="estate_help_text">
- Ændringer i dette afsnit vil påvirke alle
-regioner i dette estate.
+ Ændringer her vil påvirke alle regioner i dette estate.
</text>
<text name="estate_text">
Estate:
@@ -24,10 +23,10 @@ regioner i dette estate.
<check_box label="Tillad offentlig adgang" name="externally_visible_check"/>
<button label="?" name="externally_visible_help"/>
<text name="Only Allow">
- Begræns adgang til:
+ Begræns adgang til konti bekræftet med:
</text>
- <check_box label="Beboere med betalingsoplysninger" name="limit_payment" tool_tip="Blokér for brugere uden identifikation"/>
- <check_box label="Beboere der er godkendt som voksne" name="limit_age_verified" tool_tip="Blokér for brugere der ikke har verificéret deres alder. Se [SUPPORT_SITE] for mere information."/>
+ <check_box label="Beboere med betalingsoplysninger" name="limit_payment" tool_tip="Blokér for uidentificerede beboere"/>
+ <check_box label="Beboere der er godkendt som voksne" name="limit_age_verified" tool_tip="Blokér for beboere som ikke er blevet aldersverificeret. Se [SUPPORT_SITE] for mere information."/>
<check_box label="Tillad stemme chat" name="voice_chat_check"/>
<button label="?" name="voice_chat_help"/>
<check_box label="Tillad direkte teleport" name="allow_direct_teleport"/>
diff --git a/indra/newview/skins/default/xui/da/panel_region_general_layout.xml b/indra/newview/skins/default/xui/da/panel_region_general_layout.xml
new file mode 100644
index 0000000000000000000000000000000000000000..467684f712a45418a883e57ce6ab68a0310d07e1
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_region_general_layout.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Region" name="General">
+ <text name="region_text_lbl">
+ Region:
+ </text>
+ <text name="region_text">
+ ukendt
+ </text>
+ <text name="version_channel_text_lbl">
+ Version:
+ </text>
+ <text name="version_channel_text">
+ ukendt
+ </text>
+ <text name="region_type_lbl">
+ Type:
+ </text>
+ <text name="region_type">
+ ukendt
+ </text>
+ <check_box label="Blokér for redigering af terræn" name="block_terraform_check"/>
+ <check_box label="Blokér for flyvning" name="block_fly_check"/>
+ <check_box label="Tillad skader" name="allow_damage_check"/>
+ <check_box label="Begræns skubning" name="restrict_pushobject"/>
+ <check_box label="Tillad at sælge land" name="allow_land_resell_check"/>
+ <check_box label="Tillad at samle/dele land" name="allow_parcel_changes_check"/>
+ <check_box label="Blokér visning af land i Søgning" name="block_parcel_search_check" tool_tip="Lad beboere se denne region og dens parceller i søgeresultater"/>
+ <spinner label="Max besøgende" name="agent_limit_spin"/>
+ <spinner label="Objekt bonus" name="object_bonus_spin"/>
+ <text label="Rating" name="access_text">
+ Rating:
+ </text>
+ <combo_box label="Moderat" name="access_combo">
+ <combo_box.item label="Voksent" name="Adult"/>
+ <combo_box.item label="Moderat" name="Mature"/>
+ <combo_box.item label="Generel" name="PG"/>
+ </combo_box>
+ <button label="Gem" name="apply_btn"/>
+ <button label="Send en beboer hjem ..." name="kick_btn"/>
+ <button label="Send alle beboere hjem..."" name="kick_all_btn"/>
+ <button label="Send besked til region..." name="im_btn"/>
+ <button label="Vedligehold telehub..." name="manage_telehub_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_region_texture.xml b/indra/newview/skins/default/xui/da/panel_region_texture.xml
index fc597eee15140bca4e89c0b66883a4529c36ccf9..8e324ab7776c0a5d35cbd0e7d3ae87ae472e4ec3 100644
--- a/indra/newview/skins/default/xui/da/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_texture.xml
@@ -45,10 +45,10 @@
<spinner label="Høj" name="height_range_spin_2"/>
<spinner label="Høj" name="height_range_spin_3"/>
<text name="height_text_lbl10">
- Disse værdier repræsenterer blandingsområder for teksturer ovenfor.
+ Disse værdier repræsenterer blandingsforhold for teksturer ovenfor.
</text>
<text name="height_text_lbl11">
- Målt i meter, angiver LAV værdien MAKSIMUM højden for tekstur 1, og HØJ værdien er minimumshøjden for tekstur 4.
+ Målt i meter, angiver LAV værdien MAKSIMUM højden for tekstur 1 og HØJ værdien er MINIMUMSshøjden for tekstur 4.
</text>
<text name="height_text_lbl12">
og HØJ værdien er MIMIMUM højde for texture nummer 4.
diff --git a/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml
new file mode 100644
index 0000000000000000000000000000000000000000..821c82ccda543beac957c8f9a06eb0b924ca73a7
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="MIN AVATAR" name="script_limits_my_avatar_panel">
+ <text name="script_memory">
+ Avatar Script forbrug
+ </text>
+ <text name="loading_text">
+ Henter...
+ </text>
+ <scroll_list name="scripts_list">
+ <scroll_list.columns label="Størrelse (kb)" name="size"/>
+ <scroll_list.columns label="URL'er" name="urls"/>
+ <scroll_list.columns label="Objekt navn" name="name"/>
+ <scroll_list.columns label="Lokation" name="location"/>
+ </scroll_list>
+ <button label="Gentegn liste" name="refresh_list_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml
new file mode 100644
index 0000000000000000000000000000000000000000..91fc76dbb41314dd753c2047a55afac7010cd53a
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="REGION MEMORY" name="script_limits_region_memory_panel">
+ <text name="script_memory">
+ Parcel script memory
+ </text>
+ <text name="loading_text">
+ Henter...
+ </text>
+ <scroll_list name="scripts_list">
+ <scroll_list.columns label="Størrelse (kb)" name="size"/>
+ <scroll_list.columns label="URL'er" name="urls"/>
+ <scroll_list.columns label="Objekt navn" name="name"/>
+ <scroll_list.columns label="Objekt ejer" name="owner"/>
+ <scroll_list.columns label="Parcel" name="parcel"/>
+ <scroll_list.columns label="Lokation" name="location"/>
+ </scroll_list>
+ <button label="Gentegn liste" name="refresh_list_btn"/>
+ <button label="Fremhæv" name="highlight_btn"/>
+ <button label="Retur" name="return_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_side_tray.xml b/indra/newview/skins/default/xui/da/panel_side_tray.xml
index ab4a2a134e72398ed85129676d82f3a4764973a5..ec430d6fd47924136336a08e9e413d2de71c2efd 100644
--- a/indra/newview/skins/default/xui/da/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/da/panel_side_tray.xml
@@ -2,25 +2,28 @@
<!-- Side tray cannot show background because it is always
partially on screen to hold tab buttons. -->
<side_tray name="sidebar">
- <sidetray_tab description="Hjem." name="sidebar_home">
+ <sidetray_tab description="Ã…bn/luk sidebar" name="sidebar_openclose" tab_title="Ã…bn/luk sidebar"/>
+ <sidetray_tab description="Hjem." name="sidebar_home" tab_title="Home">
<panel label="hjem" name="panel_home"/>
</sidetray_tab>
- <sidetray_tab description="Find venner, kontakter og personer tæt på." name="sidebar_people">
+ <sidetray_tab description="Redigér din profile og favoritter." name="sidebar_me" tab_title="My Profile">
<panel_container name="panel_container">
- <panel label="Gruppe info" name="panel_group_info_sidetray"/>
+ <panel label="Mig" name="panel_me"/>
+ </panel_container>
+ </sidetray_tab>
+ <sidetray_tab description="Find venner, kontakter og personer tæt på." name="sidebar_people" tab_title="People">
+ <panel_container name="panel_container">
+ <panel label="Gruppe profil" name="panel_group_info_sidetray"/>
<panel label="Blokerede beboere og objekter" name="panel_block_list_sidetray"/>
</panel_container>
</sidetray_tab>
- <sidetray_tab description="Find steder du vil hen og steder du har været før." label="Steder" name="sidebar_places">
+ <sidetray_tab description="Find steder du vil hen og steder du har været før." label="Steder" name="sidebar_places" tab_title="Places">
<panel label="Steder" name="panel_places"/>
</sidetray_tab>
- <sidetray_tab description="Redigér din profile og favoritter." name="sidebar_me">
- <panel label="Mig" name="panel_me"/>
+ <sidetray_tab description="Browse din beholdning." name="sidebar_inventory" tab_title="My Inventory">
+ <panel label="Redigér beholdning" name="sidepanel_inventory"/>
</sidetray_tab>
- <sidetray_tab description="Ændre dit nuværende udseende" name="sidebar_appearance">
+ <sidetray_tab description="Ændre dit nuværende udseende" name="sidebar_appearance" tab_title="My Appearance">
<panel label="Redigér fremtoning" name="sidepanel_appearance"/>
</sidetray_tab>
- <sidetray_tab description="Browse din beholdning." name="sidebar_inventory">
- <panel label="Redigér beholdning" name="sidepanel_inventory"/>
- </sidetray_tab>
</side_tray>
diff --git a/indra/newview/skins/default/xui/da/panel_status_bar.xml b/indra/newview/skins/default/xui/da/panel_status_bar.xml
index 4e45b7e328c08b7822712a85945f84967e0757da..08ffafd5a6e322f8ceb38ff202a0c6ce50f82818 100644
--- a/indra/newview/skins/default/xui/da/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/da/panel_status_bar.xml
@@ -21,9 +21,11 @@
<panel.string name="buycurrencylabel">
L$ [AMT]
</panel.string>
- <button label="" label_selected="" name="buycurrency" tool_tip="My Balance: Click to buy more L$"/>
+ <button label="" label_selected="" name="buycurrency" tool_tip="Min balance"/>
+ <button label="Køb L$" name="buyL" tool_tip="Klik for at købe flere L$"/>
<text name="TimeText" tool_tip="Nuværende tid (Pacific)">
- 12:00
+ 24:00 PST
</text>
+ <button name="media_toggle_btn" tool_tip="Start/Stop Alle medier (musik, video, hjemmesider)"/>
<button name="volume_btn" tool_tip="Kontrol for generel lydstyrke"/>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_teleport_history.xml b/indra/newview/skins/default/xui/da/panel_teleport_history.xml
index 64b5ecf5cf4dec761ee6bb6d8279f09dd3fa2565..a1859b64d8801eab030240212e474205a43e4a50 100644
--- a/indra/newview/skins/default/xui/da/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/da/panel_teleport_history.xml
@@ -4,6 +4,7 @@
<accordion_tab name="today" title="I dag"/>
<accordion_tab name="yesterday" title="I går"/>
<accordion_tab name="2_days_ago" title="2 dage siden"/>
+ 5
<accordion_tab name="3_days_ago" title="3 dage siden"/>
<accordion_tab name="4_days_ago" title="4 dage siden"/>
<accordion_tab name="5_days_ago" title="5 dage siden"/>
@@ -11,4 +12,7 @@
<accordion_tab name="1_month_and_older" title="1 måned eller ældre"/>
<accordion_tab name="6_months_and_older" title="6 måneder eller ældre"/>
</accordion>
+ <panel name="bottom_panel">
+ <button name="gear_btn" tool_tip="Vi flere valgmuligheder"/>
+ </panel>
</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8148588c86a0087b4f716e02705a4a845f67ba43
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="teleport_history_item">
+ <button name="profile_btn" tool_tip="Vis info om genstand"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
index 27708f5c7a3c0a02347291bf73fd833c2c1ff448..43ddfdada71e02454a75ad94f28712335239ad1a 100644
--- a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Sæt" name="appearance panel">
<string name="No Outfit" value="Intet sæt"/>
- <filter_editor label="Filtrér sæt" name="Filter"/>
- <panel name="bottom_panel">
- <button name="options_gear_btn" tool_tip="Vis flere muligheder"/>
- <button name="newlook_btn" tool_tip="Tilføj nyt sæt"/>
- <dnd_button name="trash_btn" tool_tip="Fjern valgte del"/>
- <button label="Bær" name="wear_btn"/>
+ <panel name="panel_currentlook">
+ <text name="currentlook_title">
+ (ikke gemt)
+ </text>
</panel>
+ <filter_editor label="Filtrér sæt" name="Filter"/>
</panel>
diff --git a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
index 685601b922e8787b3f7c894335c31125d1e58a70..77db828c201273700eda9c34af30fd4c3a5eda1a 100644
--- a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="item properties" title="Egenskaber for beholdningsgenstand">
+<panel name="item properties" title="Objekt profil">
<panel.string name="unknown">
(ukendt)
</panel.string>
@@ -15,7 +15,8 @@
<panel.string name="acquiredDate">
[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
</panel.string>
- <text name="title" value="Egenskaber for genstand"/>
+ <text name="title" value="Objekt profil"/>
+ <text name="where" value="(Beholdning)"/>
<panel label="">
<text name="LabelItemNameTitle">
Navn:
@@ -37,34 +38,36 @@
<text name="LabelAcquiredDate">
Ons Maj 24 12:50:46 2006
</text>
- <text name="OwnerLabel">
- Dig:
- </text>
- <check_box label="Editér" name="CheckOwnerModify"/>
- <check_box label="Kopiér" name="CheckOwnerCopy"/>
- <check_box label="Sælg" name="CheckOwnerTransfer"/>
- <text name="AnyoneLabel">
- Enhver:
- </text>
- <check_box label="Kopiér" name="CheckEveryoneCopy"/>
- <text name="GroupLabel">
- Gruppe:
- </text>
- <check_box label="Del" name="CheckShareWithGroup"/>
- <text name="NextOwnerLabel">
- Næste ejer:
- </text>
- <check_box label="Editér" name="CheckNextOwnerModify"/>
- <check_box label="Kopiér" name="CheckNextOwnerCopy"/>
- <check_box label="Sælg" name="CheckNextOwnerTransfer"/>
+ <panel name="perms_inv">
+ <text name="perm_modify">
+ Du kan:
+ </text>
+ <check_box label="Redigér" name="CheckOwnerModify"/>
+ <check_box label="Kopi" name="CheckOwnerCopy"/>
+ <check_box label="Giv væk" name="CheckOwnerTransfer"/>
+ <text name="AnyoneLabel">
+ Enhver:
+ </text>
+ <check_box label="Kopi" name="CheckEveryoneCopy"/>
+ <text name="GroupLabel">
+ Gruppe:
+ </text>
+ <check_box label="Del" name="CheckShareWithGroup" tool_tip="Tillad alle medlemmer i den aktive gruppe at dele dine 'redigere' rettigheder for dette objekt. Du skal dedikere for at åbne for rolle begrænsninger."/>
+ <text name="NextOwnerLabel">
+ Næste ejer:
+ </text>
+ <check_box label="Redigere" name="CheckNextOwnerModify"/>
+ <check_box label="Kopi" name="CheckNextOwnerCopy"/>
+ <check_box label="Giv væk" name="CheckNextOwnerTransfer" tool_tip="Næste ejer kan give væk eller sælge dette objekt"/>
+ </panel>
<check_box label="Til salg" name="CheckPurchase"/>
<combo_box name="combobox sale copy">
<combo_box.item label="Kopiér" name="Copy"/>
<combo_box.item label="Original" name="Original"/>
</combo_box>
- <spinner label="Pris:" name="Edit Cost"/>
- <text name="CurrencySymbol">
- L$
- </text>
+ <spinner label="Pris: L$" name="Edit Cost"/>
+ </panel>
+ <panel name="button_panel">
+ <button label="Annullér" name="cancel_btn"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml
index 666c6936fe74e77387366d0dead14a83dcce26da..add2fa3c731963d9728603a5836ef5c4000f104b 100644
--- a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="object properties" title="Egenskaber for objekt">
+<panel name="object properties" title="Objekt profil">
<panel.string name="text deed continued">
Dedikér
</panel.string>
@@ -36,44 +36,18 @@
<panel.string name="Sale Mixed">
Blandet salg
</panel.string>
- <panel name="properties_panel" label="">
- <text name="Name:">
- Navn:
+ <text name="title" value="Objekt profil"/>
+ <text name="where" value="(verden)"/>
+ <panel label="">
+ <text name="CreatorNameLabel">
+ Skaber
</text>
- <text name="Description:">
- Beskrivelse:
+ <text name="Creator Name">
+ Erica Linden
</text>
- <text name="Creator:">
- Skaber:
- </text>
- <text name="Owner:">
- Ejer:
- </text>
- <text name="Group:">
+ <text name="Group_label">
Gruppe:
</text>
- <button name="button set group" tool_tip="Vælg en gruppe der skal dele dette objekts rettigheder"/>
- <name_box initial_value="Henter..." name="Group Name Proxy"/>
- <button label="Dedikér" label_selected="Dedikér" name="button deed" tool_tip="Dedikering giver denne genstand væk med næste ejers rettigheder. Gruppedelte genstande kan dedikeres af en gruppeadministrator."/>
- <check_box label="Del" name="checkbox share with group" tool_tip="Tillad alle medlemmer i den angivne gruppe at videregive dine "redigere" rettigheder for dette objekt. Du må dedikere for at tillade rolle begrænsninger."/>
- <text name="label click action">
- Klik for at:
- </text>
- <combo_box name="clickaction">
- <combo_box.item label="Røre (standard)" name="Touch/grab(default)"/>
- <combo_box.item label="Sidde på objekt" name="Sitonobject"/>
- <combo_box.item label="Købe objekt" name="Buyobject"/>
- <combo_box.item label="Betale til objekt" name="Payobject"/>
- <combo_box.item label="Ã…bne" name="Open"/>
- </combo_box>
- <check_box label="Til salg:" name="checkbox for sale"/>
- <combo_box name="sale type">
- <combo_box.item label="Kopi" name="Copy"/>
- <combo_box.item label="Indhold" name="Contents"/>
- <combo_box.item label="Original" name="Original"/>
- </combo_box>
- <spinner label="Pris: L$" name="Edit Cost"/>
- <check_box label="Vis i søgning" name="search_check" tool_tip="Lad personer se dette objekt i søgeresultater"/>
<panel name="perms_inv">
<text name="perm_modify">
Du kan redigere dette objekt
@@ -81,39 +55,42 @@
<text name="Anyone can:">
Enhver:
</text>
- <check_box label="Flytte" name="checkbox allow everyone move"/>
- <check_box label="Kopiere" name="checkbox allow everyone copy"/>
- <text name="Next owner can:">
+ <check_box label="Kopi" name="checkbox allow everyone copy"/>
+ <check_box label="Flyt" name="checkbox allow everyone move"/>
+ <text name="GroupLabel">
+ Gruppe:
+ </text>
+ <check_box label="Del" name="checkbox share with group" tool_tip="Tillad alle medlemmer i den aktive gruppe at dele dine 'rediger' rettigheder for dette objekt. Du skal dedikere for at åbne for rolle begrænsninger."/>
+ <text name="NextOwnerLabel">
Næste ejer:
</text>
<check_box label="Redigere" name="checkbox next owner can modify"/>
- <check_box label="Kopiere" name="checkbox next owner can copy"/>
- <check_box label="Overfør" name="checkbox next owner can transfer" tool_tip="Næste ejer kan sælge eller give dette objekt væk"/>
- <text name="B:">
- B:
- </text>
- <text name="O:">
- Ã…:
- </text>
- <text name="G:">
- O:
- </text>
- <text name="E:">
- R:
- </text>
- <text name="N:">
- N:
- </text>
- <text name="F:">
- F:
- </text>
+ <check_box label="Kopi" name="checkbox next owner can copy"/>
+ <check_box label="Give væk" name="checkbox next owner can transfer" tool_tip="Næste ejer kan give væk eller sælge objekt"/>
</panel>
+ <check_box label="Til salg" name="checkbox for sale"/>
+ <text name="B:">
+ B:
+ </text>
+ <text name="O:">
+ O:
+ </text>
+ <text name="G:">
+ G:
+ </text>
+ <text name="E:">
+ E:
+ </text>
+ <text name="N:">
+ N:
+ </text>
+ <text name="F:">
+ F:
+ </text>
</panel>
<panel name="button_panel">
<button label="Ã…ben" name="open_btn"/>
<button label="Betal" name="pay_btn"/>
<button label="Køb" name="buy_btn"/>
- <button label="Annullér" name="cancel_btn"/>
- <button label="Gem" name="save_btn"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index 493bb4cb20c6cf4ee508e86ddb5ad8f24b9caa4b..412f946acce5d44ea0df2680b0c7d0c5215ad415 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<!-- This file contains strings that used to be hardcoded in the source.
It is only for those strings which do not belong in a floater.
- For example, the strings used in avatar chat bubbles, and strings
+ For example, the strings used in avatar chat bubbles, and strings
that are returned from one component and may appear in many places-->
<strings>
+ <string name="CAPITALIZED_APP_NAME">
+ SECOND LIFE
+ </string>
<string name="SUPPORT_SITE">
Second Life Support Portal
</string>
@@ -131,7 +134,7 @@
Klik for at se information om denne lokation
</string>
<string name="TooltipAgentUrl">
- Klik for at denne beboers profil
+ Klik for at se beboers profil
</string>
<string name="TooltipGroupUrl">
Klik for at se denne gruppes beskrivelse
@@ -165,7 +168,7 @@
Vis kort for
</string>
<string name="BUTTON_CLOSE_DARWIN">
- Luk (⌘W)
+ Luk (⌘W)
</string>
<string name="BUTTON_CLOSE_WIN">
Luk (Ctrl+W)
@@ -182,9 +185,6 @@
<string name="BUTTON_DOCK">
Fastgør
</string>
- <string name="BUTTON_UNDOCK">
- Frigør
- </string>
<string name="BUTTON_HELP">
Vis hjælp
</string>
@@ -209,9 +209,6 @@
<string name="AvatarNameWaiting">
(venter)
</string>
- <string name="AvatarNameHippos">
- (hippos)
- </string>
<string name="GroupNameNone">
(ingen)
</string>
@@ -572,6 +569,9 @@
<string name="hang_up">
Stemme chat er afbrudt
</string>
+ <string name="reconnect_nearby">
+ Du vil nu blive dirigeret til lokal stemme chat
+ </string>
<string name="ScriptQuestionCautionChatGranted">
'[OBJECTNAME]', en genstand, ejet af '[OWNERNAME]', lokaliseret i [REGIONNAME] på [REGIONPOS], har fået tilladelse til: [PERMISSIONS].
</string>
@@ -764,9 +764,6 @@
<string name="TeleportOffer">
Teleport tilbud
</string>
- <string name="StartUpNotification">
- %d nye besked modtaget mens du var væk...
- </string>
<string name="StartUpNotifications">
%d nye beskeder modtaget mens du var væk......
</string>
@@ -804,11 +801,13 @@
Tryk ESC for at skift til normalt udsyn
</string>
<string name="InventoryNoMatchingItems">
- No matching items found in inventory.
+ Ingen matchende genstande fundet i beholdning. Prøv evt. [secondlife:///app/search/groups "Search"].
+ </string>
+ <string name="FavoritesNoMatchingItems">
+ Træk et landemærke hertil for at tilføje den som favorit.
</string>
<string name="InventoryNoTexture">
- Du har ikke en kopi af denne
-tekstur i din beholdning.
+ Du har ikke en kopi af denne tekstur i din beholdning
</string>
<string name="no_transfer" value=" (ikke overdragbar)"/>
<string name="no_modify" value=" (ikke redigere)"/>
@@ -1266,11 +1265,164 @@ tekstur i din beholdning.
alle estates du administrerer for [OWNER]
</string>
<string name="RegionInfoAllowedResidents">
- Godkendte beboere: ([ALLOWEDAGENTS], max. [MAXACCESS])
+ Godkendte beboere: ([ALLOWEDAGENTS], maks. [MAXACCESS])
</string>
<string name="RegionInfoAllowedGroups">
Godkendte grupper: ([ALLOWEDGROUPS], max. [MAXACCESS])
</string>
+ <string name="ScriptLimitsParcelScriptMemory">
+ Parcel script memory
+ </string>
+ <string name="ScriptLimitsParcelsOwned">
+ Parceller listet: [PARCELS]
+ </string>
+ <string name="ScriptLimitsMemoryUsed">
+ Memory brugt: [COUNT] kb ud af [MAX] kb; [AVAILABLE] kb tilgængeligt
+ </string>
+ <string name="ScriptLimitsMemoryUsedSimple">
+ Memory brugt: [COUNT] kb
+ </string>
+ <string name="ScriptLimitsParcelScriptURLs">
+ Parcel Script URL'er
+ </string>
+ <string name="ScriptLimitsURLsUsed">
+ URL'er brugt: [COUNT] ud af [MAX]; [AVAILABLE] tilgængelige
+ </string>
+ <string name="ScriptLimitsURLsUsedSimple">
+ URL'er brugt: [COUNT]
+ </string>
+ <string name="ScriptLimitsRequestError">
+ Fejl ved anmodning om information
+ </string>
+ <string name="ScriptLimitsRequestNoParcelSelected">
+ Ingen parcel valgt
+ </string>
+ <string name="ScriptLimitsRequestWrongRegion">
+ Fejl: script information er kun tilgængelig i den nuværende region
+ </string>
+ <string name="ScriptLimitsRequestWaiting">
+ Henter information...
+ </string>
+ <string name="ScriptLimitsRequestDontOwnParcel">
+ Du har ikke rettigheder til at undersøge denne parcel
+ </string>
+ <string name="SITTING_ON">
+ Sidder på
+ </string>
+ <string name="ATTACH_CHEST">
+ Bryst
+ </string>
+ <string name="ATTACH_HEAD">
+ Hoved
+ </string>
+ <string name="ATTACH_LSHOULDER">
+ Venstre skulder
+ </string>
+ <string name="ATTACH_RSHOULDER">
+ Højre skulder
+ </string>
+ <string name="ATTACH_LHAND">
+ Venstre hånd
+ </string>
+ <string name="ATTACH_RHAND">
+ Højre hånd
+ </string>
+ <string name="ATTACH_LFOOT">
+ Venstre fod
+ </string>
+ <string name="ATTACH_RFOOT">
+ Højre fod
+ </string>
+ <string name="ATTACH_BACK">
+ Ryg
+ </string>
+ <string name="ATTACH_PELVIS">
+ Bækken
+ </string>
+ <string name="ATTACH_MOUTH">
+ Mund
+ </string>
+ <string name="ATTACH_CHIN">
+ Hage
+ </string>
+ <string name="ATTACH_LEAR">
+ Venstre øre
+ </string>
+ <string name="ATTACH_REAR">
+ Højre øre
+ </string>
+ <string name="ATTACH_LEYE">
+ Venstre øje
+ </string>
+ <string name="ATTACH_REYE">
+ Højre øje
+ </string>
+ <string name="ATTACH_NOSE">
+ Næse
+ </string>
+ <string name="ATTACH_RUARM">
+ Højre overarm
+ </string>
+ <string name="ATTACH_RLARM">
+ Højre underarm
+ </string>
+ <string name="ATTACH_LUARM">
+ Venstre overarm
+ </string>
+ <string name="ATTACH_LLARM">
+ Venstre underarm
+ </string>
+ <string name="ATTACH_RHIP">
+ Højre hofte
+ </string>
+ <string name="ATTACH_RULEG">
+ Højre lår
+ </string>
+ <string name="ATTACH_RLLEG">
+ Højre underben
+ </string>
+ <string name="ATTACH_LHIP">
+ Venstre hofte
+ </string>
+ <string name="ATTACH_LULEG">
+ Venste lår
+ </string>
+ <string name="ATTACH_LLLEG">
+ Venstre underben
+ </string>
+ <string name="ATTACH_BELLY">
+ Mave
+ </string>
+ <string name="ATTACH_RPEC">
+ Højre bryst
+ </string>
+ <string name="ATTACH_LPEC">
+ Venstre bryst
+ </string>
+ <string name="ATTACH_HUD_CENTER_2">
+ HUD Center 2
+ </string>
+ <string name="ATTACH_HUD_TOP_RIGHT">
+ HUD Øverst til højre
+ </string>
+ <string name="ATTACH_HUD_TOP_CENTER">
+ HUD Foroven midtpå
+ </string>
+ <string name="ATTACH_HUD_TOP_LEFT">
+ HUD Øverst til venstre
+ </string>
+ <string name="ATTACH_HUD_CENTER_1">
+ HUD Center 1
+ </string>
+ <string name="ATTACH_HUD_BOTTOM_LEFT">
+ HUD Nederst til venstre
+ </string>
+ <string name="ATTACH_HUD_BOTTOM">
+ HUD For neden
+ </string>
+ <string name="ATTACH_HUD_BOTTOM_RIGHT">
+ HUD Nederst til højre
+ </string>
<string name="CursorPos">
Linie [LINE], Kolonne [COLUMN]
</string>
@@ -1315,6 +1467,15 @@ tekstur i din beholdning.
<string name="ClassifiedUpdateAfterPublish">
(vil blive opdateret efter offentliggørelse)
</string>
+ <string name="NoPicksClassifiedsText">
+ Du har ikke oprettet nogen favoritter eller annoncer. Klik på plus knappen nedenfor for at oprette en favorit eller en annonce.
+ </string>
+ <string name="NoAvatarPicksClassifiedsText">
+ Bruger har ingen favoritter eller annoncer
+ </string>
+ <string name="PicksClassifiedsLoadingText">
+ Henter...
+ </string>
<string name="MultiPreviewTitle">
Vis først
</string>
@@ -1391,16 +1552,27 @@ tekstur i din beholdning.
Ukendt fil efternavn [.%s]
Forventet .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
</string>
+ <string name="MuteObject2">
+ Blokér
+ </string>
<string name="AddLandmarkNavBarMenu">
Tilføj landemærke...
</string>
<string name="EditLandmarkNavBarMenu">
Redigér landemærke...
</string>
- <string name="accel-mac-control">⌃</string>
- <string name="accel-mac-command">⌘</string>
- <string name="accel-mac-option">⌥</string>
- <string name="accel-mac-shift">⇧</string>
+ <string name="accel-mac-control">
+ ⌃
+ </string>
+ <string name="accel-mac-command">
+ ⌘
+ </string>
+ <string name="accel-mac-option">
+ ⌥
+ </string>
+ <string name="accel-mac-shift">
+ ⇧
+ </string>
<string name="accel-win-control">
Ctrl+
</string>
@@ -1655,39 +1827,15 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Attached Earlobes">
Vedhæftede øreflipper
</string>
- <string name="Back Bangs">
- Nakkehår
- </string>
- <string name="Back Bangs Down">
- Nakkehår langt
- </string>
- <string name="Back Bangs Up">
- Nakkehår kort
- </string>
<string name="Back Fringe">
Nakkehår
</string>
- <string name="Back Hair">
- Volumen
- </string>
- <string name="Back Hair Down">
- Volumen nedad
- </string>
- <string name="Back Hair Up">
- Volumen op
- </string>
<string name="Baggy">
Posede
</string>
<string name="Bangs">
Pandehår
</string>
- <string name="Bangs Down">
- Pandehår ned
- </string>
- <string name="Bangs Up">
- Pandehår op
- </string>
<string name="Beady Eyes">
Stikkende øjne
</string>
@@ -1700,9 +1848,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Big Butt">
Stor bagdel
</string>
- <string name="Big Eyeball">
- Store øjenæbler
- </string>
<string name="Big Hair Back">
Stort hår: Bag
</string>
@@ -1877,9 +2022,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Corner Down">
Nedadvendt
</string>
- <string name="Corner Normal">
- Normalt
- </string>
<string name="Corner Up">
Opadvendt
</string>
@@ -1889,9 +2031,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Crooked Nose">
Skæv næse
</string>
- <string name="Cropped Hair">
- Kort hår
- </string>
<string name="Cuff Flare">
Svaj
</string>
@@ -1910,15 +2049,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Default Heels">
Standard hæle
</string>
- <string name="Default Toe">
- Standard snude
- </string>
<string name="Dense">
Tæt
</string>
- <string name="Dense hair">
- Tæt hår
- </string>
<string name="Double Chin">
Dobbelthage
</string>
@@ -1964,9 +2097,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Eye Spacing">
Øjenafstand
</string>
- <string name="Eyeball Size">
- Størrelse øjenæble
- </string>
<string name="Eyebrow Arc">
Bue på øjenbryn
</string>
@@ -1991,36 +2121,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Eyeliner Color">
Eyeliner farve
</string>
- <string name="Eyes Back">
- Dybtliggende øjne
- </string>
<string name="Eyes Bugged">
Udstående øjne
</string>
- <string name="Eyes Forward">
- Øjne fremme
- </string>
- <string name="Eyes Long Head">
- Eyes Long Head
- </string>
- <string name="Eyes Shear Left Up">
- Eyes Shear Left Up
- </string>
- <string name="Eyes Shear Right Up">
- Eyes Shear Right Up
- </string>
- <string name="Eyes Short Head">
- Eyes Short Head
- </string>
- <string name="Eyes Spread">
- Stor afstand
- </string>
- <string name="Eyes Sunken">
- Indsunkne øjne
- </string>
- <string name="Eyes Together">
- Tætsiddende
- </string>
<string name="Face Shear">
Ansigts symmetri
</string>
@@ -2030,30 +2133,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Far Set Eyes">
Stor afstand mellem øjne
</string>
- <string name="Fat">
- Tyk
- </string>
- <string name="Fat Head">
- Tykt hovede
- </string>
<string name="Fat Lips">
Tykke læber
</string>
- <string name="Fat Lower">
- Tyk nedre
- </string>
- <string name="Fat Lower Lip">
- Tyk underlæbe
- </string>
- <string name="Fat Torso">
- Tyk overkrop
- </string>
- <string name="Fat Upper">
- Tyk øvre
- </string>
- <string name="Fat Upper Lip">
- Tyk overlæbe
- </string>
<string name="Female">
Kvinde
</string>
@@ -2090,24 +2172,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Freckles">
Fregner
</string>
- <string name="Front Bangs Down">
- Pandehår - ned
- </string>
- <string name="Front Bangs Up">
- Pandehår - op
- </string>
<string name="Front Fringe">
Frynser foran
</string>
- <string name="Front Hair">
- HÃ¥r foran
- </string>
- <string name="Front Hair Down">
- HÃ¥r foran - ned
- </string>
- <string name="Front Hair Up">
- HÃ¥r foran - op
- </string>
<string name="Full Back">
Langt ud bagtil
</string>
@@ -2381,9 +2448,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Long arms">
Lange arme
</string>
- <string name="Longcuffs">
- Longcuffs
- </string>
<string name="Loose Pants">
Løse bukser
</string>
@@ -2546,9 +2610,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="No Eyeshadow">
Ingen øjenskygge
</string>
- <string name="No Heels">
- Ingen hæle
- </string>
<string name="No Lipgloss">
Ingen lipgloss
</string>
@@ -2606,9 +2667,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Nostril Width">
Næsebor bredde
</string>
- <string name="Old">
- Gammel
- </string>
<string name="Opaque">
Uigennemsigtig
</string>
@@ -2708,9 +2766,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Pointy Heels">
Spidse hæle
</string>
- <string name="Pointy Toe">
- Spids snude
- </string>
<string name="Ponytail">
Hestehale
</string>
@@ -2735,15 +2790,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Red Hair">
Rødt hår
</string>
- <string name="Red Skin">
- Rød hud
- </string>
<string name="Regular">
Almindelig
</string>
- <string name="Regular Muscles">
- Almindelige muskler
- </string>
<string name="Right Part">
Højre skildning
</string>
@@ -2753,9 +2802,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Round">
Rund
</string>
- <string name="Round Forehead">
- Rund pande
- </string>
<string name="Ruddiness">
Rødmossethed
</string>
@@ -2768,24 +2814,12 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Saddle Bags">
Ridebukselår
</string>
- <string name="Saddlebags">
- Ridebukselår
- </string>
- <string name="Scrawny">
- Radmager
- </string>
<string name="Scrawny Leg">
Magert ben
</string>
<string name="Separate">
Separat
</string>
- <string name="Shading">
- Skygger
- </string>
- <string name="Shadow hair">
- Skygge hår
- </string>
<string name="Shallow">
Lille
</string>
@@ -2798,15 +2832,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Shear Front">
"MÃ¥ne"
</string>
- <string name="Shear Left">
- Venstre
- </string>
<string name="Shear Left Up">
Venstre op
</string>
- <string name="Shear Right">
- Højre
- </string>
<string name="Shear Right Up">
Højre op
</string>
@@ -2867,15 +2895,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Shoulders">
Skuldre
</string>
- <string name="Side Bangs">
- Sidehår
- </string>
- <string name="Side Bangs Down">
- Ned
- </string>
- <string name="Side Bangs Up">
- Op
- </string>
<string name="Side Fringe">
Side frynser
</string>
@@ -2891,9 +2910,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Sides Hair Up">
Op
</string>
- <string name="Skinny">
- Tynd
- </string>
<string name="Skinny Neck">
Tynd hals
</string>
@@ -2942,9 +2958,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Socks Length">
Strømper - længde
</string>
- <string name="Some">
- Nogen
- </string>
<string name="Soulpatch">
Soulpatch
</string>
@@ -2963,9 +2976,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Squash Head">
Bredt hovede
</string>
- <string name="Squash/Stretch Head">
- Sammentryk/stræk hovede
- </string>
<string name="Stretch Head">
Stræk hovede
</string>
@@ -2984,18 +2994,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Sweep Forward">
Stryge fremad
</string>
- <string name="Swept Back">
- Tilbagestrøget
- </string>
- <string name="Swept Back Hair">
- Tilbagestrøget hår
- </string>
- <string name="Swept Forward">
- Fremadstrøget
- </string>
- <string name="Swept Forward Hair">
- Fremadstrøget hår
- </string>
<string name="Tall">
Høj
</string>
@@ -3014,9 +3012,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Thick Toe">
Bred snude
</string>
- <string name="Thickness">
- Tykkelse
- </string>
<string name="Thin">
Tynd
</string>
@@ -3047,12 +3042,6 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="Tight Sleeves">
Stramme ærmer
</string>
- <string name="Tilt Left">
- Hæld til venstre
- </string>
- <string name="Tilt Right">
- Hæld til højre
- </string>
<string name="Toe Shape">
Sko form
</string>
@@ -3194,6 +3183,21 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="IM_moderator_label">
(Moderator)
</string>
+ <string name="started_call">
+ Startet et stemme opkald
+ </string>
+ <string name="joined_call">
+ Tilsluttet stemme opkaldet
+ </string>
+ <string name="ringing-im">
+ Tilslutter stemme opkald...
+ </string>
+ <string name="connected-im">
+ Forbundet, klik på Forlad for at lægge på
+ </string>
+ <string name="hang_up-im">
+ Forladt stemme opkald
+ </string>
<string name="only_user_message">
Du er den eneste deltager i denne samtale
</string>
@@ -3204,7 +3208,10 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
Tryk på [BUTTON NAME] knappen for at acceptére/tilslutte til denne stemme chat.
</string>
<string name="muted_message">
- Du har blokeret denne beboer. Hvis du starter en samtale vil denne blokering automatisk blive fjernet.
+ Du har blokeret denne beboer. Sendes en besked, vil beboeren fjernes fra blokeringslisten.
+ </string>
+ <string name="generic">
+ Fejl ved anmodning, prøv venligst igen senere
</string>
<string name="generic_request_error">
Kunne ikke etablere forbindelse, prøv igen senere
@@ -3224,19 +3231,37 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
<string name="not_a_mod_error">
Du er ikke moderator for denne samtale.
</string>
+ <string name="muted">
+ En gruppe moderator har deaktiveret din tekst chat.
+ </string>
<string name="muted_error">
Du er blevet "blokeret".
</string>
<string name="add_session_event">
Ikke muligt at tilføge brugere til samtale med [RECIPIENT].
</string>
+ <string name="message">
+ Kunne ikke sende din besked til session med [RECIPIENT].
+ </string>
<string name="message_session_event">
Ikke muligt at sende din besked til samtalen med [RECIPIENT].
</string>
+ <string name="mute">
+ Fejl under moderation.
+ </string>
+ <string name="removed">
+ Du er blevet fjernet fra denne gruppe.
+ </string>
<string name="removed_from_group">
Du er blevet fjernet fra gruppen.
</string>
<string name="close_on_no_ability">
Du har ikke længere mulighed for at deltage i samtalen
</string>
+ <string name="unread_chat_single">
+ [SOURCES] har sagt noget nyt
+ </string>
+ <string name="unread_chat_multiple">
+ [SOURCES] har sagt noget nyt
+ </string>
</strings>
diff --git a/indra/newview/skins/default/xui/de/floater_bulk_perms.xml b/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
index a434b3a2faf23f300c74f74982cd29b581d50033..d3f0d6d78f66322841cd9ff8f78c1ba82e5c6123 100644
--- a/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="INHALTS-BERECHTIGUNGEN BEARBEITEN">
+<floater name="floaterbulkperms" title="BERECHTIGUNGEN BEARBEITEN">
<floater.string name="nothing_to_modify_text">
Auswahl enthält keinen Inhalt, der bearbeitet werden kann.
</floater.string>
diff --git a/indra/newview/skins/default/xui/de/floater_buy_currency.xml b/indra/newview/skins/default/xui/de/floater_buy_currency.xml
index 72959c7a0c743f0abed6f1807c4fb6845c7bf573..4bf4692e3670694a7c1a8ef23a154c5c5e2aedab 100644
--- a/indra/newview/skins/default/xui/de/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_currency.xml
@@ -52,7 +52,7 @@
Geben Sie den Betrag erneut ein, um die aktuellste Umtauschrate anzuzeigen.
</text>
<text name="purchase_warning_repurchase">
- Nach Bestätigung dieses Kaufs werden nur L$ gekauft, nicht das Objekt.
+ Achtung: Sie kaufen L$, nicht das Objekt.
</text>
<text name="purchase_warning_notenough">
Sie kaufen nicht genügend L$. Bitte erhöhen Sie den Betrag.
diff --git a/indra/newview/skins/default/xui/de/floater_camera.xml b/indra/newview/skins/default/xui/de/floater_camera.xml
index b8616ea1286fb33e9065f84382296a6d1a1a29c0..87371b05e3243df4df03d2ea60fa266297b5aabc 100644
--- a/indra/newview/skins/default/xui/de/floater_camera.xml
+++ b/indra/newview/skins/default/xui/de/floater_camera.xml
@@ -9,6 +9,18 @@
<floater.string name="move_tooltip">
Kamera nach oben, unten, links und rechts bewegen
</floater.string>
+ <floater.string name="orbit_mode_title">
+ Kreisen
+ </floater.string>
+ <floater.string name="pan_mode_title">
+ Schwenken
+ </floater.string>
+ <floater.string name="avatar_view_mode_title">
+ Voreinstellungen
+ </floater.string>
+ <floater.string name="free_mode_title">
+ Objekt ansehen
+ </floater.string>
<panel name="controls">
<joystick_track name="cam_track_stick" tool_tip="Kamera nach oben, unten, links und rechts bewegen"/>
<panel name="zoom" tool_tip="Kamera auf Fokus zoomen">
@@ -25,7 +37,7 @@
<panel name="buttons">
<button label="" name="orbit_btn" tool_tip="Kamera kreisen"/>
<button label="" name="pan_btn" tool_tip="Kamera schwenken"/>
- <button label="" name="avatarview_btn" tool_tip="Avatarsicht"/>
+ <button label="" name="avatarview_btn" tool_tip="Voreinstellungen"/>
<button label="" name="freecamera_btn" tool_tip="Objekt ansehen"/>
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_customize.xml b/indra/newview/skins/default/xui/de/floater_customize.xml
index cf7b208c1a90cbe04fa6551bfa1e2e4109fa8996..f45ae53e99cd2b1b689d2019714f2f70cfc9192d 100644
--- a/indra/newview/skins/default/xui/de/floater_customize.xml
+++ b/indra/newview/skins/default/xui/de/floater_customize.xml
@@ -105,7 +105,7 @@
In [PATH]
</text>
<text name="not worn instructions">
- Ziehen Sie Haar aus dem Inventar auf Ihren Avatar, um dieses anzulegen. Sie können aber auch eine neue erstellen und diese anlegen.
+ Ziehen Sie Haar aus dem Inventar auf Ihren Avatar, um dieses anzulegen. Sie können aber auch neues Haar erstellen und anlegen.
</text>
<text name="no modify instructions">
Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
@@ -136,7 +136,7 @@
In [PATH]
</text>
<text name="not worn instructions">
- Ziehen Sie neue Augen aus dem Inventar auf Ihren Avatar, um diese anzulegen. Sie können aber auch eine neue erstellen und diese anlegen.
+ Ziehen Sie neue Augen aus dem Inventar auf Ihren Avatar, um diese anzulegen. Sie können aber auch neue Augen erstellen und diese anlegen.
</text>
<text name="no modify instructions">
Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
@@ -177,7 +177,7 @@
In [PATH]
</text>
<text name="not worn instructions">
- Ziehen Sie ein neues Hemd aus dem Inventar auf Ihren Avatar, um dieses anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen.
+ Ziehen Sie ein neues Hemd aus dem Inventar auf Ihren Avatar, um dieses anzuziehen. Sie können aber auch ein neues Hemd erstellen und dieses anlegen.
</text>
<text name="no modify instructions">
Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
@@ -210,7 +210,7 @@
In [PATH]
</text>
<text name="not worn instructions">
- Ziehen Sie eine neue Hose aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen.
+ Ziehen Sie eine neue Hose aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anziehen.
</text>
<text name="no modify instructions">
Sie sind nicht berechtigt, diese Kleidung zu bearbeiten.
@@ -236,7 +236,7 @@
In [PATH]
</text>
<text name="not worn instructions">
- Ziehen Sie neue Schuhe aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen.
+ Ziehen Sie neue Schuhe aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch neue Schuhe erstellen und diese anlegen.
</text>
<button label="Neue Schuhe" label_selected="Neue Schuhe" name="Create New"/>
<text name="no modify instructions">
@@ -269,7 +269,7 @@
In [PATH]
</text>
<text name="not worn instructions">
- Ziehen Sie neue Strümpfe aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen.
+ Ziehen Sie neue Socken aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch neue erstellen und diese anziehen.
</text>
<button label="Neue Socken" label_selected="Neue Socken" name="Create New"/>
<text name="no modify instructions">
@@ -302,7 +302,7 @@
In [PATH]
</text>
<text name="not worn instructions">
- Ziehen Sie eine neue Jacke aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen.
+ Ziehen Sie eine neue Jacke aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anziehen.
</text>
<button label="Neue Jacke" label_selected="Neue Jacke" name="Create New"/>
<text name="no modify instructions">
@@ -336,7 +336,7 @@
In [PATH]
</text>
<text name="not worn instructions">
- Ziehen Sie neue Handschuhe aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen.
+ Ziehen Sie neue Handschuhe aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch neue erstellen und diese anziehen.
</text>
<button label="Neue Handschuhe" label_selected="Neue Handschuhe" name="Create New"/>
<text name="no modify instructions">
@@ -369,7 +369,7 @@
In [PATH]
</text>
<text name="not worn instructions">
- Ziehen Sie ein neues Unterhemd aus dem Inventar auf Ihren Avatar, um dieses anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen.
+ Ziehen Sie ein neues Unterhemd aus dem Inventar auf Ihren Avatar, um dieses anzuziehen. Sie können aber auch ein neues Unterhemd erstellen und dieses anziehen.
</text>
<button label="Neues Unterhemd" label_selected="Neues Unterhemd" name="Create New"/>
<text name="no modify instructions">
@@ -402,7 +402,7 @@
In [PATH]
</text>
<text name="not worn instructions">
- Ziehen Sie eine neue Unterhose aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen.
+ Ziehen Sie eine neue Unterhose aus dem Inventar auf Ihren Avatar, um diese anzuziehen. Sie können aber auch eine neue erstellen und diese anziehen.
</text>
<button label="Neue Unterhose" label_selected="Neue Unterhose" name="Create New"/>
<text name="no modify instructions">
@@ -435,7 +435,7 @@
In [PATH]
</text>
<text name="not worn instructions">
- Ziehen Sie einen neuen Rock aus dem Inventar auf Ihren Avatar, um diesen anzuziehen. Sie können aber auch eine neue erstellen und diese anlegen.
+ Ziehen Sie einen neuen Rock aus dem Inventar auf Ihren Avatar, um diesen anzuziehen. Sie können aber auch einen neuen Rock erstellen und diesen anziehen.
</text>
<button label="Neuer Rock" label_selected="Neuer Rock" name="Create New"/>
<text name="no modify instructions">
@@ -453,7 +453,7 @@
</panel>
<panel label="Tätowierung" name="Tattoo">
<text name="title">
- [BESCHR]
+ Tätowierung
</text>
<text name="title_no_modify">
[BESCHR]: bearbeiten nicht möglich
@@ -487,7 +487,7 @@
</panel>
<panel label="Alpha" name="Alpha">
<text name="title">
- [BESCHR]
+ Alpha
</text>
<text name="title_no_modify">
[BESCHR]: bearbeiten nicht möglich
diff --git a/indra/newview/skins/default/xui/de/floater_event.xml b/indra/newview/skins/default/xui/de/floater_event.xml
index a41ac521a3e91fa5760569e1d8dd155c1301c962..cf663e2e1bfc37505490a7fb53e448b0037976e3 100644
--- a/indra/newview/skins/default/xui/de/floater_event.xml
+++ b/indra/newview/skins/default/xui/de/floater_event.xml
@@ -9,6 +9,18 @@
<floater.string name="dont_notify">
Nicht benachrichtigen
</floater.string>
+ <floater.string name="moderate">
+ Moderat
+ </floater.string>
+ <floater.string name="adult">
+ Adult
+ </floater.string>
+ <floater.string name="general">
+ Allgemein
+ </floater.string>
+ <floater.string name="unknown">
+ Unbekannt
+ </floater.string>
<layout_stack name="layout">
<layout_panel name="profile_stack">
<text name="event_name">
@@ -21,12 +33,21 @@
Ausgeführt von:
</text>
<text initial_value="(wird in Datenbank gesucht)" name="event_runby"/>
+ <text name="event_date_label">
+ Datum:
+ </text>
<text name="event_date">
10/10/2010
</text>
+ <text name="event_duration_label">
+ Dauer:
+ </text>
<text name="event_duration">
1 Stunde
</text>
+ <text name="event_covercharge_label">
+ Eintritt:
+ </text>
<text name="event_cover">
Kostenlos
</text>
diff --git a/indra/newview/skins/default/xui/de/floater_im_session.xml b/indra/newview/skins/default/xui/de/floater_im_session.xml
index 7bde3a3453f790d970780e2653f5faf43051e412..c69bb600eace1d73e22f377195ccde29c3766aee 100644
--- a/indra/newview/skins/default/xui/de/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/de/floater_im_session.xml
@@ -3,7 +3,7 @@
<layout_stack name="im_panels">
<layout_panel label="IM Steuerkonsole" name="panel_im_control_panel"/>
<layout_panel>
- <line_editor label="Bis" name="chat_editor"/>
+ <line_editor label="An" name="chat_editor"/>
</layout_panel>
</layout_stack>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_moveview.xml b/indra/newview/skins/default/xui/de/floater_moveview.xml
index 03930c8ed6b68e0d81cac57ea1d2d313635ba3aa..b978322cefdf632e379bf52bbf185b3376bfc806 100644
--- a/indra/newview/skins/default/xui/de/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/de/floater_moveview.xml
@@ -18,6 +18,15 @@
<string name="fly_back_tooltip">
Rückwärts fliegen (Nach-Unten-Pfeil oder S drücken)
</string>
+ <string name="walk_title">
+ Gehen
+ </string>
+ <string name="run_title">
+ Rennen
+ </string>
+ <string name="fly_title">
+ Fliegen
+ </string>
<panel name="panel_actions">
<button label="" label_selected="" name="turn left btn" tool_tip="Nach links (Links-Pfeil oder A drücken)"/>
<button label="" label_selected="" name="turn right btn" tool_tip="Nach rechts (Rechts-Pfeil oder D drücken)"/>
@@ -30,6 +39,5 @@
<button label="" name="mode_walk_btn" tool_tip="Gehen"/>
<button label="" name="mode_run_btn" tool_tip="Rennen"/>
<button label="" name="mode_fly_btn" tool_tip="Fliegen"/>
- <button label="Landen" name="stop_fly_btn" tool_tip="Landen"/>
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_pay.xml b/indra/newview/skins/default/xui/de/floater_pay.xml
index fb89eeb600b9cdf639f2ee9d08304bf60abdcc18..ec3c45dccff9e4331d90fa066f445aaa2e1f392e 100644
--- a/indra/newview/skins/default/xui/de/floater_pay.xml
+++ b/indra/newview/skins/default/xui/de/floater_pay.xml
@@ -18,7 +18,7 @@
<button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
<button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
<text name="amount text">
- Oder Betrag auswählen:
+ oder Betrag auswählen:
</text>
<button label="Bezahlen" label_selected="Bezahlen" name="pay btn"/>
<button label="Abbrechen" label_selected="Abbrechen" name="cancel btn"/>
diff --git a/indra/newview/skins/default/xui/de/floater_pay_object.xml b/indra/newview/skins/default/xui/de/floater_pay_object.xml
index ff85efad503ab7d4609316fe3c9d76cfcd9ae215..59494cc10042184cd59cf53ef334072b6274dc13 100644
--- a/indra/newview/skins/default/xui/de/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/de/floater_pay_object.xml
@@ -22,7 +22,7 @@
<button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
<button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
<text name="amount text">
- Oder Betrag auswählen:
+ oder Betrag auswählen:
</text>
<button label="Bezahlen" label_selected="Bezahlen" name="pay btn"/>
<button label="Abbrechen" label_selected="Abbrechen" name="cancel btn" width="76"/>
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index 7646efccd4a82383405bfe8ec79fbe3d5a285bd0..4efe0dd7f3067055332c95eacb61f155cefbcc42 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -196,7 +196,7 @@
</combo_box>
<check_box label="Zum Verkauf:" name="checkbox for sale"/>
<combo_box name="sale type">
- <combo_box.item label="Kopieren" name="Copy"/>
+ <combo_box.item label="Kopie" name="Copy"/>
<combo_box.item label="Inhalt" name="Contents"/>
<combo_box.item label="Original" name="Original"/>
</combo_box>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_controls.xml b/indra/newview/skins/default/xui/de/floater_voice_controls.xml
index f978042cc2d7b2b6627c354a8694a3b81d030596..aa582838a4d805895ec575aa4589dcebb43f371a 100644
--- a/indra/newview/skins/default/xui/de/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/de/floater_voice_controls.xml
@@ -16,6 +16,9 @@
Es ist niemand in der Nähe, der Voice aktiviert hat.
</string>
<layout_stack name="my_call_stack">
+ <layout_panel name="my_panel">
+ <text name="user_text" value="Mein Avatar:"/>
+ </layout_panel>
<layout_panel name="leave_call_btn_panel">
<button label="Anruf beenden" name="leave_call_btn"/>
</layout_panel>
diff --git a/indra/newview/skins/default/xui/de/floater_water.xml b/indra/newview/skins/default/xui/de/floater_water.xml
index ecd6d7ff3e0d20a15785aee349d5d9a952bb7a83..097a60a4443bf769b5c166c884e4d208ea6f4fff 100644
--- a/indra/newview/skins/default/xui/de/floater_water.xml
+++ b/indra/newview/skins/default/xui/de/floater_water.xml
@@ -10,7 +10,7 @@
<button label="Speichern" label_selected="Speichern" name="WaterSavePreset"/>
<button label="Löschen" label_selected="Löschen" name="WaterDeletePreset"/>
<tab_container name="Water Tabs">
- <panel label="Einstellungen" name="Settings">
+ <panel label="EINSTELLUNGEN" name="Settings">
<text name="BHText">
Wassertrübungsfarbe
</text>
@@ -44,7 +44,7 @@
Mischungsmultiplikator
</text>
</panel>
- <panel label="Bild" name="Waves">
+ <panel label="BILD" name="Waves">
<text name="BHText">
Richtung große Welle
</text>
diff --git a/indra/newview/skins/default/xui/de/floater_windlight_options.xml b/indra/newview/skins/default/xui/de/floater_windlight_options.xml
index 3e06d8f06b4436da684f2859902150900e58b14f..5b59336f9dcda0251c93d6ab3e058ef20fc3401e 100644
--- a/indra/newview/skins/default/xui/de/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/de/floater_windlight_options.xml
@@ -8,7 +8,7 @@
<button label="Löschen" label_selected="Löschen" name="WLDeletePreset"/>
<button label="Tageszyklus-Editor" label_selected="Tageszyklus-Editor" name="WLDayCycleMenuButton"/>
<tab_container name="WindLight Tabs">
- <panel label="Atmosphäre" name="Atmosphere">
+ <panel label="ATMOSPHÄRE" name="Atmosphere">
<text name="BHText">
Horizontfarbe
</text>
@@ -62,7 +62,7 @@
</text>
<button label=" ?" name="WLMaxAltitudeHelp"/>
</panel>
- <panel label="Licht" name="Lighting">
+ <panel label="LICHT" name="Lighting">
<text name="SLCText">
Sonne/Mond-Farbe
</text>
@@ -118,7 +118,7 @@
</text>
<button label=" ?" name="WLStarBrightnessHelp"/>
</panel>
- <panel label="Wolken" name="Clouds">
+ <panel label="WOLKEN" name="Clouds">
<text name="WLCloudColorText">
Wolkenfarbe
</text>
diff --git a/indra/newview/skins/default/xui/de/floater_world_map.xml b/indra/newview/skins/default/xui/de/floater_world_map.xml
index 525836465603ef4b4b966bc2ea8a9bd94d4d9049..a80be2b594d1ffb4c23696a2bed4eccf92660d85 100644
--- a/indra/newview/skins/default/xui/de/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/de/floater_world_map.xml
@@ -38,7 +38,7 @@
</text>
<check_box label="PG" name="event_chk"/>
<text name="pg_label">
- Allgemein
+ Generell
</text>
<check_box initial_value="true" label="Mature" name="event_mature_chk"/>
<text name="mature_label">
diff --git a/indra/newview/skins/default/xui/de/menu_inventory_add.xml b/indra/newview/skins/default/xui/de/menu_inventory_add.xml
index 448b1d80bf765d6f8e39968387aa838326e085d2..531edc02f1697ceae9d06972d90af0615ca7f4a4 100644
--- a/indra/newview/skins/default/xui/de/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/de/menu_inventory_add.xml
@@ -20,7 +20,7 @@
<menu_item_call label="Neue Handschuhe" name="New Gloves"/>
<menu_item_call label="Neues Unterhemd" name="New Undershirt"/>
<menu_item_call label="Neue Unterhose" name="New Underpants"/>
- <menu_item_call label="Alpha: Neu" name="New Alpha"/>
+ <menu_item_call label="Neues Alpha" name="New Alpha"/>
<menu_item_call label="Neue Tätowierung" name="New Tattoo"/>
</menu>
<menu label="Neue Körperteile" name="New Body Parts">
diff --git a/indra/newview/skins/default/xui/de/menu_object.xml b/indra/newview/skins/default/xui/de/menu_object.xml
index 320f93c796efc034db4e2ec4f363b52552fed909..8bb7b66482bbcde165a991970fbc032a0d768e56 100644
--- a/indra/newview/skins/default/xui/de/menu_object.xml
+++ b/indra/newview/skins/default/xui/de/menu_object.xml
@@ -5,6 +5,7 @@
<menu_item_call label="Bauen" name="Build"/>
<menu_item_call label="Öffnen" name="Open"/>
<menu_item_call label="Hier sitzen" name="Object Sit"/>
+ <menu_item_call label="Aufstehen" name="Object Stand Up"/>
<menu_item_call label="Objektprofil" name="Object Inspect"/>
<menu_item_call label="Hineinzoomen" name="Zoom In"/>
<context_menu label="Anziehen â–¶" name="Put On">
@@ -18,6 +19,7 @@
<menu_item_call label="Zurückgeben" name="Return..."/>
<menu_item_call label="Löschen" name="Delete"/>
</context_menu>
+ <menu_item_call label="Kaufen" name="Pie Object Bye"/>
<menu_item_call label="Nehmen" name="Pie Object Take"/>
<menu_item_call label="Kopie nehmen" name="Take Copy"/>
<menu_item_call label="Bezahlen" name="Pay..."/>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby.xml b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
index a69ef3891a20efea0b20f24852aa9052c28c1b7e..1db964357fe9bbcf2b561dc5586fa3b531a1d9dd 100644
--- a/indra/newview/skins/default/xui/de/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
@@ -5,6 +5,7 @@
<menu_item_call label="Freund entfernen" name="Remove Friend"/>
<menu_item_call label="IM" name="IM"/>
<menu_item_call label="Anrufen" name="Call"/>
+ <menu_item_call label="Karte" name="Map"/>
<menu_item_call label="Teilen" name="Share"/>
<menu_item_call label="Bezahlen" name="Pay"/>
<menu_item_check label="Ignorieren/Freischalten" name="Block/Unblock"/>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index a04532376c4d921f62aa0d655873f9b476b8cf40..c628cb4b6118049d65cf2249b01d8e6e86398b6f 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -43,6 +43,8 @@
<menu_item_check label="Strahlen" name="beacons"/>
<menu_item_check label="Grundstücksgrenzen" name="Property Lines"/>
<menu_item_check label="Landeigentümer" name="Land Owners"/>
+ <menu_item_check label="Koordinaten" name="Coordinates"/>
+ <menu_item_check label="Parzelleneigenschaften" name="Parcel Properties"/>
</menu>
<menu_item_call label="Teleport nach Hause" name="Teleport Home"/>
<menu_item_call label="Hier als Zuhause wählen" name="Set Home to Here"/>
@@ -81,7 +83,8 @@
<menu_item_call label="Fokus auf Auswahl" name="Focus on Selection"/>
<menu_item_call label="Auf Auswahl zoomen" name="Zoom to Selection"/>
<menu label="Objekt" name="Object">
- <menu_item_call label="Kaufen" name="Menu Object Take"/>
+ <menu_item_call label="Kaufen" name="Menu Object Buy"/>
+ <menu_item_call label="Nehmen" name="Menu Object Take"/>
<menu_item_call label="Kopie nehmen" name="Take Copy"/>
<menu_item_call label="Objekt wieder in meinem Inventar speichern" name="Save Object Back to My Inventory"/>
<menu_item_call label="Wieder in Objektinhalt speichern" name="Save Object Back to Object Contents"/>
@@ -159,7 +162,7 @@
<menu_item_check label="Partikel" name="Particles"/>
<menu_item_check label="Unebenheiten" name="Bump"/>
</menu>
- <menu label="Rederning-Eigenschaften" name="Rendering Features">
+ <menu label="Rendering-Eigenschaften" name="Rendering Features">
<menu_item_check label="UI" name="UI"/>
<menu_item_check label="Ausgewählt" name="Selected"/>
<menu_item_check label="Farblich hervorgehoben" name="Highlighted"/>
@@ -169,7 +172,7 @@
<menu_item_check label="FRInfo testen" name="Test FRInfo"/>
<menu_item_check label="Flexible Objekte" name="Flexible Objects"/>
</menu>
- <menu_item_check label="Mehrer Threads ausführen" name="Run Multiple Threads"/>
+ <menu_item_check label="Mehrere Threads ausführen" name="Run Multiple Threads"/>
<menu_item_call label="Gruppen-Cache löschen" name="ClearGroupCache"/>
<menu_item_check label="Weiche Mausbewegung" name="Mouse Smoothing"/>
<menu label="Tastaturkürzel" name="Shortcuts">
@@ -405,7 +408,7 @@
<menu_item_call label="Offizielles Linden-Blog" name="Official Linden Blog"/>
<menu_item_call label="Scripting-Portal" name="Scripting Portal"/>
<menu label="Fehlermeldungen" name="Bug Reporting">
- <menu_item_call label="Allgemeine Probleme-Tracker" name="Public Issue Tracker"/>
+ <menu_item_call label="Allgemeiner Probleme-Tracker" name="Public Issue Tracker"/>
<menu_item_call label="Hilfe zum Allgemeinen Probleme-Tracker" name="Publc Issue Tracker Help"/>
<menu_item_call label="Fehlermeldungs-1x1" name="Bug Reporing 101"/>
<menu_item_call label="Sicherheitsfragen" name="Security Issues"/>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index da4a96962e4bde5e9993110a4b31305279b95459..acfbee7f36f98d5285ac8f9ca592f4cfc685a751 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -207,15 +207,15 @@ Bitte laden Sie innerhalb von 48 Stunden Mitglieder in Ihre Gruppe ein.
Wählen Sie eine bestimmte Person aus, wenn Sie für 0 L$ verkaufen.
</notification>
<notification name="ConfirmLandSaleChange">
- Die ausgewählten [LAND_SIZE] qm Land werden zum Verkauf freigegeben.
-Der Verkaufspreis beträgt [SALE_PRICE] L$ und wird automatisch für den Verkauf an [NAME] autorisiert.
+ Die ausgewählten [LAND_SIZE] m² Land werden zum Verkauf freigegeben.
+Der Verkaufspreis beträgt [SALE_PRICE] L$. Der Verkauf an [NAME] wird zu diesem Preis freigegeben.
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
<notification name="ConfirmLandSaleToAnyoneChange">
ACHTUNG: Wenn Sie auf An jeden verkaufen klicken, kann jeder in [SECOND_LIFE] Ihr Land kaufen, auch Einwohner in anderen Regionen.
Die ausgewählten [LAND_SIZE] m² Land werden zum Verkauf freigegeben.
-Der Verkaufspreis beträgt [SALE_PRICE] L$ und wird automatisch für den Verkauf an [NAME] autorisiert.
+Der Verkaufspreis beträgt [SALE_PRICE] L$. Der Verkauf an [NAME] wird zu diesem Preis freigegeben.
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
<notification name="ReturnObjectsDeededToGroup">
@@ -455,7 +455,6 @@ Das Objekt ist möglicherweise außer Reichweite oder wurde gelöscht.
<notification name="UnsupportedHardware">
Ihr Computer entspricht leider nicht den Mindestanforderungen von [APP_NAME]. Dies kann zur Folge haben, dass das Programm nicht sehr gut ausgeführt wird. Bei nicht unterstützten Systemkonfigurationen kann Ihnen unser [SUPPORT_SITE] leider nicht helfen.
-MINDESTANF.
Weitere Informationen finden Sie auf [_URL].
<url name="url" option="0">
http://secondlife.com/support/sysreqs.php?lang=de
@@ -1741,7 +1740,7 @@ Inventarobjekt(e) verschieben?
<usetemplate ignoretext="Bestätigen, bevor Sitzung beendet wird" name="okcancelignore" notext="Nicht beenden" yestext="Beenden"/>
</notification>
<notification name="HelpReportAbuseEmailLL">
- Mit dieser Funktion können Sie Verstöße gegen die [http://secondlife.com/corporate/tos.php Servicebedingungen (EN)] and [http://secondlife.com/corporate/cs.php Community-Standards] melden.
+ Mit dieser Funktion können Sie Verstöße gegen die [http://secondlife.com/corporate/tos.php Servicebedingungen (EN)] und [http://secondlife.com/corporate/cs.php Community-Standards] melden.
Alle gemeldeten Verstöße werden bearbeitet.
</notification>
@@ -2062,9 +2061,9 @@ Wählen Sie ein einzelnes Objekt aus.
Ihre Visitenkarte wurde abgelehnt.
</notification>
<notification name="TeleportToLandmark">
- Sie können an Positionen wie „[NAME]“ teleportieren, wenn Sie rechts in Ihrem Bildschirm die Tafel „Orte“ öffnen und dann die Registerkarte „Landmarken“ auswählen.
-Klicken Sie auf eine Landmarke, um diese auszuwählen. Klicken Sie anschließend auf „Teleport“ unten in der Konsole.
-(Sie können auch auf die Landmarke doppelt klicken oder mit rechts auf die Landmarke klicken und dann „Teleport“ auswählen).
+ Sie können an Positionen wie „[NAME]“ teleportieren, wenn Sie rechts in Ihrem Bildschirm die Tafel „Orte“ öffnen und dann die Registerkarte „Meine Landmarken“ auswählen.
+Klicken Sie auf eine Landmarke, um diese auszuwählen. Klicken Sie anschließend auf unten in der Registerkarte auf „Teleportieren“.
+(Sie können auch auf die Landmarke doppelt klicken oder mit rechts auf die Landmarke klicken und dann „Teleportieren“ auswählen).
</notification>
<notification name="TeleportToPerson">
Sie können Einwohner wie „[NAME]“ kontaktieren, wenn Sie die Tafel „Leute“ auf der rechten Seite Ihres Bildschirms öffnen.
@@ -2079,7 +2078,7 @@ Wählen Sie eine kleinere Landfläche.
Einige Begriffe in Ihrer Suchanfrage wurden ausgeschlossen, aufgrund von in den Community Standards definierten Inhaltsbeschränkungen.
</notification>
<notification name="NoContentToSearch">
- Bitte wählen Sie mindestens eine Inhaltsart für die Suche aus (Allgemein, Moderat oder Adult).
+ Bitte wählen Sie mindestens eine Inhaltsart für die Suche aus (Generell, Moderat oder Adult).
</notification>
<notification name="GroupVote">
[NAME] hat eine Abstimmung vorgeschlagen über:
@@ -2353,6 +2352,12 @@ Versuchen Sie es in einigen Minuten erneut.
<notification name="FriendshipDeclined">
[NAME] hat Ihr Freundschaftsangebot abgelehnt.
</notification>
+ <notification name="FriendshipAcceptedByMe">
+ Ihr Freundschaftsangebot wurde angeommen.
+ </notification>
+ <notification name="FriendshipDeclinedByMe">
+ Ihr Freundschaftsangebot wurde abgelehnt.
+ </notification>
<notification name="OfferCallingCard">
[FIRST] [LAST] bietet Ihnen ihre/seine Visitenkarte an.
Ihrem Inventar wird ein Lesezeichen erstellt, damit Sie diesem Einwohner einfach eine IM schicken können.
@@ -2562,7 +2567,7 @@ Diese werden für ein paar Sekunden sicherheitshalber gesperrt.
</notification>
<notification name="ConfirmCloseAll">
Möchten Sie wirklich alle IMs schließen?
- <usetemplate name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+ <usetemplate ignoretext="Bestätigen, bevor ich alle IMs schließe." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
</notification>
<notification name="AttachmentSaved">
Der Anhang wurde gespeichert.
diff --git a/indra/newview/skins/default/xui/de/panel_classified_info.xml b/indra/newview/skins/default/xui/de/panel_classified_info.xml
index d824eff338c2188b2136282f396598260cdfa277..2bbbaf25371891d7bbd2a77ffd740920ab45c8ad 100644
--- a/indra/newview/skins/default/xui/de/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/de/panel_classified_info.xml
@@ -4,7 +4,7 @@
Moderat
</panel.string>
<panel.string name="type_pg">
- Allgemeiner Inhalt
+ Genereller Inhalt
</panel.string>
<panel.string name="l$_price">
[PRICE] L$
diff --git a/indra/newview/skins/default/xui/de/panel_group_general.xml b/indra/newview/skins/default/xui/de/panel_group_general.xml
index 0d3c082a161d1bf116774c4f06bfb47b022ff145..f300679e16366ea416cc74a442be4de3a296a7b2 100644
--- a/indra/newview/skins/default/xui/de/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_general.xml
@@ -47,7 +47,7 @@ Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen.
<check_box label="Kosten für Beitritt" name="check_enrollment_fee" tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen"/>
<spinner label="L$" name="spin_enrollment_fee" tool_tip="Wenn Beitrittsgebühr aktiviert ist, müssen neue Mitglieder diesen Betrag zahlen."/>
<combo_box name="group_mature_check" tool_tip="Legt fest, ob Ihre Gruppeninformation moderate Inhalte enthält">
- <combo_box.item label="Allgemeiner Inhalt" name="pg"/>
+ <combo_box.item label="Genereller Inhalt" name="pg"/>
<combo_box.item label="Moderater Inhalt" name="mature"/>
</combo_box>
<check_box initial_value="true" label="In Suche anzeigen" name="show_in_group_list" tool_tip="Diese Gruppe in Suchergebnissen anzeigen"/>
diff --git a/indra/newview/skins/default/xui/de/panel_group_invite.xml b/indra/newview/skins/default/xui/de/panel_group_invite.xml
index fb357093bb161031c2f8970b21f752505586645d..dfc1e267501bdb51560bfb988438a3823faa2c69 100644
--- a/indra/newview/skins/default/xui/de/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_invite.xml
@@ -10,7 +10,7 @@
Einige der ausgewählten Einwohner sind bereits Gruppenmitglieder und haben aus diesem Grund keine Einladung erhalten.
</panel.string>
<text name="help_text" top="10">
- Sie können mehrere Einwohner auswählen, um diese in Ihre Gruppe einzuladen. Klicken Sie hierzu auf „Einwohnerliste öffnen“.
+ Sie können mehrere Einwohner Ihre Gruppe einladen. Klicken Sie hierzu auf „Einwohnerliste öffnen“.
</text>
<button label="Einwohnerliste öffnen" name="add_button" tool_tip="" top_delta="62"/>
<name_list name="invitee_list" tool_tip="Halten Sie zur Mehrfachauswahl die Strg-Taste gedrückt und klicken Sie auf die Namen."/>
diff --git a/indra/newview/skins/default/xui/de/panel_main_inventory.xml b/indra/newview/skins/default/xui/de/panel_main_inventory.xml
index eed365a1bbca5cbb810b62c3af06ff6c5d2643b9..7d57a3b3f26554101ba2cf85456e148b41ae381e 100644
--- a/indra/newview/skins/default/xui/de/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml
@@ -44,7 +44,7 @@
<menu_item_call label="Neue Handschuhe" name="New Gloves"/>
<menu_item_call label="Neues Unterhemd" name="New Undershirt"/>
<menu_item_call label="Neue Unterhose" name="New Underpants"/>
- <menu_item_call label="Alpha: Neu" name="New Alpha"/>
+ <menu_item_call label="Neues Alpha" name="New Alpha"/>
<menu_item_call label="Neue Tätowierung" name="New Tattoo"/>
</menu>
<menu label="Neue Körperteile" name="New Body Parts">
diff --git a/indra/newview/skins/default/xui/de/panel_online_status_toast.xml b/indra/newview/skins/default/xui/de/panel_online_status_toast.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7c7448c06117cf11ea2a32a8b2535cd398fb2f22
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_online_status_toast.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Freunde_online_Status" name="friend_online_status"/>
diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml
index a119c86b473cfc94da01dd3fbcdfc73d67a2c1cc..cf61f0870db90d160e409875791a6976117737b5 100644
--- a/indra/newview/skins/default/xui/de/panel_people.xml
+++ b/indra/newview/skins/default/xui/de/panel_people.xml
@@ -21,7 +21,7 @@
<accordion_tab name="tab_all" title="Alle"/>
</accordion>
<text name="no_friends_msg">
- Verwenden Sie [secondlife:///app/search/people die globale Suche], um Freunde hinzuzufügen. Oder klicken Sie auf einen Einwohner und fügen Sie diesen als Freund hinzu.
+ Verwenden Sie [secondlife:///app/search/people die globale Suche], um Freunde hinzuzufügen. Oder klicken Sie mit rechts auf einen Einwohner und fügen Sie diesen als Freund hinzu.
Wenn Sie nach Orten suchen, an denen sich Leute befinden, verwenden Sie [secondlife:///app/worldmap die Karte].
</text>
<panel label="bottom_panel" name="bottom_panel">
diff --git a/indra/newview/skins/default/xui/de/panel_places.xml b/indra/newview/skins/default/xui/de/panel_places.xml
index 7359a4fda451513c9dcb6eae8654a0ddd38c2318..2215ea3988a692ebbad1dd6576e107ce5548354b 100644
--- a/indra/newview/skins/default/xui/de/panel_places.xml
+++ b/indra/newview/skins/default/xui/de/panel_places.xml
@@ -7,9 +7,9 @@
<button label="Teleportieren" name="teleport_btn" tool_tip="Zu ausgewähltem Standort teleportieren"/>
<button label="Karte" name="map_btn" width="60"/>
<button label="Bearbeiten" name="edit_btn" tool_tip="Landmarken-Info bearbeiten"/>
- <button name="overflow_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
- <button label="Schließen" name="close_btn"/>
- <button label="Abbrechen" name="cancel_btn" width="66"/>
+ <button label="▼" name="overflow_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
<button label="Speichern" name="save_btn" width="66"/>
+ <button label="Abbrechen" name="cancel_btn" width="66"/>
+ <button label="Schließen" name="close_btn"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
index bd9e10b641ac7e628937e9667119d5110334e9b8..b59a7798532b8ac0c8089bc357cbaa64d1f66b99 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
@@ -20,13 +20,13 @@
(Erfordert Neustart)
</text>
<text name="maturity_desired_prompt" width="350">
- Ich möchte auf Inhalt mit folgender Alterseinstufung zugreifen:
+ Ich möchte auf Inhalt mit folgender Einstufung zugreifen:
</text>
<text name="maturity_desired_textbox"/>
<combo_box name="maturity_desired_combobox">
- <combo_box.item label="Allgemein, Moderat, Adult" name="Desired_Adult"/>
- <combo_box.item label="Allgemein und Moderat" name="Desired_Mature"/>
- <combo_box.item label="Allgemein" name="Desired_PG"/>
+ <combo_box.item label="Generell, Moderat, Adult" name="Desired_Adult"/>
+ <combo_box.item label="Generell und Moderat" name="Desired_Mature"/>
+ <combo_box.item label="Generell" name="Desired_PG"/>
</combo_box>
<text name="start_location_textbox">
Startstandort:
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
index e7bb7689252a321540a9c8f8ca737ad7d057f161..16b4598486a9900117598c9b222833a0eb95e715 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
@@ -55,7 +55,7 @@
<text name="AvatarRenderingText">
Avatar-Darstellung:
</text>
- <check_box initial_value="true" label="Scheinavatare" name="AvatarImpostors"/>
+ <check_box initial_value="true" label="Vereinfachte Avatardarstellung" name="AvatarImpostors"/>
<check_box initial_value="true" label="Hardware-Hautberechnung" name="AvatarVertexProgram"/>
<check_box initial_value="true" label="Avatar-Kleidung" name="AvatarCloth"/>
<slider label="Sichtweite:" name="DrawDistance"/>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
index b01db30c82604c9c1aece17419846d0bd0579940..96a86ed85d5acce8ec39da07950b21e4f4ae9c48 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
@@ -13,9 +13,12 @@
<check_box label="Aktiviert" name="enable_voice_check"/>
<check_box label="Automatische Wiedergabe zulassen" name="media_auto_play_btn" tool_tip="Hier aktivieren, um Medien automatisch wiederzugeben." value="wahr"/>
<check_box label="Medien, die an andere Avatare angehängt sind, wiedergeben." name="media_show_on_others_btn" tool_tip="Diese Option deaktivieren, um Medien für andere Avataren, die sich in der Nähe befinden, auszublenden." value="wahr"/>
- <text name="Listen from">
+ <text name="voice_chat_settings">
Voice-Chat-Einstellungen
</text>
+ <text name="Listen from">
+ Zuhören von:
+ </text>
<radio_group name="ear_location">
<radio_item label="Kameraposition" name="0"/>
<radio_item label="Avatarposition" name="1"/>
diff --git a/indra/newview/skins/default/xui/de/panel_region_general.xml b/indra/newview/skins/default/xui/de/panel_region_general.xml
index 978b701054c7416da0e9d9b3844dfe06c05f715e..2885e5bd3ac128c2da046ecf12268b200f13e8f2 100644
--- a/indra/newview/skins/default/xui/de/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_general.xml
@@ -36,7 +36,7 @@
<button label="?" name="agent_limit_help"/>
<spinner label="Objektbonus" name="object_bonus_spin"/>
<button label="?" name="object_bonus_help"/>
- <text label="Alterseinstufung" name="access_text">
+ <text label="Inhaltseinstufung" name="access_text">
Einstufung:
</text>
<combo_box label="Moderat" name="access_combo">
diff --git a/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml
index 5b8137af4ad91f5f7885b22f607c6c7a248017d6..be2142900740880c63b6593e56b15b80f44e79d7 100644
--- a/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml
@@ -2,5 +2,5 @@
<!-- Width and height of this panel should be synchronized with "panel_modes" in the floater_moveview.xml-->
<panel name="panel_stand_stop_flying">
<button label="Stehen" name="stand_btn" tool_tip="Klicken Sie hier, um aufzustehen."/>
- <button label="Landen" name="stop_fly_btn" tool_tip="Landen"/>
+ <button label="Flug stoppen" name="stop_fly_btn" tool_tip="Flug stoppen"/>
</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_status_bar.xml b/indra/newview/skins/default/xui/de/panel_status_bar.xml
index 283df990aede837ebcf981da8cd4d11388941419..0e182fa417809cb24f5b426c3590fb93db5cfe8b 100644
--- a/indra/newview/skins/default/xui/de/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/de/panel_status_bar.xml
@@ -22,10 +22,10 @@
[AMT] L$
</panel.string>
<button label="" label_selected="" name="buycurrency" tool_tip="Mein Kontostand"/>
- <button label="L$ kaufen" name="buyL" tool_tip="Hier klicken, um mehr L$ zu kaufen"/>
+ <button label="Kaufen" name="buyL" tool_tip="Hier klicken, um mehr L$ zu kaufen"/>
<text name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)">
24:00 H PST
</text>
- <button name="media_toggle_btn" tool_tip="Klicken, um Medien ein-/auszuschalten"/>
+ <button name="media_toggle_btn" tool_tip="Alle Medien starten/stoppen (Musik, Video, Webseiten)"/>
<button name="volume_btn" tool_tip="Steuerung der Gesamtlautstärke"/>
</panel>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 28b259896d83532ba7353eacaa974ad8da5249fc..c4b540d08a438eaafdd855a16d786582170f4dec 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -636,7 +636,7 @@
Nicht verbunden
</string>
<string name="SIM_ACCESS_PG">
- Allgemein
+ Generell
</string>
<string name="SIM_ACCESS_MATURE">
Moderat
@@ -828,7 +828,7 @@
Im Inventar wurden keine passenden Objekte gefunden. Versuchen Sie es mit [secondlife:///app/search/groups „Suche"].
</string>
<string name="FavoritesNoMatchingItems">
- Hier eine Landmarke hin ziehen, um diese zu Ihrem Favoriten hinzuzufügen.
+ Landmarke hier hin ziehen, um diese hinzuzufügen.
</string>
<string name="InventoryNoTexture">
Sie haben keine Kopie dieser Textur in Ihrem Inventar.
@@ -1506,6 +1506,9 @@
<string name="NoPicksClassifiedsText">
Sie haben keine Auswahl oder Anzeigen erstelllt. Klicken Sie auf die „Plus"-Schaltfläche, um eine Auswahl oder Anzeige zu erstellen.
</string>
+ <string name="NoAvatarPicksClassifiedsText">
+ Der Einwohner hat eine Auswahl oder Anzeigen im Profil.
+ </string>
<string name="PicksClassifiedsLoadingText">
Wird geladen...
</string>
@@ -3268,7 +3271,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
Für Instant Message hier klicken.
</string>
<string name="IM_to_label">
- Bis
+ An
</string>
<string name="IM_moderator_label">
(Moderator)
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 58ea7cec9cd0a532405de70e916949edc9cd0444..29c6ae800910dc6c8f422e7f4f54073deb5b856d 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -46,7 +46,7 @@
top="0">
<panel.string
name="new users only">
- New users only
+ New Residents only
</panel.string>
<panel.string
name="anyone">
diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml
index 98508e5113a32335df758abcb4e5c6274ec94277..125b080519646c3c0702133f89763969d5d693ad 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml
@@ -64,7 +64,7 @@ Try selecting a smaller area.
</floater.string>
<floater.string
name="not_owned_by_you">
- Land owned by another user is selected.
+ Land owned by another Resident is selected.
Try selecting a smaller area.
</floater.string>
<floater.string
diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml
index 0fac6cd5f17ec01626c53b5c4145dd2fa5accf6d..36ef6beb592e80c34bff47d66bb04852dffae573 100644
--- a/indra/newview/skins/default/xui/en/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml
@@ -31,8 +31,8 @@
<button
follows="left|top"
height="20"
- label="Kick all users"
- label_selected="Kick all users"
+ label="Kick all Residents"
+ label_selected="Kick all Residents"
layout="topleft"
left="10"
name="Kick all users"
diff --git a/indra/newview/skins/default/xui/en/floater_im.xml b/indra/newview/skins/default/xui/en/floater_im.xml
index a21242ffe171cb819bbee4d1cea5c28a5d16570e..55efe83820c07c41315c4ced38755ac81d7e466b 100644
--- a/indra/newview/skins/default/xui/en/floater_im.xml
+++ b/indra/newview/skins/default/xui/en/floater_im.xml
@@ -14,7 +14,7 @@
width="419">
<multi_floater.string
name="only_user_message">
- You are the only user in this session.
+ You are the only Resident in this session.
</multi_floater.string>
<multi_floater.string
name="offline_message">
@@ -54,7 +54,7 @@
</multi_floater.string>
<multi_floater.string
name="add_session_event">
- Unable to add users to chat session with [RECIPIENT].
+ Unable to add Residents to chat session with [RECIPIENT].
</multi_floater.string>
<multi_floater.string
name="message_session_event">
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index d2e54731573870fe48dfb4261048a507f01aadb1..25016e067331ceff55b42c0888df003b265c3cee 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -2,6 +2,7 @@
<floater
legacy_header_height="18"
background_visible="true"
+ default_tab_group="1"
follows="all"
height="350"
layout="topleft"
@@ -18,12 +19,14 @@
min_height="190">
<layout_stack
animate="false"
+ default_tab_group="2"
follows="all"
height="320"
width="360"
layout="topleft"
orientation="horizontal"
name="im_panels"
+ tab_group="1"
top="20"
left="0">
<layout_panel
@@ -35,7 +38,9 @@
auto_resize="false"
user_resize="true" />
<layout_panel
+ default_tab_group="3"
left="0"
+ tab_group="2"
top="0"
height="200"
width="245"
@@ -75,6 +80,7 @@
label="To"
layout="bottomleft"
name="chat_editor"
+ tab_group="3"
width="240">
</line_editor>
</layout_panel>
diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml
index 3f7642fafef07128cdc97d562279eb90be5b9f81..bea35e5fc17becd6b09444d84d1b70811aad6eca 100644
--- a/indra/newview/skins/default/xui/en/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/en/floater_inspect.xml
@@ -16,7 +16,7 @@
[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
</floater.string>
<scroll_list
- bottom="270"
+ bottom="268"
column_padding="0"
draw_heading="true"
follows="top|right|left|bottom"
@@ -47,23 +47,23 @@
</scroll_list>
<button
follows="left|bottom"
- height="20"
+ height="23"
label="See Owner Profile..."
layout="topleft"
- left_delta="0"
+ left_delta="-1"
name="button owner"
tool_tip="See profile of the highlighted object's owner"
- top_pad="5"
+ top_pad="4"
width="150">
<button.commit_callback
function="Inspect.OwnerProfile" />
</button>
<button
follows="left|bottom"
- height="20"
+ height="23"
label="See Creator Profile..."
layout="topleft"
- left_pad="10"
+ left_pad="5"
name="button creator"
tool_tip="See profile of the highlighted object's original creator"
top_delta="0"
diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3225843d09bffdab2a14e07a1664a18d4f72115a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_minimize="false"
+ height="200"
+ layout="topleft"
+ name="publish_classified"
+ help_topic="price_for_listing"
+ title="Publishing Classified"
+ width="320">
+ <text
+ top="20"
+ follows="top|left"
+ font="SansSerif"
+ height="60"
+ layout="topleft"
+ left="15"
+ word_wrap="true"
+ name="explanation_text">
+
+Your classified ad will run for one week from the date it is published.
+
+Remember, Classified fees are non-refundable.
+
+ </text>
+ <spinner
+ decimal_digits="0"
+ follows="left|top"
+ halign="left"
+ height="23"
+ increment="1"
+ label_width="70"
+ label="Price for Ad: "
+ v_pad="10"
+ layout="topleft"
+ left="15"
+ value="50"
+ min_val="50"
+ max_val="99999"
+ name="price_for_listing"
+ top_pad="10"
+ tool_tip="Price for listing."
+ width="150" />
+ <text
+ follows="top|left"
+ font="SansSerif"
+ height="60"
+ layout="topleft"
+ left_pad="5"
+ top_delta="0"
+ word_wrap="true"
+ value="L$"
+ name="l$_text" />
+ <text
+ follows="top|right"
+ font="SansSerif"
+ height="20"
+ layout="topleft"
+ left="15"
+ name="more_info_text"
+ top_pad="-20"
+ width="300">
+More info (link to classified help)
+ </text>
+ <button
+ follows="top|left"
+ height="22"
+ label="Publish"
+ layout="topleft"
+ left="105"
+ name="publish_btn"
+ top="160"
+ width="100" />
+ <button
+ follows="top|left"
+ height="22"
+ label="Cancel"
+ layout="topleft"
+ left_pad="5"
+ name="cancel_btn"
+ width="100" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 4e59a9b1caa3cd1aa62e3266f458b2fe1a7a1e9b..affe74d148f54fddffbb69d1ea7506677f648b14 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -581,7 +581,7 @@
left="0"
name="radio select land"
top="-1"
- width="114" />
+ width="134" />
<radio_item
height="19"
label="Flatten"
@@ -639,7 +639,7 @@
follows="left|top"
height="12"
layout="topleft"
- left="125"
+ left="150"
name="Bulldozer:"
top="57"
width="100">
@@ -2816,7 +2816,7 @@ even though the user gets a free copy.
left="20"
name="label_parcel_info"
top="24"
- width="150">
+ width="240">
Parcel Information
</text>
<text
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 936f4a3fab9c2fc3cae685d082ad457ffd9200bf..a2540237c86dd1157d153391be17e11c48dbdb72 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -249,7 +249,7 @@ Save all changes to clothing/body parts?
Non-friends won't know that you've choosen to ignore their calls and instant messages.
<usetemplate
name="okbutton"
- yestext="Yes"/>
+ yestext="OK"/>
</notification>
<notification
@@ -2848,11 +2848,11 @@ Leave Group?
icon="alert.tga"
name="ConfirmKick"
type="alert">
-Do you REALLY want to kick all users off the grid?
+Do you REALLY want to kick all Residents off the grid?
<usetemplate
name="okcancelbuttons"
notext="Cancel"
- yestext="Kick All Users"/>
+ yestext="Kick All Residents"/>
</notification>
<notification
@@ -2952,7 +2952,7 @@ You have reached your maximum number of groups. Please leave some group before j
icon="alert.tga"
name="KickUser"
type="alert">
-Kick this user with what message?
+Kick this Resident with what message?
<form name="form">
<input name="message" type="text">
An administrator has logged you off.
@@ -2994,7 +2994,7 @@ An administrator has logged you off.
icon="alert.tga"
name="FreezeUser"
type="alert">
-Freeze this user with what message?
+Freeze this Resident with what message?
<form name="form">
<input name="message" type="text">
You have been frozen. You cannot move or chat. An administrator will contact you via instant message (IM).
@@ -3015,7 +3015,7 @@ You have been frozen. You cannot move or chat. An administrator will contact you
icon="alert.tga"
name="UnFreezeUser"
type="alert">
-Unfreeze this user with what message?
+Unfreeze this Resident with what message?
<form name="form">
<input name="message" type="text">
You are no longer frozen.
@@ -3057,7 +3057,7 @@ Join me in [REGION]
icon="alertmodal.tga"
name="OfferTeleportFromGod"
type="alertmodal">
-God summon user to your location?
+God summon Resident to your location?
<form name="form">
<input name="message" type="text">
Join me in [REGION]
@@ -3137,7 +3137,7 @@ Type a short announcement which will be sent to everyone currently in your estat
type="alert">
You are about to change a Linden owned estate (mainland, teen grid, orientation, etc.).
-This is EXTREMELY DANGEROUS because it can fundamentally affect the user experience. On the mainland, it will change thousands of regions and make the spaceserver hiccup.
+This is EXTREMELY DANGEROUS because it can fundamentally affect the Resident experience. On the mainland, it will change thousands of regions and make the spaceserver hiccup.
Proceed?
<usetemplate
@@ -5383,7 +5383,7 @@ Grant this request?
icon="notify.tga"
name="ScriptToast"
type="notify">
- [FIRST] [LAST]'s '[TITLE]' is requesting user input.
+ [FIRST] [LAST]'s '[TITLE]' is requesting Resident input.
<form name="form">
<button
index="0"
diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
index 80cbad1a0e9017c5ea9d49530550e99ada2a0ba5..e71498f2f88291eaa80ca2dedd70cc598662135c 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -22,13 +22,21 @@
name="l$_price">
L$[PRICE]
</panel.string>
-<panel.string
+ <panel.string
name="click_through_text_fmt">
[TELEPORT] teleport, [MAP] map, [PROFILE] profile
</panel.string>
<panel.string
name="date_fmt">
[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
+ </panel.string>
+ <panel.string
+ name="auto_renew_on">
+ Enabled
+ </panel.string>
+ <panel.string
+ name="auto_renew_off">
+ Disabled
</panel.string>
<button
follows="top|right"
@@ -59,11 +67,11 @@
follows="all"
height="502"
layout="topleft"
- left="9"
+ left="10"
top_pad="10"
name="profile_scroll"
reserve_scroll_corner="false"
- width="310">
+ width="312">
<panel
name="scroll_content_panel"
follows="left|top"
@@ -71,18 +79,28 @@
layout="topleft"
top="0"
background_visible="false"
- height="500"
+ height="610"
left="0"
width="285">
+ <panel
+ name="snapshot_panel"
+ layout="topleft"
+ follows="left|top|right"
+ height="197"
+ left="10"
+ top="10"
+ width="275"
+ >
<texture_picker
enabled="false"
follows="left|top|right"
height="197"
layout="topleft"
- left="10"
+ left="0"
name="classified_snapshot"
- top="10"
+ top="0"
width="275" />
+ </panel>
<text_editor
allow_scroll="false"
bg_visible="false"
@@ -94,7 +112,7 @@
font="SansSerifBig"
font.style="BOLD"
left="10"
- top_pad="0"
+ top_pad="10"
name="classified_name"
read_only="true"
text_color="white"
@@ -117,7 +135,7 @@
bg_visible="false"
follows="left|top"
h_pad="0"
- height="25"
+ height="30"
layout="topleft"
left="10"
name="classified_location"
@@ -135,7 +153,7 @@
left="10"
name="content_type_label"
text_color="white"
- top_pad="0"
+ top_pad="10"
value="Content Type:"
width="140" />
<text_editor
@@ -213,7 +231,7 @@
left="10"
name="price_for_listing_label"
text_color="white"
- top_pad="0"
+ top_pad="5"
value="Price for listing:"
width="140" />
<text_editor
@@ -231,26 +249,26 @@
tool_tip="Price for listing."
v_pad="0"
value="[price]"
- width="150" />
+ width="105" />
<layout_stack
animate="false"
name="descr_stack"
layout="topleft"
- follows="top|left"
+ follows="all"
orientation="vertical"
left="10"
- top_pad="0"
+ top_pad="5"
width="290"
- height="250">
+ height="215">
<layout_panel
auto_resize="false"
name="clickthrough_layout_panel"
layout="topleft"
- follows="top|left"
+ follows="all"
left="0"
top="0"
width="290"
- height="26"
+ height="16"
user_resize="false">
<text
follows="left|top"
@@ -284,28 +302,37 @@
auto_resize="false"
name="price_layout_panel"
layout="topleft"
- follows="top|left"
+ follows="all"
left="0"
top="0"
width="290"
- height="26"
+ height="16"
user_resize="false">
- <check_box
- enabled="false"
+ <text
+ follows="left|top"
+ font.style="BOLD"
+ height="10"
+ layout="topleft"
+ left="0"
+ name="auto_renew_label"
+ text_color="white"
+ top="0"
+ value="Auto renew:"
+ width="140" />
+ <text
height="16"
- label="Auto renew each week"
layout="topleft"
follows="top|left"
- left="0"
+ left_pad="0"
name="auto_renew"
- top="0"
- v_pad="0"
- width="290" />
+ top_pad="-10"
+ value="Enabled"
+ width="150" />
</layout_panel>
<layout_panel
name="descr_layout_panel"
layout="topleft"
- follows="top|left"
+ follows="all"
left="0"
top="0"
width="290"
@@ -327,7 +354,7 @@
allow_html="true"
allow_scroll="true"
bg_visible="false"
- follows="left|top|right"
+ follows="all"
h_pad="0"
height="200"
layout="topleft"
@@ -335,8 +362,8 @@
max_length="1023"
name="classified_desc"
read_only="true"
- top_pad="5"
- width="290"
+ top_pad="7"
+ width="280"
v_pad="0"
value="[description]"
word_wrap="true" />
diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
index 6cc6c51fe0701a74f412fa5b0db16ec7b8458b3c..c1b352031fb1a2b9fa29ceda424669d38635e757 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -16,6 +16,12 @@
name="location_notice">
(will update after save)
</panel.string>
+ <string name="publish_label">
+ Publish
+ </string>
+ <string name="save_label">
+ Save
+ </string>
<button
follows="top|right"
height="23"
@@ -62,24 +68,33 @@
height="690"
left="0"
width="285">
+ <panel
+ name="snapshot_panel"
+ layout="topleft"
+ follows="left|top|right"
+ height="197"
+ left="10"
+ top="10"
+ width="272">
<texture_picker
follows="left|top|right"
height="197"
width="272"
layout="topleft"
- top="10"
- left="11"
+ top="0"
+ left="0"
name="classified_snapshot" />
- <icon
+ <icon
height="197"
image_name="spacer24.tga"
layout="topleft"
name="edit_icon"
label=""
tool_tip="Click to select an image"
- top="10"
- left="11"
- width="286" />
+ top="0"
+ left="0"
+ width="272" />
+ </panel>
<text
type="string"
length="1"
@@ -272,7 +287,7 @@
<button
follows="bottom|left"
height="23"
- label="Save"
+ label="[LABEL]"
layout="topleft"
name="save_changes_btn"
left="0"
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 5147bb72d09a64c5e8a5d63bbbacaad26114a24f..701a14e1c52260e9248c8d50bfc03f3cca5da688 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -44,11 +44,16 @@ background_visible="true"
tab_stop="false"
top="2"
width="23" />
- <text
+ <text_editor
+ allow_scroll="false"
+ bg_visible="false"
+ read_only = "true"
layout="topleft"
name="group_name"
+ v_pad="0"
value="(Loading...)"
font="SansSerifHugeBold"
+ h_pad="0"
height="26"
left_pad="10"
text_color="LtGray"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index e6f67078d18a865773beed52533e35e083fd5072..50983d297650afd6fb00cf1da02bd54238c4849b 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -415,6 +415,7 @@ halign="center"
layout="topleft"
left="0"
name="All Items"
+ sort_order_setting="InventorySortOrder"
top="16"
width="290" />
<inventory_panel
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 375f5b6593094b008dc64f733155c9e1ccaf541e..13791a6d323e476ed7a5ab600b85605cf0170f36 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -232,7 +232,7 @@
top="10"
width="293"
wrap="true">
- To add friends try [secondlife:///app/search/people global search] or use right-click on a user to add them as a friend.
+ To add friends try [secondlife:///app/search/people global search] or use right-click on a Resident to add them as a friend.
If you're looking for people to hang out with, [secondlife:///app/worldmap try the Map].
</text>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index d336e18011db5b246b49a789f1025b0266c7de3e..3913b6d7095aaeede90bcdaa99b5b06a2f127e75 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -59,7 +59,7 @@
left_delta="0"
name="owner_text"
top_pad="2"
- width="180">
+ width="80">
Estate owner:
</text>
<text
@@ -198,7 +198,7 @@
<button
follows="left|top"
height="23"
- label="Kick User from Estate..."
+ label="Kick Resident from Estate..."
layout="topleft"
left="50"
name="kick_user_from_estate_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index c06e67a4bb5616c8866176378916c0911348281a..4acfa42c232ba7112f538d9e82eff320dab97752 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -171,27 +171,48 @@
width="100">
Rating:
</text>
- <combo_box
+ <icons_combo_box
+ follows="left|top"
height="20"
label="Moderate"
layout="topleft"
left_delta="100"
name="access_combo"
top_delta="0"
- width="85">
- <combo_box.item
+ width="105">
+ <icons_combo_box.drop_down_button
+ image_overlay="Parcel_M_Light"
+ image_overlay_alignment="left"
+ imgoverlay_label_space="3"
+ pad_left="3"/>
+ <icons_combo_box.item
label="Adult"
- name="Adult"
- value="42" />
- <combo_box.item
+ value="42">
+ <item.columns
+ halign="center"
+ type="icon"
+ value="Parcel_R_Light"
+ width="20"/>
+ </icons_combo_box.item>
+ <icons_combo_box.item
label="Moderate"
- name="Mature"
- value="21" />
- <combo_box.item
+ value="21">
+ <item.columns
+ halign="center"
+ type="icon"
+ value="Parcel_M_Light"
+ width="20"/>
+ </icons_combo_box.item>
+ <icons_combo_box.item
label="General"
- name="PG"
- value="13" />
- </combo_box>
+ value="13">
+ <item.columns
+ halign="center"
+ type="icon"
+ value="Parcel_PG_Light"
+ width="20"/>
+ </icons_combo_box.item>
+ </icons_combo_box>
<button
enabled="false"
follows="left|top"
@@ -205,7 +226,7 @@
<button
follows="left|top"
height="20"
- label="Teleport Home One User..."
+ label="Teleport Home One Resident..."
layout="topleft"
left="10"
name="kick_btn"
@@ -214,7 +235,7 @@
<button
follows="left|top"
height="20"
- label="Teleport Home All Users..."
+ label="Teleport Home All Residents..."
layout="topleft"
left_delta="0"
name="kick_all_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
index 525c5aa8e72f592540eda522b1954ef0e5c71dcc..ffa1a257d579a9ac6d27c998736f2807864e24ba 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
@@ -203,7 +203,7 @@
<button
follows="left|top"
height="20"
- label="Teleport Home One User..."
+ label="Teleport Home One Resident..."
layout="topleft"
left="10"
name="kick_btn"
@@ -212,7 +212,7 @@
<button
follows="left|top"
height="20"
- label="Teleport Home All Users..."
+ label="Teleport Home All Residents..."
layout="topleft"
left_delta="0"
name="kick_all_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_region_texture.xml b/indra/newview/skins/default/xui/en/panel_region_texture.xml
index 04dbf73be94830f3260e4f0760243be3f0a14e7c..5d910ea6596d11e647f5c06d825719d399cb313a 100644
--- a/indra/newview/skins/default/xui/en/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_texture.xml
@@ -147,104 +147,34 @@
left="51"
name="height_text_lbl6"
top="185"
- width="100">
- Southwest
- </text>
- <text
- follows="left|top"
- height="20"
- layout="topleft"
- left_pad="10"
- name="height_text_lbl7"
- top_delta="0"
width="100">
Northwest
</text>
- <spinner
- follows="left|top"
- height="20"
- increment="0.5"
- label="Low"
- label_width="37"
- layout="topleft"
- left="10"
- max_val="500"
- min_val="-500"
- name="height_start_spin_0"
- top_delta="15"
- width="100" />
- <spinner
- follows="left|top"
- height="20"
- increment="0.5"
- label="Low"
- label_width="37"
- layout="topleft"
- left_pad="10"
- max_val="500"
- min_val="-500"
- name="height_start_spin_1"
- top_delta="0"
- width="100" />
- <spinner
- follows="left|top"
- height="20"
- increment="0.5"
- label="High"
- label_width="37"
- layout="topleft"
- left="10"
- max_val="500"
- min_val="-500"
- name="height_range_spin_0"
- top_delta="20"
- width="100" />
- <spinner
- follows="left|top"
- height="20"
- increment="0.5"
- label="High"
- label_width="37"
- layout="topleft"
- left_pad="10"
- max_val="500"
- min_val="-500"
- name="height_range_spin_1"
- top_delta="0"
- width="100" />
- <text
- follows="left|top"
- height="20"
- layout="topleft"
- left="51"
- name="height_text_lbl8"
- top_pad="10"
- width="100">
- Southeast
- </text>
<text
follows="left|top"
height="20"
layout="topleft"
left_pad="10"
- name="height_text_lbl9"
+ name="height_text_lbl7"
top_delta="0"
width="100">
Northeast
</text>
- <spinner
- follows="left|top"
- height="20"
- increment="0.5"
- label="Low"
- label_width="37"
- layout="topleft"
- left="10"
- max_val="500"
- min_val="-500"
- name="height_start_spin_2"
- top_delta="15"
- width="100" />
+<!-- northwest low-->
+ <spinner
+ follows="left|top"
+ height="20"
+ increment="0.5"
+ label="Low"
+ label_width="37"
+ layout="topleft"
+ left="10"
+ max_val="500"
+ min_val="-500"
+ name="height_start_spin_1"
+ top_delta="15"
+ width="100" />
+<!-- northeast low-->
<spinner
follows="left|top"
height="20"
@@ -258,20 +188,22 @@
name="height_start_spin_3"
top_delta="0"
width="100" />
- <spinner
- follows="left|top"
- height="20"
- increment="0.5"
- label="High"
- label_width="37"
- layout="topleft"
- left="10"
- max_val="500"
- min_val="-500"
- name="height_range_spin_2"
- top_delta="20"
- width="100" />
- <spinner
+<!-- northwest high-->
+ <spinner
+ follows="left|top"
+ height="20"
+ increment="0.5"
+ label="High"
+ label_width="37"
+ layout="topleft"
+ left="10"
+ max_val="500"
+ min_val="-500"
+ name="height_range_spin_1"
+ top_delta="20"
+ width="100" />
+<!-- northeast high-->
+ <spinner
follows="left|top"
height="20"
increment="0.5"
@@ -284,18 +216,94 @@
name="height_range_spin_3"
top_delta="0"
width="100" />
- <text
- follows="left|top"
- height="20"
- layout="topleft"
- left="10"
- name="height_text_lbl10"
- top_delta="30"
- width="400"
- word_wrap="true">
- These values represent the blend range for the textures above.
- </text>
- <text
+ <text
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ left="51"
+ name="height_text_lbl8"
+ top_pad="10"
+ width="100">
+ Southwest
+ </text>
+ <text
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ left_pad="10"
+ name="height_text_lbl9"
+ top_delta="0"
+ width="100">
+ Southeast
+ </text>
+<!-- southwest low-->
+ <spinner
+ follows="left|top"
+ height="20"
+ increment="0.5"
+ label="Low"
+ label_width="37"
+ layout="topleft"
+ left="10"
+ max_val="500"
+ min_val="-500"
+ name="height_start_spin_0"
+ top_delta="15"
+ width="100" />
+<!-- southeast low-->
+ <spinner
+ follows="left|top"
+ height="20"
+ increment="0.5"
+ label="Low"
+ label_width="37"
+ layout="topleft"
+ left_pad="10"
+ max_val="500"
+ min_val="-500"
+ name="height_start_spin_2"
+ top_delta="0"
+ width="100" />
+<!--southwest high-->
+ <spinner
+ follows="left|top"
+ height="20"
+ increment="0.5"
+ label="High"
+ label_width="37"
+ layout="topleft"
+ left="10"
+ max_val="500"
+ min_val="-500"
+ name="height_range_spin_0"
+ top_delta="20"
+ width="100" />
+<!-- southeast high-->
+ <spinner
+ follows="left|top"
+ height="20"
+ increment="0.5"
+ label="High"
+ label_width="37"
+ layout="topleft"
+ left_pad="10"
+ max_val="500"
+ min_val="-500"
+ name="height_range_spin_2"
+ top_delta="0"
+ width="100" />
+ <text
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ left="10"
+ name="height_text_lbl10"
+ top_delta="30"
+ width="400"
+ word_wrap="true">
+ These values represent the blend range for the textures above.
+ </text>
+ <text
follows="left|top"
height="20"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index c188c1bf8beaa6ced6ac99415f1cd63955442b26..8a1f74c46c11ca78bd7e8bb4d678043e500eb21a 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -3,7 +3,7 @@
background_opaque="true"
background_visible="true"
bg_opaque_color="MouseGray"
- chrome="true"
+ chrome="true"
follows="top|right"
height="19"
layout="topleft"
@@ -11,7 +11,7 @@
mouse_opaque="false"
name="status"
top="19"
- tab_stop="false"
+ tab_stop="false"
width="1000">
<panel.string
name="StatBarDaysOfWeek">
@@ -51,12 +51,12 @@
image_unselected="spacer35.tga"
image_pressed="spacer35.tga"
height="16"
- right="-210"
+ right="-220"
label_shadow="false"
name="buycurrency"
tool_tip="My Balance"
top="3"
- width="110" />
+ width="120" />
<button
auto_resize="true"
halign="right"
@@ -75,7 +75,7 @@
pad_bottom="2"
tool_tip="Click to buy more L$"
top="2"
- width="45" />
+ width="55" />
<text
type="string"
font="SansSerifSmall"
@@ -88,7 +88,7 @@
left_pad="0"
name="TimeText"
tool_tip="Current time (Pacific)"
- width="80">
+ width="100">
24:00 AM PST
</text>
<button
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 7713f8ef7c85e182635ffdd646e3523fea17b7ee..86739b24c8745f82d972846fab02eea5ea1c70be 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -550,5 +550,16 @@
name="buy_btn"
top="0"
width="100" />
+ <button
+ follows="bottom|left"
+ height="23"
+ label="Details"
+ layout="topleft"
+ left="5"
+ name="details_btn"
+ top="0"
+ width="100"
+ visible="false" />
+
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index a42f9a8e3e6e81495c34ce0714ea582758f904e2..cb1aa5eaa14c591adfaddee86c5d581adfa58d64 100644
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -54,7 +54,7 @@ Gracias a los siguientes Residentes por ayudarnos a estar seguros de que, hoy po
-No es frecuente el pensamiento que puede hacer que lo que hasta ahora no existÃa de pronto salte a la vista. Sà es frecuente -y engañoso- gritar 'A mà se me podÃa haber ocurrido eso', pero el hecho es que no se hizo, un hecho muy significativo y revelador.
+No es frecuente la mente que puede hacer que lo que hasta ahora no existÃa de pronto salte a la vista. Sà es frecuente -y engañoso- gritar 'A mà se me podÃa haber ocurrido eso', pero el hecho es que no se hizo, un hecho muy significativo y revelador.
-- Douglas Adams
</text_editor>
</panel>
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
index bcb970c79de8deac1abe4c0fa029fa9c6284c7c5..46531c5e5866b417f990411d42ba0d4dcea2da2e 100644
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -397,7 +397,7 @@ la textura:
</text>
<texture_picker label="" left="97" name="media texture" tool_tip="Pulse para elegir una imagen"/>
<text name="replace_texture_help" width="285">
- Cuando pulses la flecha 'play', los objetos que usen esta textura mostrarán la pelÃcula o la página web. Selecciona la miniatura para elegir una textura distinta.
+ Cuando pulses la flecha 'play', los objetos que usen esta textura mostrarán la pelÃcula o la página web. Selecciona la miniatura para elegir una textura distinta.
</text>
<check_box label="Escala automática" left="97" name="media_auto_scale" tool_tip="Marcando esta opción, se ajustará el tamaño del contenido automáticamente. Puede ser ligeramente más lento y con menor calidad visual, pero no tendrá que ajustar ni alinear ninguna textura."/>
<text left="102" name="media_size" tool_tip="Tamaño en el que mostrar las web (marque 0 para por defecto)." width="120">
@@ -415,7 +415,7 @@ los media:
<check_box label="Media en bucle" name="media_loop" tool_tip="Ejecuta el media en bucle: cuando acaba su ejecución, vuelve a empezar."/>
</panel>
<panel label="SONIDO" name="land_audio_panel">
- <check_box label="Ocultar la URL" name="hide_music_url" tool_tip="Marcando esta opción se ocultará la URL de la música a quien no esté autorizado a ver la información de esta parcela."/>
+ <check_box label="Ocultar la URL" name="hide_music_url" tool_tip="Al marcar esta opción se ocultará la URL de la música a quien no esté autorizado a ver la información de esta parcela."/>
<check_box label="Activar la voz" name="parcel_enable_voice_channel"/>
<check_box label="Autorizar la voz (establecido por el Estado)" name="parcel_enable_voice_channel_is_estate_disabled"/>
<check_box label="Limitar la voz a esta parcela" name="parcel_enable_voice_channel_local"/>
@@ -435,7 +435,7 @@ los media:
Restringir el acceso a residentes verificados con:
</text>
<check_box label="Información de pago aportada [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Expulsa a los Residentes no identificados."/>
- <check_box label="Verificación de edad [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Expulsa a los Residentes que no hayan verificado su edad. Para más información, véase [SUPPORT_SITE]."/>
+ <check_box label="Verificación de edad [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Expulsa a los Residentes que no hayan verificado su edad. Más información en [SUPPORT_SITE]."/>
<check_box label="Acceso permitido al grupo: [GROUP]" name="GroupCheck" tool_tip="Elija el grupo en la pestaña General."/>
<check_box label="Vender pases a:" name="PassCheck" tool_tip="Permitir acceso temporal a esta parcela"/>
<combo_box name="pass_combo">
diff --git a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
index b53b9a3889846ea94c2e1bedb990b78d8ccdd806..089ff3cd682561dcbdd270d786a26383af3221fa 100644
--- a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
@@ -17,10 +17,10 @@
<texture_picker label="Alfa de la cabeza" name="head_alpha"/>
<texture_picker label="Tatuaje de la cabeza" name="head_tattoo"/>
<texture_picker label="Ojos" name="eyes-baked"/>
- <texture_picker label="Oho" name="eyes_iris"/>
+ <texture_picker label="Ojo" name="eyes_iris"/>
<texture_picker label="Alfa de los ojos" name="eyes_alpha"/>
<texture_picker label="Parte superior del cuerpo" name="upper-baked"/>
- <texture_picker label="Parte superior del cuerpo: bodypaint" name="upper_bodypaint"/>
+ <texture_picker label="Pintura corporal: parte superior del cuerpo" name="upper_bodypaint"/>
<texture_picker label="Camiseta" name="upper_undershirt"/>
<texture_picker label="Guantes" name="upper_gloves"/>
<texture_picker label="Camisa" name="upper_shirt"/>
@@ -28,7 +28,7 @@
<texture_picker label="Alfa superior" name="upper_alpha"/>
<texture_picker label="Tatuaje superior" name="upper_tattoo"/>
<texture_picker label="Parte inferior del cuerpo" name="lower-baked"/>
- <texture_picker label="Parte inferior del cuerpo: bodypaint" name="lower_bodypaint"/>
+ <texture_picker label="Pintura corporal: parte inferior del cuerpo" name="lower_bodypaint"/>
<texture_picker label="Ropa interior" name="lower_underpants"/>
<texture_picker label="Calcetines" name="lower_socks"/>
<texture_picker label="Zapatos" name="lower_shoes"/>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency.xml b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
index 0d280320e28d4d3ef8e34ace3fa3c1438ccfa4ad..81c54cf600f2010615593f77da94530a58c32378 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
@@ -46,7 +46,7 @@
[AMT] L$
</text>
<text name="currency_links">
- [http://www.secondlife.com/my/account/payment_method_management.php método de pago] | [http://www.secondlife.com/my/account/currency.php moneda] | [http://www.secondlife.com/my/account/exchange_rates.php tipo de pago]
+ [http://www.secondlife.com/my/account/payment_method_management.php método de pago] | [http://www.secondlife.com/my/account/currency.php moneda] | [http://www.secondlife.com/my/account/exchange_rates.php tipo de cambio]
</text>
<text name="exchange_rate_note">
Vuelve a escribir la cantidad para ver el tipo de cambio más reciente.
diff --git a/indra/newview/skins/default/xui/es/floater_customize.xml b/indra/newview/skins/default/xui/es/floater_customize.xml
index 97191a1336610c6189a721e98dfe3f012581d726..4b332cd9c379398ea0b2c1186e624b821b9f1915 100644
--- a/indra/newview/skins/default/xui/es/floater_customize.xml
+++ b/indra/newview/skins/default/xui/es/floater_customize.xml
@@ -35,7 +35,7 @@
Situada en [PATH]
</text>
<text name="not worn instructions">
- Ponte una anatomÃa nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vÃstetela.
+ Ponte una anatomÃa nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero.
</text>
<text name="no modify instructions">
No tiene permiso para modificar este Ãtem.
@@ -68,7 +68,7 @@
Situada en [PATH]
</text>
<text name="not worn instructions">
- Ponte una piel nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vÃstetela.
+ Ponte una piel nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero.
</text>
<text name="no modify instructions">
No tiene permiso para modificar este Ãtem.
@@ -105,7 +105,7 @@
Situado en [PATH]
</text>
<text name="not worn instructions">
- Ponte un pelo nuevo arrastrándolo desde tu inventario hasta tu avatar. O bien crea uno nuevo partiendo de cero y vÃstetelo.
+ Ponte un pelo nuevo arrastrándolo desde tu inventario hasta tu avatar. O bien puedes crear uno nuevo partiendo de cero.
</text>
<text name="no modify instructions">
No tiene permiso para modificar este Ãtem.
@@ -136,7 +136,7 @@
Situados en [PATH]
</text>
<text name="not worn instructions">
- Ponte unos ojos nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien crea unos nuevos partiendo de cero y vÃstetelos.
+ Ponte unos ojos nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero.
</text>
<text name="no modify instructions">
No tiene permiso para modificar este Ãtem.
@@ -177,7 +177,7 @@
Situada en [PATH]
</text>
<text name="not worn instructions">
- Ponte una camisa nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vÃstetela.
+ Ponte una camisa nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero.
</text>
<text name="no modify instructions">
No tiene permiso para modificar este Ãtem.
@@ -210,7 +210,7 @@
Situados en [PATH]
</text>
<text name="not worn instructions">
- Ponte unos pantalones nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien crea unos nuevos partiendo de cero y vÃstetelos.
+ Ponte unos pantalones nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero.
</text>
<text name="no modify instructions">
No tiene permiso para modificar este Ãtem.
@@ -236,7 +236,7 @@
Situados en [PATH]
</text>
<text name="not worn instructions">
- Ponte unos zapatos nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien crea unos nuevos partiendo de cero y vÃstetelos.
+ Ponte unos zapatos nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero.
</text>
<button label="Crear unos zapatos nuevos" label_selected="Crear unos zapatos nuevos" name="Create New"/>
<text name="no modify instructions">
@@ -269,7 +269,7 @@
Situados en [PATH]
</text>
<text name="not worn instructions">
- Ponte unos calcetines nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien crea unos nuevos partiendo de cero y vÃstetelos.
+ Ponte unos calcetines nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero.
</text>
<button label="Crear unos calcetines nuevos" label_selected="Crear unos calcetines nuevos" name="Create New" width="185"/>
<text name="no modify instructions">
@@ -302,7 +302,7 @@
Situada en [PATH]
</text>
<text name="not worn instructions">
- Ponte una chaqueta nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vÃstetela.
+ Ponte una chaqueta nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero.
</text>
<button label="Crear una chaqueta nueva" label_selected="Crear una chaqueta nueva" name="Create New"/>
<text name="no modify instructions">
@@ -336,7 +336,7 @@
Situados en [PATH]
</text>
<text name="not worn instructions">
- Ponte unos guantes nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien crea unos nuevos partiendo de cero y vÃstetelos.
+ Ponte unos guantes nuevos arrastrándolos desde tu inventario hasta tu avatar. O bien puedes crear unos nuevos partiendo de cero.
</text>
<button label="Crear unos guantes nuevos" label_selected="Crear unos guantes nuevos" name="Create New"/>
<text name="no modify instructions">
@@ -369,7 +369,7 @@
Situada en [PATH]
</text>
<text name="not worn instructions">
- Ponte una camiseta nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vÃstetela.
+ Ponte una camiseta nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero.
</text>
<button label="Crear una camiseta nueva" label_selected="Crear una camiseta nueva" name="Create New"/>
<text name="no modify instructions">
@@ -402,7 +402,7 @@
Situada en [PATH]
</text>
<text name="not worn instructions">
- Ponte una ropa interior nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vÃstetela.
+ Ponte una ropa interior nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero.
</text>
<button label="Crear una ropa interior nueva" label_selected="Crear una ropa interior nueva" name="Create New" width="185"/>
<text name="no modify instructions">
@@ -435,7 +435,7 @@
Situada en [PATH]
</text>
<text name="not worn instructions">
- Ponte una falda nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vÃstetela.
+ Ponte una falda nueva arrastrándola desde tu inventario hasta tu avatar. O bien puedes crear una nueva partiendo de cero.
</text>
<button label="Crear una falda nueva" label_selected="Crear una falda nueva" name="Create New"/>
<text name="no modify instructions">
@@ -468,7 +468,7 @@
Situado en [PATH]
</text>
<text name="not worn instructions">
- Ponte un tatuaje nuevo arrastrándolo desde tu inventario hasta tu avatar. O bien crea uno nuevo partiendo de cero y vÃstetelo.
+ Pon un tatuaje nuevo arrastrándolo desde tu inventario a tu avatar. O bien puedes crear uno nuevo partiendo de cero.
</text>
<button label="Crear un tatuaje nuevo" label_selected="Crear un tatuaje nuevo" name="Create New"/>
<text name="no modify instructions">
@@ -502,7 +502,7 @@
Situado en [PATH]
</text>
<text name="not worn instructions">
- Ponte una capa Alfa nueva arrastrándola desde tu inventario hasta tu avatar. O bien crea una nueva partiendo de cero y vÃstetela.
+ Pon una capa Alfa nueva arrastrándola desde tu inventario a tu avatar. O bien puedes crear una nueva partiendo de cero.
</text>
<button label="Crear una capa Alfa nueva" label_selected="Crear una capa Alfa nueva" name="Create New"/>
<text name="no modify instructions">
diff --git a/indra/newview/skins/default/xui/es/floater_event.xml b/indra/newview/skins/default/xui/es/floater_event.xml
index f2ce40e9947b6f07643472265408927476c56f44..81909e997ce403abbc804113c7987a8d6132c472 100644
--- a/indra/newview/skins/default/xui/es/floater_event.xml
+++ b/indra/newview/skins/default/xui/es/floater_event.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Event" name="Event" title="DETALLES DEL EVENTO">
+<floater label="Evento" name="Event" title="DETALLES DEL EVENTO">
<floater.string name="none">
- Ninguno
+ ninguno
</floater.string>
<floater.string name="notify">
Notificar
diff --git a/indra/newview/skins/default/xui/es/floater_im.xml b/indra/newview/skins/default/xui/es/floater_im.xml
index d87623c3df76b36c87ec25108729ad7227eb6e8d..e6b01a49464fd8541f55e76691ed837d496b0f63 100644
--- a/indra/newview/skins/default/xui/es/floater_im.xml
+++ b/indra/newview/skins/default/xui/es/floater_im.xml
@@ -10,7 +10,7 @@
Pulse el botón [BUTTON NAME] para aceptar/conectar este chat de voz.
</string>
<string name="muted_message">
- Has ignorado a este residente. Le designorarás automáticamente enviándole un mensaje.
+ Has ignorado a este Residente. Enviándole un mensaje, automáticamente dejarás de ignorarle.
</string>
<string name="generic_request_error">
Error al hacer lo solicitado; por favor, inténtelo más tarde.
diff --git a/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml
index 869babee44d98bbe4ad1b1a0eb4f898500832f25..9f9902a3a0191de0f19c8254ea78deebc8fc0e08 100644
--- a/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml
@@ -3,7 +3,7 @@
<button label="Guardar" label_selected="Guardar" name="Save"/>
<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
<text name="Save item as:">
- Guardar lo que estoy llevando
+ Guardar lo que llevo puesto
como un vestuario nuevo:
</text>
<line_editor name="name ed">
diff --git a/indra/newview/skins/default/xui/es/floater_outgoing_call.xml b/indra/newview/skins/default/xui/es/floater_outgoing_call.xml
index 52c6593f755b74e4745427f905b073e8e11d62bb..e2a53693b52c8f30b7cf5f0bb776a8b0059b208a 100644
--- a/indra/newview/skins/default/xui/es/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/es/floater_outgoing_call.xml
@@ -28,10 +28,10 @@
Has sido desconectado de [VOICE_CHANNEL_NAME]. [RECONNECT_NEARBY]
</text>
<text name="nearby_P2P_by_other">
- [VOICE_CHANNEL_NAME] ha finalizado la llamada. [RECONNECT_NEARBY]
+ [VOICE_CHANNEL_NAME] ha colgado la llamada. [RECONNECT_NEARBY]
</text>
<text name="nearby_P2P_by_agent">
- Has finalizado la llamada. [RECONNECT_NEARBY]
+ Has finalizado la llamada. [RECONNECT_NEARBY]
</text>
<text name="leaving">
Saliendo de [CURRENT_CHAT].
diff --git a/indra/newview/skins/default/xui/es/floater_script_limits.xml b/indra/newview/skins/default/xui/es/floater_script_limits.xml
index 095112dbdcd2d9f552a003556c7c06ff73308984..410f7b5e3610a79e070f0c028298f1a1b1ab8d6e 100644
--- a/indra/newview/skins/default/xui/es/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_limits.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="scriptlimits" title="INFORMACIÓN DEl SCRIPT"/>
+<floater name="scriptlimits" title="INFORMACIÓN DEL SCRIPT"/>
diff --git a/indra/newview/skins/default/xui/es/floater_select_key.xml b/indra/newview/skins/default/xui/es/floater_select_key.xml
index d597926d39ccfbf2a90d59200b9ff5b0866f6332..6503a3d5cb6801d8bb212917c38a762c94488e76 100644
--- a/indra/newview/skins/default/xui/es/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/es/floater_select_key.xml
@@ -2,6 +2,6 @@
<floater name="modal container" title="">
<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
<text name="Save item as:">
- Pulsa una tecla para configurarla como botón de Apretar para Hablar.
+ Pulsa una tecla para configurarla como tu botón para hablar.
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_tos.xml b/indra/newview/skins/default/xui/es/floater_tos.xml
index 78d9b2a9c85031115f800212a7cbbd67aff06c78..cbacce304ccf4e4f2f081eb97d2aa41814c802af 100644
--- a/indra/newview/skins/default/xui/es/floater_tos.xml
+++ b/indra/newview/skins/default/xui/es/floater_tos.xml
@@ -4,7 +4,7 @@
<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
<check_box label="Estoy de acuerdo con las Condiciones del Servicio" name="agree_chk"/>
<text name="tos_heading">
- Por favor, lee cuidadosamente las siguientes Condiciones del Servicio. Para conectarte a [SECOND_LIFE], debes aceptar este acuerdo.
+ Por favor, lee detenidamente las siguientes Condiciones del Servicio. Para conectarte a [SECOND_LIFE], debes aceptar este acuerdo.
</text>
<text_editor name="tos_text">
TOS_TEXT
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 24b5ece0aa54effc03ebe6a472e879b9a4a3c761..a8dc05703c0b89cd3cb0cac309984f2d06fd3820 100644
--- a/indra/newview/skins/default/xui/es/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/es/floater_world_map.xml
@@ -5,83 +5,30 @@
Leyenda
</text>
</panel>
- <panel
- name="layout_panel_2">
- <button label="Mostrar mi posición" label_selected="Mostrar mi posición" name="Show My Location" tool_tip="Centrar el mapa en la posición de mi avatar"/>
+ <panel>
<text name="me_label">
Yo
</text>
- <check_box label="Residente" name="people_chk"/>
<text name="person_label">
Persona
</text>
- <check_box label="Punto de Info" name="infohub_chk"/>
- <text name="infohub_label">
- Punto de Info
- </text>
- <check_box label="Terreno en venta" name="land_for_sale_chk"/>
- <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 label="Ir a la Base" label_selected="Ir a la Base" name="Go Home" tool_tip="Teleportar a mi Base"/>
- <text name="Home_label">
- Base
- </text>
- <text name="events_label">
- Eventos:
- </text>
- <check_box label="'PG'" name="event_chk"/>
<text name="pg_label">
General
</text>
- <check_box initial_value="true" label="'Mature'" name="event_mature_chk"/>
<text name="mature_label">
Moderado
</text>
- <check_box label="'Adult'" name="event_adult_chk"/>
<text name="adult_label">
Adulto
</text>
</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 conectados" 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="Escriba el nombre de una región"/>
- <button label="Encontrar" name="DoSearch" tool_tip="Buscar una región"/>
+ <panel>
<button name="Clear" tool_tip="Limpia las marcas y actualiza el mapa"/>
- <scroll_list name="search_results">
- <scroll_list.columns label="" name="icon"/>
- <scroll_list.columns label="" name="sim_name"/>
- </scroll_list>
- <button label="Teleportar" label_selected="Teleportar" name="Teleport" tool_tip="Teleportarse a la localización elegida"/>
- <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" label_selected="Mostrar el destino" name="Show Destination" tool_tip="Centrar el mapa en la localización elegida"/>
- </panel>
- <panel
- name="layout_panel_5">
- <text name="zoom_label">
- Zoom
- </text>
- </panel>
- <panel
- name="layout_panel_6">
- <slider label="Zoom" name="zoom slider"/>
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/es/menu_avatar_self.xml b/indra/newview/skins/default/xui/es/menu_avatar_self.xml
index 1004471025128bec81df56482ca80ced34d3896a..46b6d3ece60e60448531d4d78254a13b6013b8c9 100644
--- a/indra/newview/skins/default/xui/es/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/es/menu_avatar_self.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Self Pie">
<menu_item_call label="Levantarse" name="Stand Up"/>
- <context_menu label="Quitarse â–¶" name="Take Off >">
+ <context_menu label="Quitarme â–¶" name="Take Off >">
<context_menu label="Ropas â–¶" name="Clothes >">
<menu_item_call label="Camisa" name="Shirt"/>
<menu_item_call label="Pantalón" name="Pants"/>
diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml
index 1aa0a26ca8ee76f061af87d2aee254908477cac4..602798b10861807592dc2428463d21905d71bcf5 100644
--- a/indra/newview/skins/default/xui/es/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/es/menu_inventory.xml
@@ -62,7 +62,7 @@
<menu_item_call label="Empezar multiconferencia" name="Conference Chat Folder"/>
<menu_item_call label="Escuchar" name="Sound Play"/>
<menu_item_call label="Acerca del hito" name="About Landmark"/>
- <menu_item_call label="Ejecutarla en el mundo" name="Animation Play"/>
+ <menu_item_call label="Escuchar en el mundo" name="Animation Play"/>
<menu_item_call label="Ejecutarla para usted" name="Animation Audition"/>
<menu_item_call label="Enviar un mensaje instantáneo" name="Send Instant Message"/>
<menu_item_call label="Ofrecer teleporte..." name="Offer Teleport..."/>
diff --git a/indra/newview/skins/default/xui/es/menu_object.xml b/indra/newview/skins/default/xui/es/menu_object.xml
index 581ecd669881c5853fb86b5f972366252a0f2bc2..18b6363bbb34d85af6ab233fa855203222d4cc57 100644
--- a/indra/newview/skins/default/xui/es/menu_object.xml
+++ b/indra/newview/skins/default/xui/es/menu_object.xml
@@ -7,12 +7,12 @@
<menu_item_call label="Sentarse aquÃ" name="Object Sit"/>
<menu_item_call label="Perfil del objeto" name="Object Inspect"/>
<menu_item_call label="Acercar el zoom" name="Zoom In"/>
- <context_menu label="Ponerse â–¶" name="Put On">
+ <context_menu label="Ponerme â–¶" name="Put On">
<menu_item_call label="Ponerse" name="Wear"/>
<context_menu label="Anexar â–¶" name="Object Attach"/>
<context_menu label="Anexar como HUD â–¶" name="Object Attach HUD"/>
</context_menu>
- <context_menu label="Quitarse â–¶" name="Remove">
+ <context_menu label="Quitarme â–¶" name="Remove">
<menu_item_call label="Denunciar una infracción" name="Report Abuse..."/>
<menu_item_call label="Ignorar" name="Object Mute"/>
<menu_item_call label="Devolver" name="Return..."/>
diff --git a/indra/newview/skins/default/xui/es/menu_participant_list.xml b/indra/newview/skins/default/xui/es/menu_participant_list.xml
index f4e7671a9266333179da91cea4ad1fde7a2c4c96..60c92eec75221187d27ecfe5d706ffb15bcea644 100644
--- a/indra/newview/skins/default/xui/es/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/es/menu_participant_list.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Participant List Context Menu">
- <menu_item_check label="Ordenar según el nombre" name="SortByName"/>
- <menu_item_check label="Ordenar según los intervinientes recientes" name="SortByRecentSpeakers"/>
+ <menu_item_check label="Ordenar alfabéticamente" name="SortByName"/>
+ <menu_item_check label="Ordenar según las intervenciones recientes" name="SortByRecentSpeakers"/>
<menu_item_call label="Ver el perfil" name="View Profile"/>
<menu_item_call label="Añadir como amigo" name="Add Friend"/>
<menu_item_call label="MI" name="IM"/>
@@ -11,10 +11,10 @@
<menu_item_check label="Ignorar la voz" name="Block/Unblock"/>
<menu_item_check label="Ignorar el texto" name="MuteText"/>
<context_menu label="Opciones del moderador >" name="Moderator Options">
- <menu_item_check label="Autorizar el chat de texto" name="AllowTextChat"/>
- <menu_item_call label="Silenciar a este participante" name="ModerateVoiceMuteSelected"/>
+ <menu_item_check label="Permitir el chat de texto" name="AllowTextChat"/>
+ <menu_item_call label="Ignorar a este participante" name="ModerateVoiceMuteSelected"/>
<menu_item_call label="Silenciar a todos los demás" name="ModerateVoiceMuteOthers"/>
- <menu_item_call label="Designorar a este participante" name="ModerateVoiceUnMuteSelected"/>
- <menu_item_call label="Designorar a todos los demás" name="ModerateVoiceUnMuteOthers"/>
+ <menu_item_call label="Quitar el silencio a este participante" name="ModerateVoiceUnMuteSelected"/>
+ <menu_item_call label="Quitar el silencio a todos los demás" name="ModerateVoiceUnMuteOthers"/>
</context_menu>
</context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_groups.xml b/indra/newview/skins/default/xui/es/menu_people_groups.xml
index 834249752541d246becd8505fd39c4fc277e9a05..51bd2c720856c67d41dd2ef8a4953b50944482dc 100644
--- a/indra/newview/skins/default/xui/es/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_groups.xml
@@ -2,7 +2,7 @@
<menu name="menu_group_plus">
<menu_item_call label="Ver la información" name="View Info"/>
<menu_item_call label="Chat" name="Chat"/>
- <menu_item_call label="Llamada" name="Call"/>
+ <menu_item_call label="Llamar" name="Call"/>
<menu_item_call label="Activar" name="Activate"/>
<menu_item_call label="Dejar" name="Leave"/>
</menu>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 61cefd7b7686176db2e1e1020e0b10f6ff36ea12..9c08fbb2c882a039877e5bfba1772ea301cc6013 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -9,7 +9,7 @@
<menu_item_call label="Mi perfil" name="Profile"/>
<menu_item_call label="Mi apariencia" name="Appearance"/>
<menu_item_check label="Mi Inventario" name="Inventory"/>
- <menu_item_check label="Mi inventario" name="ShowSidetrayInventory"/>
+ <menu_item_check label="Mi Inventario" name="ShowSidetrayInventory"/>
<menu_item_check label="Mis gestos" name="Gestures"/>
<menu label="Mi estatus" name="Status">
<menu_item_call label="Ausente" name="Set Away"/>
@@ -47,13 +47,13 @@
<menu_item_check label="Propiedades de la parcela" name="Parcel Properties"/>
</menu>
<menu_item_call label="Teleportar a la Base" name="Teleport Home"/>
- <menu_item_call label="Fijar aquà mi Base" name="Set Home to Here"/>
+ <menu_item_call label="Fijar mi Base aquÃ" name="Set Home to Here"/>
<menu label="Sol" name="Environment Settings">
<menu_item_call label="Amanecer" name="Sunrise"/>
<menu_item_call label="MediodÃa" name="Noon"/>
<menu_item_call label="Atardecer" name="Sunset"/>
<menu_item_call label="Medianoche" name="Midnight"/>
- <menu_item_call label="Tiempo del Estado" name="Revert to Region Default"/>
+ <menu_item_call label="Hora del Estado" name="Revert to Region Default"/>
<menu_item_call label="Editor del entorno" name="Environment Editor"/>
</menu>
</menu>
@@ -100,7 +100,7 @@
<menu_item_call label="Configurar los permisos por defecto de subida" name="perm prefs"/>
<menu_item_check label="Mostrar los permisos avanzados" name="DebugPermissions"/>
<menu_item_check label="Seleccionar sólo mis objetos" name="Select Only My Objects"/>
- <menu_item_check label="Sólo seleccionar los objetos movibles" name="Select Only Movable Objects"/>
+ <menu_item_check label="Seleccionar sólo los objetos movibles" name="Select Only Movable Objects"/>
<menu_item_check label="Seleccionar marcando los alrededores" name="Select By Surrounding"/>
<menu_item_check label="Al seleccionar, mostrar lo oculto" name="Show Hidden Selection"/>
<menu_item_check label="Al seleccionar, mostrar el radio de la luz" name="Show Light Radius for Selection"/>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 0f645507257a5d7a8c5d7bc3c0565c969f19fde1..d7f7fc4987198dd440345683138222f973d1db2f 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -109,12 +109,12 @@ Asegúrate de que tu conexión a internet está funcionando adecuadamente.
<usetemplate name="okbutton" yestext="SÃ"/>
</notification>
<notification name="GrantModifyRights">
- Conceder a otro Residente permisos de modificación le permitirá cambiar, borrar o tomar CUALQUIER objeto que tengas en el mundo. Sé MUY cuidadoso manejando este permiso.
+ 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.
¿Quieres conceder permisos de modificación a [FIRST_NAME] [LAST_NAME]?
<usetemplate name="okcancelbuttons" notext="No" yestext="SÃ"/>
</notification>
<notification name="GrantModifyRightsMultiple">
- Conceder a otro Residente permisos de modificación le permitirá cambiar, borrar o tomar CUALQUIER objeto que tengas en el mundo. Sé MUY cuidadoso manejando este permiso.
+ Al conceder permisos de modificación a otro Residente, le estás permitiendo cambiar CUALQUIER objeto que tengas en el mundo. Sé MUY cuidadoso al conceder este permiso.
¿Quieres conceder permisos de modificación a los Residentes elegidos?
<usetemplate name="okcancelbuttons" notext="No" yestext="SÃ"/>
</notification>
@@ -164,7 +164,7 @@ No podrá removérseles de ese rol, sino que deberán renunciar a él por sà mi
</notification>
<notification name="AttachmentDrop">
Vas a soltar tu anexado.
- ¿Quieres seguir?
+ ¿Estás seguro de que quieres continuar?
<usetemplate ignoretext="Confirmar antes de soltar anexados" name="okcancelignore" notext="No" yestext="SÃ"/>
</notification>
<notification name="JoinGroupCanAfford">
@@ -441,7 +441,7 @@ El objeto debe de haber sido borrado o estar fuera de rango ('out of range&
No se ha podido escribir el archivo [[FILE]]
</notification>
<notification name="UnsupportedHardware">
- Debes saber que tu ordenador no cumple los requirimientos mÃnimos para [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.
+ 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?
@@ -452,7 +452,7 @@ MINSPECS
</notification>
<notification name="UnknownGPU">
Tu sistema usa una tarjeta gráfica que [APP_NAME] no reconoce.
-Esto suele suceder con hardware nuevo que aun no ha sido probado con [APP_NAME]. Probablemente todo irá bien, pero deberás ajustar tus configuraciones gráficas.
+Suele suceder con hardware nuevo que todavÃa no ha sido probado con [APP_NAME]. Probablemente todo irá bien, pero deberás ajustar tus configuraciones gráficas.
(Yo > Preferencias > Gráficos).
<form name="form">
<ignore name="ignore" text="No se ha podido identificar mi tarjeta gráfica"/>
@@ -734,7 +734,7 @@ no se ha seleccionado una parcela.
No se ha podido obtener la propiedad del terreno porque la selección se extiende por varias regiones. Por favor, seleccione un área más pequeña y reinténtelo.
</notification>
<notification name="ForceOwnerAuctionWarning">
- Esta parcela está subastándose. Forzar su propiedad cancelará la subasta y, potencialmente, puede disgustar a algunos residentes si la puja ha empezado.
+ Esta parcela está subastándose. Forzar su propiedad cancelará la subasta y, potencialmente, puede disgustar a algunos residentes si la puja ya ha empezado.
¿Forzar la propiedad?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
@@ -904,7 +904,7 @@ Deberá reconfigurar el nombre y las opciones de la nueva parcela.
Generalmente, esto es un fallo pasajero. Por favor, personaliza y guarda el Ãtem de aquà a unos minutos.
</notification>
<notification name="YouHaveBeenLoggedOut">
- Vaya, has sido desconectado de [SECOND_LIFE]
+ Vaya, se te ha cerrado la sesión en [SECOND_LIFE]
[MESSAGE]
<usetemplate name="okcancelbuttons" notext="Salir" yestext="Ver MI y Chat"/>
</notification>
@@ -1347,7 +1347,7 @@ Se ocultará el chat y los mensajes instantáneos (éstos recibirán tu Respue
<usetemplate name="okcancelbuttons" notext="Rehusar" yestext="Entrar"/>
</notification>
<notification name="JoinedTooManyGroups">
- Has superado tu número máximo de grupos. Por favor, sal de al menos uno antes de crear uno nuevo o entrar en alguno.
+ Has superado tu número máximo de grupos. Por favor, sal de al menos uno de ellos antes de crear uno nuevo o entrar en alguno.
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="KickUser">
@@ -1615,7 +1615,7 @@ Puedes pulsar 'Cambiar las Preferencias' para incrementar las preferen
</notification>
<notification label="Cambiada la calificación de la región" name="RegionMaturityChange">
Se ha actualizado el nivel de calificación de esta región.
-Llevará algún tiempo que el cambio se refleje en el mapa.
+Puede que lleve algún tiempo hasta que el cambio se vea reflejado en el mapa.
Para entrar a regiones Adultas, los Residentes deben haber verificado su cuenta, bien verificando la edad o bien verificando una forma de pago.
</notification>
@@ -1735,7 +1735,7 @@ Dado que estos objetos tienen scripts, moverlos a su inventario puede provocar u
<usetemplate ignoretext="Confirmar antes de salir" name="okcancelignore" notext="No salir" yestext="Salir"/>
</notification>
<notification name="HelpReportAbuseEmailLL">
- Usa esta herramienta para denunciar violaciones de las [http://secondlife.com/corporate/tos.php Condiciones del Servicio] y las [http://secondlife.com/corporate/cs.php Normas de la Comunidad].
+ Usa esta herramienta para denunciar violaciones de las [http://secondlife.com/corporate/tos.php Condiciones de Servicio] o las [http://secondlife.com/corporate/cs.php Normas de la Comunidad].
Se investigan y resuelven todas las infracciones denunciadas.
</notification>
@@ -2062,7 +2062,7 @@ Pulsa en un hito para seleccionarlo, y, luego, pulsa 'Teleportar' en l
</notification>
<notification name="TeleportToPerson">
Puedes contactar con un Residente como '[NAME]' abriendo el panel Gente en el lado derecho de tu pantalla.
-Elige al Residente de la lista y pulsa 'MI' en la parte superior del panel.
+Elige al Residente de la lista y pulsa 'MI' en la parte inferior del panel.
(También puedes pulsar dos veces en su nombre o pulsarlo con el botón derecho y elegir 'MI').
</notification>
<notification name="CantSelectLandFromMultipleRegions">
diff --git a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
index 7c11b3d19312b3076cd6374f7a438e23e6c2f2c6..cddbad1195c4bbce67cd05c5ce412b63efb729c4 100644
--- a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
@@ -6,5 +6,5 @@
<scroll_list name="blocked" tool_tip="Lista de los residentes ignorados actualmente"/>
<button label="Ignorar al residente..." label_selected="Ignorar al residente..." name="Block resident..." tool_tip="Elige a un Residente para ignorarle"/>
<button label="Ignorar objetos según el nombre..." label_selected="Ignorar objetos según el nombre..." name="Block object by name..."/>
- <button label="No ignorar" label_selected="No ignorar" name="Unblock" tool_tip="Quitar al Residente o al objeto de la lista de ignorados"/>
+ <button label="No ignorar" label_selected="No ignorar" name="Unblock" tool_tip="Quita al Residente o al objeto de la lista de ignorados"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_friends.xml b/indra/newview/skins/default/xui/es/panel_friends.xml
index 0dc22c107b4441bfd0fc6342d091def0562fdeea..e1cac7c2c364f8cfbe8ccb8962cf2e0239122b7b 100644
--- a/indra/newview/skins/default/xui/es/panel_friends.xml
+++ b/indra/newview/skins/default/xui/es/panel_friends.xml
@@ -16,5 +16,5 @@
<button label="Teleporte" name="offer_teleport_btn" tool_tip="Ofrecer a este amigo teleportarle hasta su posición"/>
<button label="Pagar" name="pay_btn" tool_tip="Dar dólares Linden (L$) a este amigo"/>
<button label="Quitar" name="remove_btn" tool_tip="Quitar a esta persona de su lista de amigos"/>
- <button label="Añadir" name="add_btn" tool_tip="Ofrece amistad a un Residente"/>
+ <button label="Añadir" name="add_btn" tool_tip="Ofrecer amistad a un Residente"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_control_panel.xml b/indra/newview/skins/default/xui/es/panel_group_control_panel.xml
index 82123016b150061d8b2c0c25fc41deb0f808f6e4..b398293175adcc5e577601dfba53cd492471e809 100644
--- a/indra/newview/skins/default/xui/es/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_control_panel.xml
@@ -5,7 +5,7 @@
<button label="Perfil del grupo" name="group_info_btn"/>
</layout_panel>
<layout_panel name="call_btn_panel">
- <button label="Llamada de grupo" name="call_btn"/>
+ <button label="Llamar al grupo" name="call_btn"/>
</layout_panel>
<layout_panel name="end_call_btn_panel">
<button label="Colgar" name="end_call_btn"/>
diff --git a/indra/newview/skins/default/xui/es/panel_group_invite.xml b/indra/newview/skins/default/xui/es/panel_group_invite.xml
index 2a64464fd9942b8d189d5805eff1d39f2e28a498..0d877f78f222ba62ea94b08f5b2bc3ced67e7219 100644
--- a/indra/newview/skins/default/xui/es/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_invite.xml
@@ -14,7 +14,7 @@
</text>
<button bottom_delta="-10" label="Abrir el selector de residentes" name="add_button" tool_tip=""/>
<name_list bottom_delta="-160" height="156" name="invitee_list" tool_tip="Para seleccionar a varios residentes, ve pulsando sus nombres mientras mantienes apretada la tecla Ctrl"/>
- <button label="Eliminar de la lista a los seleccionados" left_delta="-7" name="remove_button" tool_tip="Quita de la lista a los Residentes seleccionados arriba" width="214"/>
+ <button label="Eliminar de la lista a los seleccionados" left_delta="-7" name="remove_button" tool_tip="Quitar de la lista a los Residentes seleccionados arriba" width="214"/>
<text name="role_text">
Elegir qué rol asignarles:
</text>
diff --git a/indra/newview/skins/default/xui/es/panel_group_land_money.xml b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
index 0e4288f772cdd20a667e460f37802e3d50d32b38..b763e2e74d3aca3806206045b7dcb3839a603fcd 100644
--- a/indra/newview/skins/default/xui/es/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
@@ -54,7 +54,7 @@
Se necesitan más créditos de terreno para mantener el terreno en uso
</text>
<text name="group_money_heading">
- L$ del grupp
+ L$ del grupo
</text>
</panel>
<tab_container name="group_money_tab_container">
diff --git a/indra/newview/skins/default/xui/es/panel_group_notices.xml b/indra/newview/skins/default/xui/es/panel_group_notices.xml
index f4a683915685461a8314097b308da4952cd78410..58e19197825191c29a2f73157f757e5b4b1d5ff3 100644
--- a/indra/newview/skins/default/xui/es/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_notices.xml
@@ -36,7 +36,7 @@ El máximo es de 200 por dÃa y grupo.
<text name="string">
Arrastra y suelta aquà un Ãtem para adjuntarlo:
</text>
- <button label="Quitar" label_selected="Remover lo anexado" name="remove_attachment" tool_tip="Quitar el adjunto de tu aviso"/>
+ <button label="Quitar" label_selected="Remover lo anexado" name="remove_attachment" tool_tip="Quita el adjunto de tu aviso"/>
<button label="Enviar" label_selected="Enviar" name="send_notice"/>
<group_drop_target name="drop_target" tool_tip="Para enviar un Ãtem con el aviso, arrástralo desde tu inventario hasta este cajetÃn. Para poder adjuntarlo, debes tener permiso para copiarlo y transferirlo."/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_roles.xml b/indra/newview/skins/default/xui/es/panel_group_roles.xml
index 384864cba4aaa5ccf7c70f8ee40723465223f78f..5ef81162bc16d20777cb4ce37f3844b11478657c 100644
--- a/indra/newview/skins/default/xui/es/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_roles.xml
@@ -6,22 +6,22 @@
<panel.string name="want_apply_text">
¿Quieres guardar estos cambios?
</panel.string>
- <tab_container height="164" name="roles_tab_container">
- <panel height="148" label="MIEMBROS" name="members_sub_tab" tool_tip="Miembros">
+ <tab_container name="roles_tab_container">
+ <panel label="MIEMBROS" name="members_sub_tab" tool_tip="Miembros">
<panel.string name="help_text">
Puede añadir o quitar los roles asignados a los miembros.
Seleccione varios nombres manteniendo pulsada la tecla Ctrl y pulsando en cada uno de ellos.
</panel.string>
<filter_editor label="Filtrar los miembros" name="filter_input"/>
- <name_list bottom_delta="-105" height="104" name="member_list">
+ <name_list name="member_list">
<name_list.columns label="Miembro" name="name"/>
<name_list.columns label="Donaciones" name="donated"/>
<name_list.columns label="Estatus" name="online"/>
</name_list>
- <button label="Invitar" name="member_invite" width="175"/>
+ <button label="Invitar" name="member_invite"/>
<button label="Expulsar" name="member_eject"/>
</panel>
- <panel height="148" label="ROLES" name="roles_sub_tab">
+ <panel label="ROLES" name="roles_sub_tab">
<panel.string name="help_text">
Los roles tienen una etiqueta propia y unas capacidades que se
permiten ejercer a sus miembros. Los miembros pueden
@@ -35,7 +35,7 @@ incluyendo el de Todos y el de Propietarios.
Inv_FolderClosed
</panel.string>
<filter_editor label="Filtrar los roles" name="filter_input"/>
- <scroll_list bottom_delta="-104" height="104" name="role_list">
+ <scroll_list name="role_list">
<scroll_list.columns label="Rol" name="name"/>
<scroll_list.columns label="Etiqueta" name="title"/>
<scroll_list.columns label="#" name="members"/>
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 f218324d50a2b485ac9fbd478b615dd140398f09..c3d5b017ad7b53e26208eff556e6298c9f90f4ed 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
@@ -8,12 +8,12 @@
<button label="Añadir como amigo" name="add_friend_btn"/>
</layout_panel>
<layout_panel name="teleport_btn_panel">
- <button label="Teleportar" name="teleport_btn" tool_tip="Ofrecer teleporte a esta persona"/>
+ <button label="Teleportarme" name="teleport_btn" tool_tip="Ofrecer teleporte a esta persona"/>
</layout_panel>
<layout_panel name="share_btn_panel">
<button label="Compartir" name="share_btn"/>
</layout_panel>
- <layout_panel name="pay_btn_panel">
+ <layout_panel name="share_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_media_settings_general.xml b/indra/newview/skins/default/xui/es/panel_media_settings_general.xml
index 8fe3144d059b4f53c9d8b07e0d5f534f23c900cb..46326d1e8bd8c76408cf62b9c0222a7a95591a75 100644
--- a/indra/newview/skins/default/xui/es/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_media_settings_general.xml
@@ -4,16 +4,16 @@
Página inicial:
</text>
<text name="home_fails_whitelist_label">
- (Esta página no supera la lista blanca especificada)
+ (La Lista Blanca especificada no aprueba esta página)
</text>
- <line_editor name="home_url" tool_tip="La página inicial para el origen de este media"/>
+ <line_editor name="home_url" tool_tip="Página inicial para el origen de este media"/>
<text name="preview_label">
Vista previa
</text>
<text name="current_url_label">
Página actual:
</text>
- <text name="current_url" tool_tip="La página actual para el origen de este media" value=""/>
+ <text name="current_url" tool_tip="Página actual para el origen de este media" value=""/>
<button label="Definir" name="current_url_reset_btn"/>
<check_box initial_value="false" label="Media en bucle" name="auto_loop"/>
<check_box initial_value="false" label="A la primera pulsación" name="first_click_interact"/>
diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_security.xml b/indra/newview/skins/default/xui/es/panel_media_settings_security.xml
index 4b4fff5edb033d9ce8a001b221f03afe3ef020b6..c72f562a68feef50efbe213d7a0ec13d6be8830b 100644
--- a/indra/newview/skins/default/xui/es/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/es/panel_media_settings_security.xml
@@ -2,11 +2,11 @@
<panel label="Seguridad" name="Media Settings Security">
<check_box initial_value="false" label="Permitir el acceso sólo a los patrones de URL especificados" name="whitelist_enable"/>
<text name="home_url_fails_some_items_in_whitelist">
- Las entradas contra las que falle la página inicial se marcan:
+ Están marcadas las entradas que la página web no admite:
</text>
<button label="Añadir" name="whitelist_add"/>
<button label="Borrar" name="whitelist_del"/>
<text name="home_url_fails_whitelist">
- Atención: la página inicial especificada en la pestaña General no supera esta lista blanca. Se ha desactivado hasta que se añada una entrada válida.
+ Atención: la página web especificada en la pestaña General no se admite en esta lista blanca. Se ha desactivado hasta que se añada una entrada correcta.
</text>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_my_profile.xml b/indra/newview/skins/default/xui/es/panel_my_profile.xml
index 6c00a05d124966b8a75b521eaedd87d58eb6c29c..5a6fd8b14485d6ca3aa0312f506157bd1325e72e 100644
--- a/indra/newview/skins/default/xui/es/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/es/panel_my_profile.xml
@@ -28,8 +28,8 @@
</scroll_container>
</layout_panel>
<layout_panel name="profile_me_buttons_panel">
- <button label="Editar el perfil" name="edit_profile_btn" tool_tip="Modifica tu información personal"/>
- <button label="Modificar la apariencia" name="edit_appearance_btn" tool_tip="Crea o modifica tu apariencia: tu fÃsico, ropas, etc."/>
+ <button label="Editar el perfil" name="edit_profile_btn" tool_tip="Modificar tu información personal"/>
+ <button label="Modificar la apariencia" name="edit_appearance_btn" tool_tip="Crear o modificar tu apariencia: tu fÃsico, ropas, etc."/>
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_navigation_bar.xml b/indra/newview/skins/default/xui/es/panel_navigation_bar.xml
index 6c6e4c7ee82c16a28324c1280e16597851a97b8b..e8e95c3bac3f98a18bbafc80ae913772759d1d24 100644
--- a/indra/newview/skins/default/xui/es/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_navigation_bar.xml
@@ -9,7 +9,7 @@
<combo_editor label="Buscar en [SECOND_LIFE]" name="search_combo_editor"/>
</search_combo_box>
</panel>
- <favorites_bar name="favorite" tool_tip="Accede rápidamente a tus lugares favoritos de Second Life arrastrando hitos hasta aquÃ">
+ <favorites_bar name="favorite" tool_tip="¡Accede rápidamente a tus lugares favoritos de Second Life arrastrando hitos hasta aquÃ!">
<label name="favorites_bar_label" tool_tip="¡Accede rápidamente a tus lugares favoritos de Second Life arrastrando hitos hasta aquÃ!">
Barra de Favoritos
</label>
diff --git a/indra/newview/skins/default/xui/es/panel_nearby_media.xml b/indra/newview/skins/default/xui/es/panel_nearby_media.xml
index cd8836f40f4ffafe28bdfce9c1eabcaa829dfeea..885c780e00d245ea12c727d1368afd4cd340d2e1 100644
--- a/indra/newview/skins/default/xui/es/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/es/panel_nearby_media.xml
@@ -13,9 +13,9 @@
(ejecutándose)
</string>
<panel name="minimized_controls">
- <button label="Para todo" name="all_nearby_media_disable_btn" tool_tip="Apagar todos los media cercanos"/>
+ <button label="Parar todo" name="all_nearby_media_disable_btn" tool_tip="Apagar todos los media cercanos"/>
<button label="Iniciar todo" name="all_nearby_media_enable_btn" tool_tip="Encender todos los media cercanos"/>
- <button name="open_prefs_btn" tool_tip="Abre las preferencias de los media"/>
+ <button name="open_prefs_btn" tool_tip="Abrir las preferencias de los media"/>
<button label="Más >>" label_selected="Menos <<" name="more_less_btn" tool_tip="Controles avanzados"/>
</panel>
<panel name="nearby_media_panel">
@@ -29,24 +29,24 @@
<scroll_list.columns label="Visibilidad" name="media_visibility"/>
<scroll_list.columns label="Clase" name="media_class"/>
<scroll_list.columns label="Nombre" name="media_name"/>
- <scroll_list.columns label="Limpiar" name="media_debug"/>
+ <scroll_list.columns label="Depurar" name="media_debug"/>
</scroll_list>
<panel>
<layout_stack name="media_controls">
<layout_panel name="stop">
- <button name="stop_btn" tool_tip="Para los media seleccionados"/>
+ <button name="stop_btn" tool_tip="Parar los media seleccionados"/>
</layout_panel>
<layout_panel name="play">
- <button name="play_btn" tool_tip="Ejecuta los media seleccionados"/>
+ <button name="play_btn" tool_tip="Ejecutar los media seleccionados"/>
</layout_panel>
<layout_panel name="pause">
- <button name="pause_btn" tool_tip="Pausa los media seleccionados"/>
+ <button name="pause_btn" tool_tip="Pausar los media seleccionados"/>
</layout_panel>
<layout_panel name="volume_slider_ctrl">
<slider_bar initial_value="0.5" name="volume_slider" tool_tip="Volumen de los media seleccionados"/>
</layout_panel>
<layout_panel name="mute">
- <button name="mute_btn" tool_tip="Silencia el audio de los media seleccionados"/>
+ <button name="mute_btn" tool_tip="Silenciar el audio de los media seleccionados"/>
</layout_panel>
<layout_panel name="zoom">
<button name="zoom_btn" tool_tip="Zoom en los media seleccionados"/>
diff --git a/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml
index 11bbcd769522c4df571e8b1218b5e7121a517561..2f60df7743532e709ab6f881a0ed4de368b4e95e 100644
--- a/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml
@@ -6,9 +6,9 @@
</tab_container>
<panel name="bottom_panel">
<button name="options_gear_btn" tool_tip="Ver más opciones"/>
- <dnd_button name="trash_btn" tool_tip="Quita el Ãtem seleccionado"/>
- <button label="Guardar el vestuario" name="make_outfit_btn" tool_tip="Guarda la apariencia como un vestuario"/>
- <button label="Llevar" name="wear_btn" tool_tip="Viste el vestuario seleccionado"/>
+ <dnd_button name="trash_btn" tool_tip="Quitar el Ãtem seleccionado"/>
+ <button label="Guardar el vestuario" name="make_outfit_btn" tool_tip="Guardar la apariencia como un vestuario"/>
+ <button label="Ponerme" name="wear_btn" tool_tip="Ponerme el vestuario seleccionado"/>
<button label="M" name="look_edit_btn"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml
index 001446be2148ee8cbc4dfbc78c1107b9a48faaca..03c449da93393c06a6120cdf2f188de8b555a874 100644
--- a/indra/newview/skins/default/xui/es/panel_people.xml
+++ b/indra/newview/skins/default/xui/es/panel_people.xml
@@ -12,7 +12,7 @@
<panel label="CERCANÃA" name="nearby_panel">
<panel label="bottom_panel" name="bottom_panel">
<button name="nearby_view_sort_btn" tool_tip="Opciones"/>
- <button name="add_friend_btn" tool_tip="Añade al Residente seleccionado a la lista de tus amigos"/>
+ <button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/>
</panel>
</panel>
<panel label="MIS AMIGOS" name="friends_panel">
@@ -22,7 +22,7 @@
</accordion>
<panel label="bottom_panel" name="bottom_panel">
<button name="friends_viewsort_btn" tool_tip="Opciones"/>
- <button name="add_btn" tool_tip="Ofrece amistad a un Residente"/>
+ <button name="add_btn" tool_tip="Ofrecer amistad a un Residente"/>
<button name="del_btn" tool_tip="Quitar a la persona seleccionada de tu lista de amigos"/>
</panel>
<text name="no_friends_msg">
@@ -40,18 +40,18 @@ Si estás buscando gente para pasar el rato, [secondlife:///app/worldmap usa el
<panel label="RECIENTE" name="recent_panel">
<panel label="bottom_panel" name="bottom_panel">
<button name="recent_viewsort_btn" tool_tip="Opciones"/>
- <button name="add_friend_btn" tool_tip="Añade al Residente seleccionado a la lista de tus amigos"/>
+ <button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/>
</panel>
</panel>
</tab_container>
<panel name="button_bar">
- <button label="Perfil" name="view_profile_btn" tool_tip="Muestra imágenes, grupos y otra información del Residente"/>
+ <button label="Perfil" name="view_profile_btn" tool_tip="Mostrar imágenes, grupos y otra información del Residente"/>
<button label="MI" name="im_btn" tool_tip="Abrir un mensaje instantáneo"/>
<button label="Llamada" name="call_btn" tool_tip="Llamar a este Residente"/>
<button label="Compartir" name="share_btn"/>
<button label="Teleportarse" name="teleport_btn" tool_tip="Ofrecer teleporte"/>
<button label="Perfil del grupo" name="group_info_btn" tool_tip="Ver la información del grupo"/>
<button label="Chat de grupo" name="chat_btn" tool_tip="Abrir el chat"/>
- <button label="Multiconferencia" name="group_call_btn" tool_tip="Llama a este grupo"/>
+ <button label="Multiconferencia" name="group_call_btn" tool_tip="Llamar a este grupo"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml
index a08e5194e85ef0da0353757b92137dd895116e8c..3632ecca7bd7bd4b750b88dfabe8c5cfaa5338a2 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml
@@ -3,7 +3,7 @@
<panel.string name="log_in_to_change">
Conéctate para que cambie
</panel.string>
- <button label="Limpiar el historial" name="clear_cache" tool_tip="Limpiar la imagen de la pantalla de conexión, la última posición, el historial de teleportes, web y caché de las texturas."/>
+ <button label="Limpiar el historial" name="clear_cache" tool_tip="Limpia la imagen de la pantalla de conexión, la última posición, el historial de teleportes, web y caché de las texturas."/>
<text name="cache_size_label_l">
(Localizaciones, imágenes, web, historial de búsqueda)
</text>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
index 68ca63d85fad854e6ae7b863daee7503ff5cf8b9..ebf2b1084b46ed1ad2f39cc206ebda7759c58576 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
@@ -18,7 +18,7 @@
kbps
</text>
<check_box label="Personalizar el puerto" name="connection_port_enabled"/>
- <spinner label="Número del puerto:" name="connection_port"/>
+ <spinner label="Número de puerto:" name="connection_port"/>
<text name="cache_size_label_l">
Tamaño de la caché
</text>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
index 053fb0096768753a1f229c7f1a6e342ee31c0d3b..9e6cf49247c5cee5688fe3bffd1164292415b685 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
@@ -11,8 +11,8 @@
<check_box label="Activados" name="enable_media"/>
<slider label="Chat de voz" name="Voice Volume"/>
<check_box label="Activada" name="enable_voice_check"/>
- <check_box label="Permitir la ejecución automática de los media" name="media_auto_play_btn" tool_tip="Marca esto para permitir la ejecución automática de los media" value="SÃ"/>
- <check_box label="Ejecutar para otros avatares los media anexados" name="media_show_on_others_btn" tool_tip="Desmarcar esto esconderá los media anexados a otros avatares cercanos" value="SÃ"/>
+ <check_box label="Permitir la ejecución automática de los media" name="media_auto_play_btn" tool_tip="Marcar esto para permitir la ejecución automática de los media" value="SÃ"/>
+ <check_box label="Ejecutar para otros avatares los media anexados" name="media_show_on_others_btn" tool_tip="Al desmarcar esto se esconderán los media anexados a otros avatares cercanos" value="SÃ"/>
<text name="voice_chat_settings">
Configuración del chat de voz
</text>
diff --git a/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
index 037aae2e439b222866dbcce72462949834d3a534..174922e28e224c1b01a34b636614fbd3e98adbb6 100644
--- a/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
@@ -14,7 +14,7 @@
</string>
<layout_stack name="progress_indicator_area">
<panel name="media_progress_indicator">
- <progress_bar name="media_progress_bar" tool_tip="El media se está cargando"/>
+ <progress_bar name="media_progress_bar" tool_tip="Los media se están cargando"/>
</panel>
</layout_stack>
<layout_stack name="media_controls">
@@ -28,7 +28,7 @@
<button name="home_btn" tool_tip="Página inicial"/>
</layout_panel>
<layout_panel name="media_stop">
- <button name="media_stop_btn" tool_tip="Para los media"/>
+ <button name="media_stop_btn" tool_tip="Parar los media"/>
</layout_panel>
<layout_panel name="reload">
<button name="reload_btn" tool_tip="Recargar"/>
@@ -67,7 +67,7 @@
<slider name="volume_slider" tool_tip="Volumen de los media"/>
</layout_panel>
<layout_panel name="zoom_frame">
- <button name="zoom_frame_btn" tool_tip="Zoom a la mitad"/>
+ <button name="zoom_frame_btn" tool_tip="Zoom hacia los media"/>
</layout_panel>
<layout_panel name="close">
<button name="close_btn" tool_tip="Alejar el zoom"/>
diff --git a/indra/newview/skins/default/xui/es/panel_profile.xml b/indra/newview/skins/default/xui/es/panel_profile.xml
index 6347c0e04719dad6226e3c128d30e115df51709d..d725bfe61898428349f4664679e1c8615f590a54 100644
--- a/indra/newview/skins/default/xui/es/panel_profile.xml
+++ b/indra/newview/skins/default/xui/es/panel_profile.xml
@@ -42,11 +42,11 @@
<button label="Llamar" name="call" tool_tip="Llamar a este Residente"/>
<button label="Mapa" name="show_on_map_btn" tool_tip="Mostrar al Residente en el mapa"/>
<button label="Teleportar" name="teleport" tool_tip="Ofrecer teleporte"/>
- <button label="â–¼" name="overflow_btn" tool_tip="Pagar dinero o dar algo del inventario con el Residente"/>
+ <button label="▼" name="overflow_btn" tool_tip="Pagar dinero al Residente o compartir algo del inventario con él"/>
</layout_panel>
<layout_panel name="profile_me_buttons_panel">
- <button label="Editar el perfil" name="edit_profile_btn" tool_tip="Modifica tu información personal"/>
- <button label="Modificar la apariencia" name="edit_appearance_btn" tool_tip="Crea o modifica tu apariencia: tu fÃsico, ropas, etc."/>
+ <button label="Editar el perfil" name="edit_profile_btn" tool_tip="Modificar tu información personal"/>
+ <button label="Modificar la apariencia" name="edit_appearance_btn" tool_tip="Crear o modificar tu apariencia: tu fÃsico, ropas, etc."/>
</layout_panel>
</layout_stack>
</panel>
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 1a230166fb50c5a2d4b453cf12f76145d1a7545d..53d05cf2c906900e3f69755ed93171aa41ba9b20 100644
--- a/indra/newview/skins/default/xui/es/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_estate.xml
@@ -25,8 +25,8 @@
<text name="Only Allow">
Restringir el acceso a cuentas verificadas por:
</text>
- <check_box label="Información de pago aportada" name="limit_payment" tool_tip="Expulsar a los Residentes no identificados."/>
- <check_box label="Verificación de la edad" name="limit_age_verified" tool_tip="Expulsa a los Residentes que no hayan verificado su edad. Para más información, véase [SUPPORT_SITE].."/>
+ <check_box label="Información de pago aportada" name="limit_payment" tool_tip="Expulsa a los Residentes no identificados."/>
+ <check_box label="Verificación de la edad" name="limit_age_verified" tool_tip="Expulsa a los Residentes que no hayan verificado su edad. Más información en [SUPPORT_SITE]."/>
<check_box label="Permitir el chat de voz" name="voice_chat_check"/>
<button label="?" name="voice_chat_help"/>
<check_box label="Permitir el teleporte a cualquier punto" name="allow_direct_teleport"/>
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 827898973a862294c7acf028b68e7583ec4ca23d..89ad5549c8662f97f92ed3b106dd20eb6c2d5b34 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
@@ -4,13 +4,13 @@
Región:
</text>
<text name="region_text">
- desconocido
+ desconocida
</text>
<text name="version_channel_text_lbl">
Versión:
</text>
<text name="version_channel_text">
- desconocido
+ desconocida
</text>
<text name="region_type_lbl">
Tipo:
@@ -24,7 +24,7 @@
<check_box label="Impedir los 'empujones'" name="restrict_pushobject"/>
<check_box label="Permitir la reventa del terreno" name="allow_land_resell_check"/>
<check_box label="Permitir unir/dividir el terreno" name="allow_parcel_changes_check"/>
- <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"/>
+ <check_box label="Bloquear el mostrar el terreno en la búsqueda" name="block_parcel_search_check" tool_tip="Permite que la gente vea esta región y sus parcelas en los resultados de la búsqueda"/>
<spinner label="Nº máximo de avatares" name="agent_limit_spin"/>
<spinner label="Plus de objetos" name="object_bonus_spin"/>
<text label="Calificación" name="access_text">
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 ecca21e672e864330268e61dd73f619c527a9974..83c22d20ebdaa45898cd0edf6254e9acd86aee8d 100644
--- a/indra/newview/skins/default/xui/es/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_texture.xml
@@ -48,7 +48,7 @@
Estos valores representan la gama de mezclas para las texturas superiores.
</text>
<text name="height_text_lbl11">
- Midiendo en metros, el valor BAJO es la altura MÃXIMA de la textura #1, y el valor ALTO es la altura MÃNIMA de la textura #4.
+ Midiendo en metros, el valor BAJA es la altura MÃXIMA de la textura #1, y el valor ALTA es la altura MÃNIMA de la textura #4.
</text>
<text name="height_text_lbl12">
y el valor ALTA es la altura MÃNIMA de la textura #4.
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 4226744ae96b2911863a0eef20282936de6c69e0..d4404fd9b53e03e7fbe3f3e8b4efd2474eb6f2d5 100644
--- a/indra/newview/skins/default/xui/es/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_status_bar.xml
@@ -26,6 +26,6 @@
<text name="TimeText" tool_tip="Hora actual (PacÃfico)">
24:00 AM PST
</text>
- <button name="media_toggle_btn" tool_tip="Inicia/Detiene todos los media (música, vÃdeo, páginas web)"/>
+ <button name="media_toggle_btn" tool_tip="Iniciar/Parar todos los media (música, vÃdeo, páginas web)"/>
<button name="volume_btn" tool_tip="Control general del volumen"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml
index 479af3f2bfe9605b22b10574557fe0712ec5ae83..10b37b6880f3d0ff4e45d9c73177215cfbf0ddb3 100644
--- a/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="teleport_history_item">
- <button name="profile_btn" tool_tip="Muestra la información del Ãtem"/>
+ <button name="profile_btn" tool_tip="Mostrar la información del Ãtem"/>
</panel>
diff --git a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml
index ceb6e521cdab861955235c05fa3abe00a1150eb0..0d2eb0ac356d5a1105c2ce5b972b6771c99aba51 100644
--- a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml
@@ -52,7 +52,7 @@
<text name="GroupLabel">
Grupo:
</text>
- <check_box label="Compartir" name="CheckShareWithGroup" tool_tip="Permite que todos los miembros del grupo compartan y utilicen tus permisos sobre este objeto. Debes transferirlo para activar las restricciones según los roles."/>
+ <check_box label="Compartir" name="CheckShareWithGroup" 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."/>
<text name="NextOwnerLabel">
Próximo propietario:
</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 524550fd6e66ca45c09cc6f3bafa1f215cc6d8fc..0cd3b40ca6c3a9c7ebc9777a637294822a71a11b 100644
--- a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
@@ -38,38 +38,16 @@
</panel.string>
<text name="title" value="Perfil del objeto"/>
<text name="where" value="(en el mundo)"/>
- <panel name="properties_panel" label="">
- <text name="Name:">
- Nombre:
- </text>
- <text name="Description:">
- Descripción:
- </text>
+ <panel label="">
<text name="CreatorNameLabel">
Creador:
</text>
<text name="Creator Name">
Erica Linden
</text>
- <text name="Owner:">
- Propietario:
- </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="Transfeir" label_selected="Transfeir" 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">
- Al tocarlo:
- </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 al objeto" name="Payobject"/>
- <combo_box.item label="Abrir" name="Open"/>
- </combo_box>
<panel name="perms_inv">
<text name="perm_modify">
Puedes modificar este objeto
@@ -82,7 +60,7 @@
<text name="GroupLabel">
Grupo:
</text>
- <check_box label="Compartir" name="checkbox share with group" tool_tip="Permite que todos los miembros del grupo compartan y utilicen tus permisos sobre 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 en este objeto. Debes transferirlo para activar las restricciones según los roles."/>
<text name="NextOwnerLabel">
Próximo propietario:
</text>
@@ -91,13 +69,6 @@
<check_box label="Transferirlo" 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="Copiarlo" 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 objetos en los resultados de la búsqueda"/>
<text name="B:">
B:
</text>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 29486faa15cc68ca9d0e949e1c6f91a8b06754c6..619094bbfa86fddca35b119926e78569007cb16d 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -804,7 +804,7 @@
Pulsa ESC para salir de la vista subjetiva
</string>
<string name="InventoryNoMatchingItems">
- No se han encontrado Ãtems en el inventario. Intenta con [secondlife:///app/search/groups "Buscar"].
+ No se han encontrado tales Ãtems en el inventario. Intenta con [secondlife:///app/search/groups "Buscar"].
</string>
<string name="FavoritesNoMatchingItems">
Arrastra aquà un hito para tenerlo en tus favoritos.
@@ -1268,13 +1268,13 @@
todos los estados que administras para [OWNER]
</string>
<string name="RegionInfoAllowedResidents">
- Resientes autorizados: ([ALLOWEDAGENTS] de un máx. de [MAXACCESS])
+ Resientes autorizados: ([ALLOWEDAGENTS], de un máx. de [MAXACCESS])
</string>
<string name="RegionInfoAllowedGroups">
Grupos autorizados: ([ALLOWEDGROUPS], de un máx. de [MAXACCESS])
</string>
<string name="ScriptLimitsParcelScriptMemory">
- Memoria de los script en la parcela
+ Memoria de los scripts de la parcela
</string>
<string name="ScriptLimitsParcelsOwned">
Parcelas listadas: [PARCELS]
@@ -1319,10 +1319,10 @@
Cabeza
</string>
<string name="ATTACH_LSHOULDER">
- Hombro izq.
+ Hombro izquierdo
</string>
<string name="ATTACH_RSHOULDER">
- Hombro der.
+ Hombro derecho
</string>
<string name="ATTACH_LHAND">
Mano izq.
@@ -1337,7 +1337,7 @@
Pie der.
</string>
<string name="ATTACH_BACK">
- Espalda
+ Anterior
</string>
<string name="ATTACH_PELVIS">
Pelvis
@@ -1397,10 +1397,10 @@
Vientre
</string>
<string name="ATTACH_RPEC">
- Pecho der.
+ Pecho derecho
</string>
<string name="ATTACH_LPEC">
- Pecho izq.
+ Pecho izquierdo
</string>
<string name="ATTACH_HUD_CENTER_2">
HUD: Centro 2
@@ -1471,7 +1471,7 @@
(se actualizará tras la publicación)
</string>
<string name="NoPicksClassifiedsText">
- No has creado destacados o clasificados. Pulsa el botón Más para crear uno.
+ No has creado destacados ni clasificados. Pulsa el botón Más para crear uno.
</string>
<string name="NoAvatarPicksClassifiedsText">
El usuario no tiene clasificados ni destacados
@@ -3187,7 +3187,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
(Moderador)
</string>
<string name="started_call">
- Iniciar una llamada de voz
+ Llamada de voz iniciada
</string>
<string name="joined_call">
Entrando a la llamada de voz
@@ -3199,7 +3199,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
Conectado, pulsa Colgar para salir
</string>
<string name="hang_up-im">
- Colgar la llamada de voz
+ Se colgó la llamada de voz
</string>
<string name="only_user_message">
Usted es el único usuario en esta sesión.
@@ -3211,7 +3211,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
Pulse el botón [BUTTON NAME] para aceptar/conectar este chat de voz.
</string>
<string name="muted_message">
- Has ignorado a este residente. Le designorarás automáticamente enviándole un mensaje.
+ Has ignorado a este residente. Enviándole un mensaje, automáticamente dejarás de ignorarle.
</string>
<string name="generic">
Error en lo solicitado, por favor, inténtalo más tarde.
diff --git a/indra/newview/skins/default/xui/fr/floater_camera.xml b/indra/newview/skins/default/xui/fr/floater_camera.xml
index 309c93cf3b356b8964ae18db3e2c4ded4a602b8e..558551b64964e131f20295bb57577e9a28dc9e62 100644
--- a/indra/newview/skins/default/xui/fr/floater_camera.xml
+++ b/indra/newview/skins/default/xui/fr/floater_camera.xml
@@ -9,6 +9,18 @@
<floater.string name="move_tooltip">
Déplacer la caméra vers le haut et le bas, la gauche et la droite
</floater.string>
+ <floater.string name="orbit_mode_title">
+ Faire tourner
+ </floater.string>
+ <floater.string name="pan_mode_title">
+ Faire un panoramique
+ </floater.string>
+ <floater.string name="avatar_view_mode_title">
+ Préréglages
+ </floater.string>
+ <floater.string name="free_mode_title">
+ Voir l'objet
+ </floater.string>
<panel name="controls">
<joystick_track name="cam_track_stick" tool_tip="Déplacer la caméra vers le haut et le bas, la gauche et la droite"/>
<panel name="zoom" tool_tip="Zoomer en direction du point central">
@@ -25,7 +37,7 @@
<panel name="buttons">
<button label="" name="orbit_btn" tool_tip="Faire tourner la caméra"/>
<button label="" name="pan_btn" tool_tip="Faire un panoramique"/>
- <button label="" name="avatarview_btn" tool_tip="Vue subjective"/>
+ <button label="" name="avatarview_btn" tool_tip="Préréglages"/>
<button label="" name="freecamera_btn" tool_tip="Voir l'objet"/>
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_event.xml b/indra/newview/skins/default/xui/fr/floater_event.xml
index 02192c65ec9b31e7d3cf85aadde76799d99b21fe..b005ce3b360c3ad68d50738e30a279efa0639316 100644
--- a/indra/newview/skins/default/xui/fr/floater_event.xml
+++ b/indra/newview/skins/default/xui/fr/floater_event.xml
@@ -9,6 +9,18 @@
<floater.string name="dont_notify">
Ne pas prévenir
</floater.string>
+ <floater.string name="moderate">
+ Modéré
+ </floater.string>
+ <floater.string name="adult">
+ Adulte
+ </floater.string>
+ <floater.string name="general">
+ Général
+ </floater.string>
+ <floater.string name="unknown">
+ Inconnu
+ </floater.string>
<layout_stack name="layout">
<layout_panel name="profile_stack">
<text name="event_name">
@@ -21,12 +33,21 @@
Organisé par :
</text>
<text initial_value="(récupération en cours)" name="event_runby"/>
+ <text name="event_date_label">
+ Date :
+ </text>
<text name="event_date">
10/10/2010
</text>
+ <text name="event_duration_label">
+ Durée :
+ </text>
<text name="event_duration">
1 heure
</text>
+ <text name="event_covercharge_label">
+ Prix :
+ </text>
<text name="event_cover">
Gratuit
</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_moveview.xml b/indra/newview/skins/default/xui/fr/floater_moveview.xml
index 0e8887bb96f609367b9c3f393d82e02766628ecc..fac569557e0a64b94b7f641c372fc0ac2eee4c4a 100644
--- a/indra/newview/skins/default/xui/fr/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_moveview.xml
@@ -18,6 +18,15 @@
<string name="fly_back_tooltip">
Voler vers l'arrière (appuyer sur la flèche vers le bas ou S)
</string>
+ <string name="walk_title">
+ Marcher
+ </string>
+ <string name="run_title">
+ Courir
+ </string>
+ <string name="fly_title">
+ Voler
+ </string>
<panel name="panel_actions">
<button label="" label_selected="" name="turn left btn" tool_tip="Tourner à gauche (appuyer sur la flèche de gauche ou sur A)"/>
<button label="" label_selected="" name="turn right btn" tool_tip="Tourner à droite (appuyer sur la flèche de droite ou sur D)"/>
@@ -30,6 +39,5 @@
<button label="" name="mode_walk_btn" tool_tip="Mode marche"/>
<button label="" name="mode_run_btn" tool_tip="Mode course"/>
<button label="" name="mode_fly_btn" tool_tip="Mode vol"/>
- <button label="Atterrir" name="stop_fly_btn" tool_tip="Atterrir"/>
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
index dc40d31a79ee757673aebd5e0df1be963c092f9f..433dc944cf5b3db4aeb9a51d56cb79afa894feaa 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
@@ -19,7 +19,7 @@
<combo_item name="Unconstrained">
Sans contraintes
</combo_item>
- <combo_item name="1:1" tool_tip="Logo du groupe ou profil dans le monde physique">
+ <combo_item name="1:1" tool_tip="Logo du groupe ou profil dans la vie réelle">
1:1
</combo_item>
<combo_item name="4:3" tool_tip="Profil [SECOND_LIFE]">
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml
index 54ba2ad3e50a1fa144559b8663857e57461029d2..1a7bc228faa07d6b07531941fc6157b29f756e03 100644
--- a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml
@@ -16,6 +16,9 @@
Il n'y a personne près de vous avec le chat vocal activé
</string>
<layout_stack name="my_call_stack">
+ <layout_panel name="my_panel">
+ <text name="user_text" value="Mon avatar :"/>
+ </layout_panel>
<layout_panel name="leave_call_btn_panel">
<button label="Quitter l'appel" name="leave_call_btn"/>
</layout_panel>
diff --git a/indra/newview/skins/default/xui/fr/floater_water.xml b/indra/newview/skins/default/xui/fr/floater_water.xml
index 1a7401733075563ac76d2b302695868d2be510e4..6d697b40d30de19149f451c4813777fff72ea61b 100644
--- a/indra/newview/skins/default/xui/fr/floater_water.xml
+++ b/indra/newview/skins/default/xui/fr/floater_water.xml
@@ -10,7 +10,7 @@
<button label="Enregistrer" label_selected="Enregistrer" left_delta="75" name="WaterSavePreset" width="75"/>
<button label="Supprimer" label_selected="Supprimer" left_delta="80" name="WaterDeletePreset"/>
<tab_container name="Water Tabs">
- <panel label="Paramètres" name="Settings">
+ <panel label="PARAMÈTRES" name="Settings">
<text name="BHText">
Couleur du brouillard dans l'eau
</text>
@@ -43,7 +43,7 @@
Multiplicateur de flou
</text>
</panel>
- <panel label="Image" name="Waves">
+ <panel label="IMAGE" name="Waves">
<text name="BHText">
Direction grande vague
</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
index d92fadd048afa36def233f472abbddcc6b484926..9f93302b71b3a4d021c6a814cc6b56dd72383479 100644
--- a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
@@ -6,9 +6,9 @@
<button label="Nouveau" label_selected="Nouveau" name="WLNewPreset"/>
<button label="Enregistrer" label_selected="Enregistrer" left_delta="75" name="WLSavePreset" width="75"/>
<button label="Supprimer" label_selected="Supprimer" left_delta="80" name="WLDeletePreset"/>
- <button label="Éditeur du cycle du jour" label_selected="Éditeur du cycle du jour" left_pad="20" left_delta="95" name="WLDayCycleMenuButton" width="150"/>
+ <button label="Éditeur du cycle du jour" label_selected="Éditeur du cycle du jour" left_delta="95" left_pad="20" name="WLDayCycleMenuButton" width="150"/>
<tab_container name="WindLight Tabs" width="706">
- <panel label="Atmosphère" name="Atmosphere">
+ <panel label="ATMOSPHÈRE" name="Atmosphere">
<text name="BHText">
Bleu de l'horizon
</text>
@@ -62,7 +62,7 @@
</text>
<button label="?" name="WLMaxAltitudeHelp"/>
</panel>
- <panel label="Éclairage" name="Lighting">
+ <panel label="LUMIÈRE" name="Lighting">
<text name="SLCText">
Couleur soleil/lune
</text>
@@ -118,7 +118,7 @@
</text>
<button label="?" name="WLStarBrightnessHelp"/>
</panel>
- <panel label="Nuages" name="Clouds">
+ <panel label="NUAGES" name="Clouds">
<text name="WLCloudColorText">
Couleur des nuages
</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_world_map.xml b/indra/newview/skins/default/xui/fr/floater_world_map.xml
index 09ec46fd5909ad9a5b45809f6747df6c4d02b941..addbaf219931e70d05fea34464326ff7a4e9965b 100644
--- a/indra/newview/skins/default/xui/fr/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/fr/floater_world_map.xml
@@ -1,96 +1,82 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="worldmap" title="CARTE DU MONDE">
- <panel name="objects_mapview" width="542"/>
<panel name="layout_panel_1">
<text name="events_label">
Légende
</text>
</panel>
- <panel
- name="layout_panel_2">
- <button label="Afficher mon emplacement" label_selected="Afficher mon emplacement" name="Show My Location" tool_tip="Centrer la carte sur l'emplacement de mon avatar" width="165"/>
+ <panel>
+ <button label="Afficher mon emplacement" label_selected="Afficher mon emplacement" name="Show My Location" tool_tip="Centrer la carte sur l'emplacement de mon avatar"/>
<text name="me_label">
Moi
</text>
<check_box label="Résident" name="people_chk"/>
- <icon left="-262" name="person"/>
<text name="person_label">
Résident
</text>
<check_box label="Infohub" name="infohub_chk"/>
- <icon left="-266" name="infohub"/>
<text name="infohub_label">
Infohub
</text>
<check_box label="Terrain à vendre" name="land_for_sale_chk"/>
- <icon left="-266" name="landforsale"/>
<text name="land_sale_label">
Vente de terrains
</text>
- <icon left="-270" name="square2"/>
<text name="by_owner_label">
par le propriétaire
</text>
<text name="auction_label">
enchères
</text>
- <button label="Aller chez moi" label_selected="Aller chez moi" left="-120" name="Go Home" tool_tip="Me téléporter jusqu'à mon domicile" width="108"/>
+ <button label="Aller chez moi" label_selected="Aller chez moi" name="Go Home" tool_tip="Me téléporter jusqu'à mon domicile"/>
<text name="Home_label">
Domicile
</text>
- <text left="-144" name="events_label">
+ <text name="events_label">
Événements :
</text>
<check_box label="PG" name="event_chk"/>
- <icon left="-132" name="event"/>
<text name="pg_label">
Général
</text>
<check_box initial_value="true" label="Mature" name="event_mature_chk"/>
- <icon left="-132" name="events_mature_icon"/>
<text name="mature_label">
Modéré
</text>
<check_box label="Adult" name="event_adult_chk"/>
- <icon left="-132" name="events_adult_icon"/>
<text name="adult_label">
Adulte
</text>
</panel>
- <panel
- name="layout_panel_3">
+ <panel>
<text name="find_on_map_label">
Situer sur la carte
</text>
</panel>
- <panel
- name="layout_panel_4">
- <combo_box label="Amis connectés" name="friend combo" tool_tip="Afficher les amis sur la carte" width="232">
+ <panel>
+ <combo_box label="Amis connectés" name="friend combo" tool_tip="Afficher les amis sur la carte">
<combo_box.item label="Mes amis connectés" name="item1"/>
</combo_box>
- <icon left="-270" name="landmark_icon"/>
- <combo_box label="Mes repères" name="landmark combo" tool_tip="Repère à afficher sur la carte" width="232">
+ <combo_box label="Mes repères" name="landmark combo" tool_tip="Repère à afficher sur la carte">
<combo_box.item label="Mes repères" name="item1"/>
</combo_box>
- <search_editor label="Régions par nom" name="location" tool_tip="Saisissez le nom d'une région" width="155"/>
- <button label="Trouver" label_selected=">" left_delta="160" name="DoSearch" tool_tip="Recherchez sur la carte" width="75"/>
+ <search_editor label="Régions par nom" name="location" tool_tip="Saisissez le nom d'une région"/>
+ <button label="Trouver" label_selected=">" name="DoSearch" tool_tip="Recherchez sur la carte"/>
<button name="Clear" tool_tip="Effacer les lignes de suivi et réinitialiser la carte"/>
- <scroll_list left="-270" name="search_results" width="252">
+ <scroll_list name="search_results">
<scroll_list.columns label="" name="icon"/>
<scroll_list.columns label="" name="sim_name"/>
</scroll_list>
- <button label="Téléporter" label_selected="Téléporter" left="-270" name="Teleport" tool_tip="Téléporter à l'endroit sélectionné"/>
- <button label="Copier la SLurl" left="-270" name="copy_slurl" tool_tip="Copie l'emplacement actuel sous la forme d'une SLurl à utiliser sur le Web."/>
- <button label="Afficher la sélection" label_selected="Afficher la destination" name="Show Destination" tool_tip="Centrer la carte sur l'endroit sélectionné" width="165"/>
+ <button label="Téléporter" label_selected="Téléporter" name="Teleport" tool_tip="Téléporter à l'endroit sélectionné"/>
+ <button label="Copier la SLurl" name="copy_slurl" tool_tip="Copie l'emplacement actuel sous la forme d'une SLurl à utiliser sur le Web."/>
+ <button label="Afficher la sélection" label_selected="Afficher la destination" name="Show Destination" tool_tip="Centrer la carte sur l'endroit sélectionné"/>
</panel>
- <panel
- name="layout_panel_5">
+ <panel>
<text name="zoom_label">
Zoomer
</text>
</panel>
- <panel
- name="layout_panel_6">
- <slider label="Zoom" left="-270" name="zoom slider"/>
+ <panel>
+ <slider label="Zoom" name="zoom slider"/>
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml
index 1837be9c5d6381b04dddf29b7e06a91b73183d9a..6492a83e063cd7d6ad6af46f2fef9ba41e63e87b 100644
--- a/indra/newview/skins/default/xui/fr/menu_object.xml
+++ b/indra/newview/skins/default/xui/fr/menu_object.xml
@@ -5,6 +5,7 @@
<menu_item_call label="Construire" name="Build"/>
<menu_item_call label="Ouvrir" name="Open"/>
<menu_item_call label="M'asseoir ici" name="Object Sit"/>
+ <menu_item_call label="Me lever" name="Object Stand Up"/>
<menu_item_call label="Profil de l'objet" name="Object Inspect"/>
<menu_item_call label="Zoomer en avant" name="Zoom In"/>
<context_menu label="Porter â–¶" name="Put On">
@@ -18,6 +19,7 @@
<menu_item_call label="Retour" name="Return..."/>
<menu_item_call label="Supprimer" name="Delete"/>
</context_menu>
+ <menu_item_call label="Acheter" name="Pie Object Bye"/>
<menu_item_call label="Prendre" name="Pie Object Take"/>
<menu_item_call label="Prendre une copie" name="Take Copy"/>
<menu_item_call label="Payer" name="Pay..."/>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
index 08a97ee4033e5a81b2ac1e1a6d4aafaa21cc28a5..26bd3978a9bd08581bade90e0ada568019f19a48 100644
--- a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
@@ -5,6 +5,7 @@
<menu_item_call label="Supprimer cet ami" name="Remove Friend"/>
<menu_item_call label="IM" name="IM"/>
<menu_item_call label="Appeler" name="Call"/>
+ <menu_item_call label="Carte" name="Map"/>
<menu_item_call label="Partager" name="Share"/>
<menu_item_call label="Payer" name="Pay"/>
<menu_item_check label="Ignorer/Ne plus ignorer" name="Block/Unblock"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index c54a4341f138ff719f46724fae979f9cd05236da..5925d28565cceec5134706b967bf33661436ca88 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -43,6 +43,8 @@
<menu_item_check label="Balises" name="beacons"/>
<menu_item_check label="Limites du terrain" name="Property Lines"/>
<menu_item_check label="Propriétaires de terrains" name="Land Owners"/>
+ <menu_item_check label="Coordonnées" name="Coordinates"/>
+ <menu_item_check label="Propriétés de la parcelle" name="Parcel Properties"/>
</menu>
<menu_item_call label="Me téléporter chez moi" name="Teleport Home"/>
<menu_item_call label="Définir le domicile ici" name="Set Home to Here"/>
@@ -81,7 +83,8 @@
<menu_item_call label="Point central sur la sélection" name="Focus on Selection"/>
<menu_item_call label="Zoomer sur la sélection" name="Zoom to Selection"/>
<menu label="Objet" name="Object">
- <menu_item_call label="Acheter" name="Menu Object Take"/>
+ <menu_item_call label="Acheter" name="Menu Object Buy"/>
+ <menu_item_call label="Prendre" name="Menu Object Take"/>
<menu_item_call label="Prendre une copie" name="Take Copy"/>
<menu_item_call label="Enregistrer dans mon inventaire" name="Save Object Back to My Inventory"/>
<menu_item_call label="Enregistrer dans le contenu des objets" name="Save Object Back to Object Contents"/>
@@ -149,7 +152,6 @@
<menu_item_check label="Alpha" name="Alpha"/>
<menu_item_check label="Arbre" name="Tree"/>
<menu_item_check label="Avatars" name="Character"/>
- <menu_item_check label="SurfacePath" name="Surface"/>
<menu_item_check label="Ciel" name="Sky"/>
<menu_item_check label="Eau" name="Water"/>
<menu_item_check label="Sol" name="Ground"/>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 28f9f9e52c8d2297cc00d03b4123c4dcf6065df2..7d2a33509be55e73a40e2af6a1a3908e42cd8e43 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -445,9 +445,8 @@ L'objet est peut-être inaccessible ou a peut-être été supprimé.
Impossible d'écrire le fichier [[FILE]]
</notification>
<notification name="UnsupportedHardware">
- Votre ordinateur ne satisfait pas la configuration système requise pour [APP_NAME]. Les performances risquent d'être médiocres. Malheureusement, la page [SUPPORT_SITE] n’offre aucune assistance pour les problèmes de configuration système.
+ Votre ordinateur ne satisfait pas la configuration système requise pour [APP_NAME]. Les performances risquent d'être médiocres. Malheureusement, la section [SUPPORT_SITE] n'offre aucune aide pour les problèmes de configuration système.
-MINSPECS
Consulter [_URL] pour en savoir plus ?
<url name="url" option="0">
http://secondlife.com/support/sysreqs.php?lang=fr
@@ -2335,6 +2334,12 @@ Veuillez réessayer dans quelques minutes.
<notification name="FriendshipDeclined">
[NAME] a refusé votre amitié.
</notification>
+ <notification name="FriendshipAcceptedByMe">
+ Amitié acceptée.
+ </notification>
+ <notification name="FriendshipDeclinedByMe">
+ Amitié refusée.
+ </notification>
<notification name="OfferCallingCard">
[FIRST] [LAST] vous offre sa carte de visite.
Cela ajoute un marque-page dans votre inventaire, ce qui vous permet d'envoyer rapidement un IM à ce résident.
@@ -2543,7 +2548,7 @@ Elles vont être bloquées pendant quelques secondes pour votre sécurité.
</notification>
<notification name="ConfirmCloseAll">
Êtes-vous certain de vouloir fermer tous les IM ?
- <usetemplate name="okcancelignore" notext="Annuler" yestext="OK"/>
+ <usetemplate ignoretext="Confirmer avant de fermer tous les IM." name="okcancelignore" notext="Annuler" yestext="OK"/>
</notification>
<notification name="AttachmentSaved">
L'élément joint a été sauvegardé.
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
index d10a7f37e1143f2b661eb5ec0e5e30d2c9b74d36..7c8365fdee9a2fd0fdd443abb5a051c065061b4a 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
@@ -33,7 +33,7 @@
<icon label="" name="2nd_life_edit_icon" tool_tip="Cliquez pour sélectionner une image"/>
</panel>
<panel name="first_life_image_panel">
- <text name="real_world_photo_title_text" value="Monde physique :"/>
+ <text name="real_world_photo_title_text" value="Vie réelle :"/>
</panel>
<icon label="" name="real_world_edit_icon" tool_tip="Cliquez pour sélectionner une image"/>
<text name="title_homepage_text">
diff --git a/indra/newview/skins/default/xui/fr/panel_group_roles.xml b/indra/newview/skins/default/xui/fr/panel_group_roles.xml
index 7fc10833ea17d5e4024a7ad7ed8edf18a6bb2569..e1eeaa8601f371a673a90b8e8bc2c4a25f1c2a14 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_roles.xml
@@ -15,10 +15,10 @@ Pour sélectionner plusieurs membres, cliquez sur leurs noms en maintenant la to
<filter_editor label="Filtrer les membres" name="filter_input"/>
<name_list name="member_list">
<name_list.columns label="Membre" name="name"/>
- <name_list.columns label="Donation" name="donated" width="116"/>
- <name_list.columns label="Statut" name="online" width="136"/>
+ <name_list.columns label="Donation" name="donated"/>
+ <name_list.columns label="Statut" name="online"/>
</name_list>
- <button label="Inviter" name="member_invite" width="165"/>
+ <button label="Inviter" name="member_invite"/>
<button label="Expulser" name="member_eject"/>
</panel>
<panel label="RÔLES" name="roles_sub_tab">
@@ -47,7 +47,7 @@ notamment les rôles Tous et Propriétaire.
<scroll_list.columns label="#" name="members"/>
</scroll_list>
<button label="Nouveau rôle" name="role_create"/>
- <button label="Supprimer le rôle" name="role_delete" width="120"/>
+ <button label="Supprimer le rôle" name="role_delete"/>
</panel>
<panel height="148" label="POUVOIRS" name="actions_sub_tab" tool_tip="Vous pouvez afficher une description du pouvoir et voir quels membres et rôles peuvent s'en servir.">
<panel.string name="help_text">
diff --git a/indra/newview/skins/default/xui/fr/panel_my_profile.xml b/indra/newview/skins/default/xui/fr/panel_my_profile.xml
index 73affc34204101ae26f574b6878a35c487dc60e7..ce2e5f4c602cde053695cb4fcea9b9dd8a81fa28 100644
--- a/indra/newview/skins/default/xui/fr/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_my_profile.xml
@@ -26,7 +26,7 @@
</panel>
<panel name="first_life_image_panel">
<icon label="" name="real_world_edit_icon" tool_tip="Cliquez sur le bouton Modifier le profil ci-dessous pour changer d'image"/>
- <text name="title_rw_descr_text" value="Monde physique :"/>
+ <text name="title_rw_descr_text" value="Vie réelle :"/>
</panel>
<text name="title_member_text" value="Résident depuis :"/>
<text name="title_acc_status_text" value="Statut du compte :"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml b/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fdc489f375ec6eabd344b633f4fb6eb00c3ccef3
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="friend_online_status" name="friend_online_status"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml
index 84749806ff98ad3ce8be84a52726f8f0bcdcc012..39885e1e12aac99ebb8f4983fc1845812705edc7 100644
--- a/indra/newview/skins/default/xui/fr/panel_people.xml
+++ b/indra/newview/skins/default/xui/fr/panel_people.xml
@@ -21,8 +21,8 @@
<accordion_tab name="tab_all" title="Tout"/>
</accordion>
<text name="no_friends_msg">
- Pour ajouter des amis, essayez [secondlife:///app/search/people la recherche globale] ou cliquez sur un utilisateur pour l'ajouter à vos amis.
-Si vous voulez rencontrer d'autres résidents, ouvrez la [secondlife:///app/worldmap carte].
+ Pour ajouter des amis, utilisez la [secondlife:///app/search/people recherche] ou cliquez sur un résident pour l'ajouter à vos amis.
+Si vous souhaitez rencontrer d'autres résidents, cliquez sur [secondlife:///app/worldmap la carte].
</text>
<panel label="bottom_panel" name="bottom_panel">
<button name="friends_viewsort_btn" tool_tip="Options"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_places.xml b/indra/newview/skins/default/xui/fr/panel_places.xml
index f6a64f0c58511c5e311d65647c6e715fbecfb8c7..f740dcd32610a912aad46f49d69e127c02d292e3 100644
--- a/indra/newview/skins/default/xui/fr/panel_places.xml
+++ b/indra/newview/skins/default/xui/fr/panel_places.xml
@@ -7,9 +7,9 @@
<button label="Téléporter" name="teleport_btn" tool_tip="Me téléporter jusqu'à la zone sélectionnée"/>
<button label="Carte" name="map_btn"/>
<button label="Éditer" name="edit_btn" tool_tip="Modifier les informations du repère"/>
- <button name="overflow_btn" tool_tip="Afficher d'autres options"/>
- <button label="Fermer" name="close_btn"/>
- <button label="Annuler" name="cancel_btn"/>
+ <button label="â–¼" name="overflow_btn" tool_tip="Afficher d'autres options"/>
<button label="Enregistrer" name="save_btn"/>
+ <button label="Annuler" name="cancel_btn"/>
+ <button label="Fermer" name="close_btn"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
index 27d2b2182b131dbfa33941cdb7baa928d894e39c..4c055a2b8d4d09834e9cafcd9d71144803ec5950 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
@@ -13,9 +13,12 @@
<check_box label="Activé" name="enable_voice_check"/>
<check_box label="Autoriser la lecture automatique du média" name="media_auto_play_btn" tool_tip="Cochez pour autoriser la lecture automatique du média" value="vrai"/>
<check_box label="Jouer le média aux autres avatars" name="media_show_on_others_btn" tool_tip="Décochez pour masquer le média aux autres avatars près de vous" value="vrai"/>
- <text name="Listen from">
+ <text name="voice_chat_settings">
Paramètres du chat vocal
</text>
+ <text name="Listen from">
+ Écouter à partir de :
+ </text>
<radio_group name="ear_location">
<radio_item label="Position de la caméra" name="0"/>
<radio_item label="Position de l'avatar" name="1"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_profile.xml b/indra/newview/skins/default/xui/fr/panel_profile.xml
index c439435d1a89f32e215ffb5b2361da9f43c8fd56..8cb46419379c378eca9ad12f531420326cae1b24 100644
--- a/indra/newview/skins/default/xui/fr/panel_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_profile.xml
@@ -24,7 +24,7 @@
<text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
</panel>
<panel name="first_life_image_panel">
- <text name="title_rw_descr_text" value="Monde physique :"/>
+ <text name="title_rw_descr_text" value="Vie réelle :"/>
</panel>
<text name="title_member_text" value="Résident depuis :"/>
<text name="title_acc_status_text" value="Statut du compte :"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
index f9262ea478a8fc1301b7cf4a3fc979873b8ed6b7..e1acbe3817723f2c3db897555c8819e05eb40f66 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
@@ -20,8 +20,8 @@ domaine.
<text name="Only Allow">
Limiter l'accès aux comptes vérifiés par :
</text>
- <check_box label="Informations de paiement enregistrées" name="limit_payment" tool_tip="Bannir les résidents non identifiés"/>
- <check_box label="Vérification de mon âge" name="limit_age_verified" tool_tip="Bannir les résidents qui n'ont pas vérifié leur âge. Consultez la page [SUPPORT_SITE] pour plus d'informations."/>
+ <check_box label="Infos de paiement enregistrées" name="limit_payment" tool_tip="Bannir les résidents non identifiés"/>
+ <check_box label="Vérification de l'âge" name="limit_age_verified" tool_tip="Bannir les résidents qui n'ont pas vérifié leur âge. Consultez la page [SUPPORT_SITE] pour plus d'informations."/>
<check_box label="Autoriser les chats vocaux" name="voice_chat_check"/>
<button label="?" name="voice_chat_help"/>
<text name="abuse_email_text">
diff --git a/indra/newview/skins/default/xui/fr/panel_status_bar.xml b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
index e58e806f99390d07554fb2031068ed3e6d903f23..b9bc1dd9d830ef3ef8e1a6911ac076a23d913af3 100644
--- a/indra/newview/skins/default/xui/fr/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
@@ -21,11 +21,11 @@
<panel.string name="buycurrencylabel">
[AMT] L$
</panel.string>
- <button label="" label_selected="" name="buycurrency" tool_tip="Mon solde"/>
- <button label="Acheter des L$" name="buyL" tool_tip="Cliquez pour acheter plus de L$"/>
+ <button label="" label_selected="" name="buycurrency" right="-250" tool_tip="Mon solde"/>
+ <button label="Acheter" name="buyL" tool_tip="Cliquez pour acheter plus de L$"/>
<text name="TimeText" tool_tip="Heure actuelle (Pacifique)">
00h00 PST
</text>
- <button name="media_toggle_btn" tool_tip="Cliquer pour activer/désactiver le média"/>
+ <button name="media_toggle_btn" tool_tip="Arrêter tous les médias (musique, vidéo, pages web)"/>
<button name="volume_btn" tool_tip="Contrôle du volume global"/>
</panel>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index c9a5b5917dad3822647459ee59838070d81ccade..d78b78f7d01bac16781ac16f878bb442e8c0aa73 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -1506,6 +1506,9 @@
<string name="NoPicksClassifiedsText">
Vous n'avez pas créé de favoris ni de petites annonces Cliquez sur le bouton Plus pour créer un favori ou une petite annonce.
</string>
+ <string name="NoAvatarPicksClassifiedsText">
+ L'utilisateur n'a ni favoris ni petites annonces
+ </string>
<string name="PicksClassifiedsLoadingText">
Chargement...
</string>
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index 9105c2613d94e44acf7692a1ed6b12c40d46538c..0eaad11cc72bbba2abb26627b73430287f6a572c 100644
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -43,7 +43,7 @@ Vivox ãƒãƒ¼ã‚¸ãƒ§ãƒ³ï¼š [VIVOX_VERSION]
</panel>
<panel label="クレジット" name="credits_panel">
<text_editor name="credits_editor">
- Second Lifeã¯ã€ Philipã€Tessaã€Andrewã€Coryã€Jamesã€Benã€Charã€Charlieã€Colinã€Danã€Danielã€Dougã€Ericã€Hamletã€Haneyã€Eveã€Hunterã€Ianã€Jeffã€Jenniferã€Jimã€Johnã€Leeã€Markã€Peterã€Phoenixã€Richardã€Robinã€Xenonã€Steveã€Tanyaã€Eddieã€Aviã€Frankã€Bruceã€Aaronã€Aliceã€Bobã€Debraã€Eileenã€Helenã€Janetã€Louieã€Leviathaniaã€Stefanã€Rayã€Kevinã€Tomã€Mikebã€MikeTã€Burgessã€Elenaã€Tracyã€Billã€Toddã€Ryanã€Zachã€Sarahã€Novaã€Timã€Stephanieã€Michaelã€Evanã€Nicolasã€Catherineã€Rachelleã€Daveã€Hollyã€Bubã€Kellyã€Magellanã€Ramziã€Donã€Sabinã€Jillã€Rheyaã€Jeskaã€Torleyã€Konaã€Callumã€Charityã€Ventrellaã€Jackã€Vektorã€Irisã€Chrisã€Nicoleã€Mickã€Reubenã€Blueã€Babbageã€Yedwabã€Deanaã€Laurenã€Brentã€Pathfinderã€Chadrickã€Altruimaã€Jesseã€Teenyã€Monroeã€Icculusã€Davidã€Tessã€Lizzieã€Patsyã€Isaacã€Lawrenceã€Cynã€Boã€Giaã€Annetteã€Mariusã€Tboneã€Jonathanã€Karenã€Ginsuã€Satokoã€Yukoã€Makikoã€Thomasã€Harryã€Sethã€Alexeiã€Brianã€Guyã€Runitaiã€Ethanã€Dataã€Corneliusã€Kennyã€Swissã€Zeroã€Natriaã€Wendyã€Stephenã€Teepleã€Thumperã€Lucyã€Deeã€Miaã€Lianaã€Warrenã€Brankaã€Auraã€beezã€Miloã€Hermiaã€Redã€Thraxã€Joeã€Sallyã€Magentaã€Moguraã€Paulã€Joseã€Rejeanã€Henrikã€Lexieã€Amberã€Loganã€Xanã€Noraã€Morpheusã€Donovanã€Leylaã€MichaelFrancisã€Beastã€Cubeã€Buckyã€Joshuaã€Stryfeã€Harmonyã€Teresaã€Claudiaã€Walkerã€Glennã€Fritzã€Fordakã€Juneã€Cleopetraã€Jeanã€Ivyã€Betsyã€Rooseveltã€Spikeã€Kenã€Whichã€Tofuã€Chiyoã€Robã€Zeeã€dustinã€Georgeã€Delã€Matthewã€Catã€Jacquiã€Lightfootã€Adrianã€Violaã€Alfredã€Noelã€Irfanã€Sunilã€Yoolã€Rikaã€Janeã€Xtremeã€Frontierã€a2ã€Neoã€Siobhanã€Yozã€Justinã€Elleã€Qarlã€Benjaminã€Isabelã€Gulliverã€Everettã€Christopherã€Izzyã€Stephanyã€Garryã€Sejongã€Seanã€Tobinã€Iridiumã€Metaã€Anthonyã€Jeremyã€JPã€Jakeã€Mauriceã€Madhaviã€Leopardã€Kyleã€Joonã€Kariã€Bertã€Belindaã€Jonã€Kristiã€Bridieã€Pramodã€KJã€Socratesã€Mariaã€Ivanã€Aricã€Yamasakiã€Adreanneã€Jayã€MitchKã€Cerenã€Cocoã€Durlã€Jennyã€Periapseã€Karticã€Storrsã€Lotteã€Sandyã€Rohnã€Colossusã€Zenã€BigPapiã€Bradã€Pastramiã€Kurzã€Maniã€Neuroã€Jaimeã€MJã€Rowanã€Sgtã€Elvisã€Geckoã€Samuelã€Sardonyxã€Leoã€Bryanã€Nikoã€Softã€Poppyã€Rachelã€Akiã€Angeloã€Banzaiã€Alexaã€Sueã€CeeLoã€Benderã€CGã€Gillianã€Pelleã€Nickã€Echoã€Zaraã€Christineã€Shamiranã€Emmaã€Blakeã€Keikoã€Plexusã€Joppaã€Sidewinderã€Ericaã€Ashleiã€Twilightã€Kristenã€Brettã€Qã€Enusã€Simonã€Bevisã€Kraftã€Kipã€Chandlerã€Ronã€LauraPã€Ramã€KyleJMã€Scouseã€Prosperoã€Melissaã€Martyã€Natã€Hamiltonã€Kendã€Lordanã€Jimmyã€Kosmoã€Seraphã€Greenã€Ekimã€Wiggoã€JTã€Romeã€Dorisã€Mizã€Benocã€Whumpã€Trinityã€Patchã€Kateã€TJã€Baoã€Joohwanã€Christyã€Sofiaã€Matiasã€Cogsworthã€Johanã€Orehã€Cheahã€Angelaã€Brandyã€Mangoã€Lanã€Aleksã€Gloriaã€Heidyã€Mitchellã€Spaceã€Coltonã€Bambersã€Einsteinã€Maggieã€Malbersã€Roseã€Winnieã€Stellaã€Miltonã€Rothmanã€Niallã€Marinã€Allisonã€Katieã€Dawnã€Kattã€Dustyã€Kalpanaã€Judyã€Andreaã€Ambroffã€Infinityã€Gailã€Ricoã€Raymondã€Yiã€Williamã€Christaã€Mã€Teaganã€Scoutã€Mollyã€Danteã€Corrã€Dynamikeã€Usiã€Kayleeã€Vidtutsã€Lilã€Danicaã€Saschaã€Kelvã€Jacobã€Nyaã€Rodneyã€Brandonã€Elsieã€Blondinã€Grantã€Katrinã€Nyxã€Gabrielã€Locklainnã€Claireã€Devinã€Minervaã€Montyã€Austinã€Bradfordã€Siã€Keiraã€Hã€Caitlinã€Ditaã€Makaiã€Jennã€Annã€Meredithã€Clareã€Joyã€Praveenã€Codyã€Edmundã€Rutheã€Sirenaã€Gayathriã€Spiderã€FJã€Davidoffã€Tianã€Jennieã€Louiseã€Oskarã€Landonã€Noelleã€Jarvã€Ingridã€Alã€Sommerã€Docã€Ariaã€Huinã€Grayã€Liliã€Virã€DJã€Yangã€Tã€Simoneã€Maestroã€Scottã€Charleneã€Quixoteã€Amandaã€Susanã€Zedã€Anneã€Enkiduã€Esbeeã€Joroanã€Katelinã€Roxieã€Tayã€Scarletã€Kevinã€Johnnyã€Wolfgangã€Andrenã€Bobã€Howardã€Merovã€Randã€Rayã€Michonã€Newellã€Galenã€Dessieã€Lesã€Michonã€Jenelleã€Geoã€Sizã€Shapiroã€Peteã€Calyleã€Seleneã€Allenã€Phoebeã€Goldinã€Kimmoraã€Dakotaã€Slatonã€Lindquistã€Zoeyã€Hariã€Othelloã€Rohitã€Sheldonã€Petraã€Vialeã€Gordonã€Kayeã€Pinkã€Fernyã€Emersonã€Davyã€Briã€Chanã€Juanã€Robertã€Terrenceã€Nathanã€Carlã¨ã€ãã®ä»–多数ã®äººé”ã«ã‚ˆã£ã¦ä½œæˆã•ã‚Œã¾ã—ãŸã€‚
+ Second Life ã¯ã€ Philipã€Tessaã€Andrewã€Coryã€Jamesã€Benã€Charã€Charlieã€Colinã€Danã€Danielã€Dougã€Ericã€Hamletã€Haneyã€Eveã€Hunterã€Ianã€Jeffã€Jenniferã€Jimã€Johnã€Leeã€Markã€Peterã€Phoenixã€Richardã€Robinã€Xenonã€Steveã€Tanyaã€Eddieã€Aviã€Frankã€Bruceã€Aaronã€Aliceã€Bobã€Debraã€Eileenã€Helenã€Janetã€Louieã€Leviathaniaã€Stefanã€Rayã€Kevinã€Tomã€Mikebã€MikeTã€Burgessã€Elenaã€Tracyã€Billã€Toddã€Ryanã€Zachã€Sarahã€Novaã€Timã€Stephanieã€Michaelã€Evanã€Nicolasã€Catherineã€Rachelleã€Daveã€Hollyã€Bubã€Kellyã€Magellanã€Ramziã€Donã€Sabinã€Jillã€Rheyaã€Jeskaã€Torleyã€Konaã€Callumã€Charityã€Ventrellaã€Jackã€Vektorã€Irisã€Chrisã€Nicoleã€Mickã€Reubenã€Blueã€Babbageã€Yedwabã€Deanaã€Laurenã€Brentã€Pathfinderã€Chadrickã€Altruimaã€Jesseã€Teenyã€Monroeã€Icculusã€Davidã€Tessã€Lizzieã€Patsyã€Isaacã€Lawrenceã€Cynã€Boã€Giaã€Annetteã€Mariusã€Tboneã€Jonathanã€Karenã€Ginsuã€Satokoã€Yukoã€Makikoã€Thomasã€Harryã€Sethã€Alexeiã€Brianã€Guyã€Runitaiã€Ethanã€Dataã€Corneliusã€Kennyã€Swissã€Zeroã€Natriaã€Wendyã€Stephenã€Teepleã€Thumperã€Lucyã€Deeã€Miaã€Lianaã€Warrenã€Brankaã€Auraã€beezã€Miloã€Hermiaã€Redã€Thraxã€Joeã€Sallyã€Magentaã€Moguraã€Paulã€Joseã€Rejeanã€Henrikã€Lexieã€Amberã€Loganã€Xanã€Noraã€Morpheusã€Donovanã€Leylaã€MichaelFrancisã€Beastã€Cubeã€Buckyã€Joshuaã€Stryfeã€Harmonyã€Teresaã€Claudiaã€Walkerã€Glennã€Fritzã€Fordakã€Juneã€Cleopetraã€Jeanã€Ivyã€Betsyã€Rooseveltã€Spikeã€Kenã€Whichã€Tofuã€Chiyoã€Robã€Zeeã€dustinã€Georgeã€Delã€Matthewã€Catã€Jacquiã€Lightfootã€Adrianã€Violaã€Alfredã€Noelã€Irfanã€Sunilã€Yoolã€Rikaã€Janeã€Xtremeã€Frontierã€a2ã€Neoã€Siobhanã€Yozã€Justinã€Elleã€Qarlã€Benjaminã€Isabelã€Gulliverã€Everettã€Christopherã€Izzyã€Stephanyã€Garryã€Sejongã€Seanã€Tobinã€Iridiumã€Metaã€Anthonyã€Jeremyã€JPã€Jakeã€Mauriceã€Madhaviã€Leopardã€Kyleã€Joonã€Kariã€Bertã€Belindaã€Jonã€Kristiã€Bridieã€Pramodã€KJã€Socratesã€Mariaã€Ivanã€Aricã€Yamasakiã€Adreanneã€Jayã€MitchKã€Cerenã€Cocoã€Durlã€Jennyã€Periapseã€Karticã€Storrsã€Lotteã€Sandyã€Rohnã€Colossusã€Zenã€BigPapiã€Bradã€Pastramiã€Kurzã€Maniã€Neuroã€Jaimeã€MJã€Rowanã€Sgtã€Elvisã€Geckoã€Samuelã€Sardonyxã€Leoã€Bryanã€Nikoã€Softã€Poppyã€Rachelã€Akiã€Angeloã€Banzaiã€Alexaã€Sueã€CeeLoã€Benderã€CGã€Gillianã€Pelleã€Nickã€Echoã€Zaraã€Christineã€Shamiranã€Emmaã€Blakeã€Keikoã€Plexusã€Joppaã€Sidewinderã€Ericaã€Ashleiã€Twilightã€Kristenã€Brettã€Qã€Enusã€Simonã€Bevisã€Kraftã€Kipã€Chandlerã€Ronã€LauraPã€Ramã€KyleJMã€Scouseã€Prosperoã€Melissaã€Martyã€Natã€Hamiltonã€Kendã€Lordanã€Jimmyã€Kosmoã€Seraphã€Greenã€Ekimã€Wiggoã€JTã€Romeã€Dorisã€Mizã€Benocã€Whumpã€Trinityã€Patchã€Kateã€TJã€Baoã€Joohwanã€Christyã€Sofiaã€Matiasã€Cogsworthã€Johanã€Orehã€Cheahã€Angelaã€Brandyã€Mangoã€Lanã€Aleksã€Gloriaã€Heidyã€Mitchellã€Spaceã€Coltonã€Bambersã€Einsteinã€Maggieã€Malbersã€Roseã€Winnieã€Stellaã€Miltonã€Rothmanã€Niallã€Marinã€Allisonã€Katieã€Dawnã€Kattã€Dustyã€Kalpanaã€Judyã€Andreaã€Ambroffã€Infinityã€Gailã€Ricoã€Raymondã€Yiã€Williamã€Christaã€Mã€Teaganã€Scoutã€Mollyã€Danteã€Corrã€Dynamikeã€Usiã€Kayleeã€Vidtutsã€Lilã€Danicaã€Saschaã€Kelvã€Jacobã€Nyaã€Rodneyã€Brandonã€Elsieã€Blondinã€Grantã€Katrinã€Nyxã€Gabrielã€Locklainnã€Claireã€Devinã€Minervaã€Montyã€Austinã€Bradfordã€Siã€Keiraã€Hã€Caitlinã€Ditaã€Makaiã€Jennã€Annã€Meredithã€Clareã€Joyã€Praveenã€Codyã€Edmundã€Rutheã€Sirenaã€Gayathriã€Spiderã€FJã€Davidoffã€Tianã€Jennieã€Louiseã€Oskarã€Landonã€Noelleã€Jarvã€Ingridã€Alã€Sommerã€Docã€Ariaã€Huinã€Grayã€Liliã€Virã€DJã€Yangã€Tã€Simoneã€Maestroã€Scottã€Charleneã€Quixoteã€Amandaã€Susanã€Zedã€Anneã€Enkiduã€Esbeeã€Joroanã€Katelinã€Roxieã€Tayã€Scarletã€Kevinã€Johnnyã€Wolfgangã€Andrenã€Bobã€Howardã€Merovã€Randã€Rayã€Michonã€Newellã€Galenã€Dessieã€Lesã€Michonã€Jenelleã€Geoã€Sizã€Shapiroã€Peteã€Calyleã€Seleneã€Allenã€Phoebeã€Goldinã€Kimmoraã€Dakotaã€Slatonã€Lindquistã€Zoeyã€Hariã€Othelloã€Rohitã€Sheldonã€Petraã€Vialeã€Gordonã€Kayeã€Pinkã€Fernyã€Emersonã€Davyã€Briã€Chanã€Juanã€Robertã€Terrenceã€Nathanã€Carlã¨ã€ãã®ä»–多数ã®äººé”ã«ã‚ˆã£ã¦ä½œæˆã•ã‚Œã¾ã—ãŸã€‚
ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’ã“ã‚Œã¾ã§ã§æœ€é«˜ã®ã‚‚ã®ã«ãªã‚‹ã‚ˆã†ã”å”力をã„ãŸã ã„ãŸä»¥ä¸‹ã®ä½äººã®çš†æ§˜ã«æ·±ãæ„Ÿè¬ã„ãŸã—ã¾ã™ã€‚ able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
diff --git a/indra/newview/skins/default/xui/ja/floater_camera.xml b/indra/newview/skins/default/xui/ja/floater_camera.xml
index 3730bcd385600b676b5d4342cec2812141e05cea..610d4183b37214885ced76c34c8846c3739e07c2 100644
--- a/indra/newview/skins/default/xui/ja/floater_camera.xml
+++ b/indra/newview/skins/default/xui/ja/floater_camera.xml
@@ -9,6 +9,18 @@
<floater.string name="move_tooltip">
カメラを上下左å³ã«ç§»å‹•
</floater.string>
+ <floater.string name="orbit_mode_title">
+ 旋回
+ </floater.string>
+ <floater.string name="pan_mode_title">
+ 水平・垂直移動
+ </floater.string>
+ <floater.string name="avatar_view_mode_title">
+ 固定
+ </floater.string>
+ <floater.string name="free_mode_title">
+ オブジェクトを見る
+ </floater.string>
<panel name="controls">
<joystick_track name="cam_track_stick" tool_tip="カメラを上下左å³ã«å‹•ã‹ã—ã¾ã™"/>
<panel name="zoom" tool_tip="å‘ã„ã¦ã„る方法ã«ã‚«ãƒ¡ãƒ©ã‚’ズーム">
@@ -25,7 +37,7 @@
<panel name="buttons">
<button label="" name="orbit_btn" tool_tip="カメラを回ã™"/>
<button label="" name="pan_btn" tool_tip="カメラを水平・垂直移動"/>
- <button label="" name="avatarview_btn" tool_tip="ã‚¢ãƒã‚¿ãƒ¼è¦–点"/>
+ <button label="" name="avatarview_btn" tool_tip="固定"/>
<button label="" name="freecamera_btn" tool_tip="オブジェクトを見る"/>
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
index 3bd5ed283710a40c27290a611fab4fd332bc1e8b..2a7985fe58a3a13358c4c23ab5936cd9b8450b42 100644
--- a/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Day Cycle Floater" title="デイ・サイクル編集">
+<floater name="Day Cycle Floater" title="デイサイクル編集">
<tab_container name="Day Cycle Tabs">
- <panel label="デイ・サイクル" name="Day Cycle">
+ <panel label="デイサイクル" name="Day Cycle">
<button label="?" name="WLDayCycleHelp" />
<text name="WL12am">
深夜 12時
@@ -63,7 +63,7 @@
ã‚ーフレームã®è¨å®šï¼š
</text>
<text name="WLCurKeyTimeText">
- ã‚ー・タイム：
+ ã‚ータイム：
</text>
<spinner label="時間" name="WLCurKeyHour" />
<spinner label="分" name="WLCurKeyMin" />
@@ -88,10 +88,10 @@
<button label="åœæ¢!" label_selected="åœæ¢" name="WLStopAnimSky" />
<button label="ä¸å‹•ç”£ã®æ™‚刻を使用"
label_selected="ä¸å‹•ç”£ã®æ™‚刻ã«å¤‰æ›´" name="WLUseLindenTime" width="140"/>
- <button label="デイ・テストをä¿å˜"
- label_selected="デイ・テストをä¿å˜" name="WLSaveDayCycle" />
- <button label="デイ・テストをãƒãƒ¼ãƒ‰"
- label_selected="デイ・テストをãƒãƒ¼ãƒ‰" name="WLLoadDayCycle" />
+ <button label="デイテストをä¿å˜"
+ label_selected="デイテストをä¿å˜" name="WLSaveDayCycle" />
+ <button label="デイテストをãƒãƒ¼ãƒ‰"
+ label_selected="デイテストをãƒãƒ¼ãƒ‰" name="WLLoadDayCycle" />
</panel>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_event.xml b/indra/newview/skins/default/xui/ja/floater_event.xml
index 306b262b704f45c6fb229e947df7fcb5de3c3b6e..671f9077d9dc827f1b61f7caf6887cc4c53ca508 100644
--- a/indra/newview/skins/default/xui/ja/floater_event.xml
+++ b/indra/newview/skins/default/xui/ja/floater_event.xml
@@ -9,6 +9,18 @@
<floater.string name="dont_notify">
知らã›ãªã„
</floater.string>
+ <floater.string name="moderate">
+ Moderate
+ </floater.string>
+ <floater.string name="adult">
+ Adult
+ </floater.string>
+ <floater.string name="general">
+ General
+ </floater.string>
+ <floater.string name="unknown">
+ ä¸æ˜Ž
+ </floater.string>
<layout_stack name="layout">
<layout_panel name="profile_stack">
<text name="event_name">
@@ -21,12 +33,21 @@
主催者：
</text>
<text initial_value="（å–å¾—ä¸ï¼‰" name="event_runby"/>
+ <text name="event_date_label">
+ 日付：
+ </text>
<text name="event_date">
10/10/2010
</text>
+ <text name="event_duration_label">
+ 期間：
+ </text>
<text name="event_duration">
1 時間
</text>
+ <text name="event_covercharge_label">
+ ã‚«ãƒãƒ¼ãƒãƒ£ãƒ¼ã‚¸ï¼š
+ </text>
<text name="event_cover">
ç„¡æ–™
</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_moveview.xml b/indra/newview/skins/default/xui/ja/floater_moveview.xml
index 8ba297c7a02997f70aae0baa743df920c9a0f62e..20aec4854171bb3d1c564be236e3e7e867fe9bdf 100644
--- a/indra/newview/skins/default/xui/ja/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_moveview.xml
@@ -18,6 +18,15 @@
<string name="fly_back_tooltip">
後ã‚ã«é£›ã¶ï¼ˆä¸‹çŸ¢å°ã‹ S を押ã™ï¼‰
</string>
+ <string name="walk_title">
+ æ©ã
+ </string>
+ <string name="run_title">
+ èµ°ã‚‹
+ </string>
+ <string name="fly_title">
+ 飛ã¶
+ </string>
<panel name="panel_actions">
<button label="" label_selected="" name="turn left btn" tool_tip="左をå‘ã（左矢å°ã‹ A を押ã™ï¼‰"/>
<button label="" label_selected="" name="turn right btn" tool_tip="å³ã‚’å‘ã（å³çŸ¢å°ã‹ D を押ã™ï¼‰"/>
@@ -30,6 +39,5 @@
<button label="" name="mode_walk_btn" tool_tip="æ©è¡Œãƒ¢ãƒ¼ãƒ‰"/>
<button label="" name="mode_run_btn" tool_tip="走行モード"/>
<button label="" name="mode_fly_btn" tool_tip="飛行モード"/>
- <button label="飛行åœæ¢" name="stop_fly_btn" tool_tip="飛行åœæ¢"/>
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
index 606dda12bda8481ccfda3071f968d1c75b86dd05..4fc59e16d336026dd219cf379b687595f581f0af 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
@@ -6,6 +6,6 @@
<text name="desc txt">
説明：
</text>
- <button label="インワールドã§å†ç”Ÿã™ã‚‹" label_selected="åœæ¢" name="Anim play btn" tool_tip="他人ã«ã‚‚見ãˆã‚‹ã‚ˆã†ã«å†ç”Ÿã—ã¾ã™"/>
+ <button label="インワールドã§å†ç”Ÿ" label_selected="åœæ¢" name="Anim play btn" tool_tip="他人ã«ã‚‚見ãˆã‚‹ã‚ˆã†ã«å†ç”Ÿã—ã¾ã™"/>
<button label="ãƒãƒ¼ã‚«ãƒ«å†ç”Ÿ" label_selected="åœæ¢" name="Anim audition btn" tool_tip="自分ã ã‘ãŒè¦‹ãˆã‚‹ã‚ˆã†ã«å†ç”Ÿã—ã¾ã™"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
index 8a0aea717c8fa1b5e36970768c188a4a6e80edc6..c437e8c02a26a9b157fb8e049b3660be95135bbe 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
@@ -33,10 +33,10 @@
<text name="trigger_label">
トリガー:
</text>
- <text name="replace_text" tool_tip="トリガー・ワードをã“れらã®å˜èªžã«ç½®ãæ›ãˆã¾ã™ã€‚ ãŸã¨ãˆã°ã€ãƒˆãƒªã‚¬ãƒ¼ã€Œhelloã€ã‚’「Howdyã€ã«ç½®æ›ã™ã‚‹ã¨ã€ã€ŒI wanted to say helloã€ã¨ã„ã†ãƒãƒ£ãƒƒãƒˆæ–‡ãŒã€ŒI wanted to say howdyã€ã«å¤‰ã‚ã‚Šã€ã‚¸ã‚§ã‚¹ãƒãƒ£ãƒ¼ã«ã‚‚ç½®æ›ãŒåæ˜ ã•ã‚Œã¾ã™ã€‚">
+ <text name="replace_text" tool_tip="トリガーワードをã“れらã®å˜èªžã«ç½®ãæ›ãˆã¾ã™ã€‚ ãŸã¨ãˆã°ã€ãƒˆãƒªã‚¬ãƒ¼ã€Œhelloã€ã‚’「Howdyã€ã«ç½®æ›ã™ã‚‹ã¨ã€ã€ŒI wanted to say helloã€ã¨ã„ã†ãƒãƒ£ãƒƒãƒˆæ–‡ãŒã€ŒI wanted to say howdyã€ã«å¤‰ã‚ã‚Šã€ã‚¸ã‚§ã‚¹ãƒãƒ£ãƒ¼ã«ã‚‚ç½®æ›ãŒåæ˜ ã•ã‚Œã¾ã™ã€‚">
ç½®æ›ï¼š
</text>
- <line_editor name="replace_editor" tool_tip="トリガー・ワードをã“れらã®å˜èªžã«ç½®ãæ›ãˆã¾ã™ã€‚ ãŸã¨ãˆã°ã€ãƒˆãƒªã‚¬ãƒ¼ã€Œhelloã€ã‚’「Howdyã€ã«ç½®æ›ã™ã‚‹ã¨ã€ã€ŒI wanted to say helloã€ã¨ã„ã†ãƒãƒ£ãƒƒãƒˆæ–‡ãŒã€ŒI wanted to say howdyã€ã«å¤‰ã‚ã‚Šã€ã‚¸ã‚§ã‚¹ãƒãƒ£ãƒ¼ã«ã‚‚ç½®æ›ãŒåæ˜ ã•ã‚Œã¾ã™ã€‚"/>
+ <line_editor name="replace_editor" tool_tip="トリガーワードをã“れらã®å˜èªžã«ç½®ãæ›ãˆã¾ã™ã€‚ ãŸã¨ãˆã°ã€ãƒˆãƒªã‚¬ãƒ¼ã€Œhelloã€ã‚’「Howdyã€ã«ç½®æ›ã™ã‚‹ã¨ã€ã€ŒI wanted to say helloã€ã¨ã„ã†ãƒãƒ£ãƒƒãƒˆæ–‡ãŒã€ŒI wanted to say howdyã€ã«å¤‰ã‚ã‚Šã€ã‚¸ã‚§ã‚¹ãƒãƒ£ãƒ¼ã«ã‚‚ç½®æ›ãŒåæ˜ ã•ã‚Œã¾ã™ã€‚"/>
<text name="key_label">
ショートカット：
</text>
@@ -62,7 +62,7 @@
<text name="help_label">
待機ステップを入れãªã„é™ã‚Šã¯ã€ã™ã¹ã¦ã®ã‚¹ãƒ†ãƒƒãƒ—ãŒåŒæ™‚ã«èµ·ã“ã‚Šã¾ã™ã€‚
</text>
- <check_box label="アクティブ" left="120" name="active_check" tool_tip="アクティブ・ジェスãƒãƒ£ãƒ¼ã¯ã€ãƒˆãƒªã‚¬ãƒ¼ãƒ»ãƒ•ãƒ¬ãƒ¼ã‚ºã‚’使ã†ã‹ã€ã¾ãŸã¯ãƒ›ãƒƒãƒˆãƒ»ã‚ーを押ã™ã“ã¨ã«ã‚ˆã£ã¦ãƒˆãƒªã‚¬ãƒ¼ã§ãã¾ã™ã€‚ 1ã¤ã®ã‚·ãƒ§ãƒ¼ãƒˆã‚«ãƒƒãƒˆãƒ»ã‚ーã«2ã¤ä»¥ä¸Šã®ã‚¸ã‚§ã‚¹ãƒãƒ£ãƒ¼ãŒå‰²ã‚Šå½“ã¦ã‚‰ã‚ŒãŸå ´åˆã€ãã®ã‚¸ã‚§ã‚¹ãƒãƒ£ãƒ¼ã¯ä¸¡æ–¹ã¨ã‚‚アクティブã§ã¯ãªããªã‚Šã¾ã™ã€‚"/>
+ <check_box label="アクティブ" left="120" name="active_check" tool_tip="アクティブãªã‚¸ã‚§ã‚¹ãƒãƒ£ãƒ¼ã¯ã€ãƒˆãƒªã‚¬ãƒ¼ãƒ•ãƒ¬ãƒ¼ã‚ºã‚’使ã†ã‹ã€ãƒ›ãƒƒãƒˆã‚ーを押ã™ã¨åˆ‡ã‚Šæ›¿ã‚ã‚Šã¾ã™ã€‚ 1ã¤ã®ã‚·ãƒ§ãƒ¼ãƒˆã‚«ãƒƒãƒˆã‚ーã«2ã¤ä»¥ä¸Šã®ã‚¸ã‚§ã‚¹ãƒãƒ£ãƒ¼ãŒå‰²ã‚Šå½“ã¦ã‚‰ã‚ŒãŸå ´åˆã€ãã®ã‚¸ã‚§ã‚¹ãƒãƒ£ãƒ¼ã¯ä¸¡æ–¹ã¨ã‚‚アクティブã§ã¯ãªããªã‚Šã¾ã™ã€‚"/>
<button label="プレビュー" name="preview_btn"/>
<button label="ä¿å˜" name="save_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
index c8375389cea669f88aa9dcb7f09640c9b455b606..5c0f05cec6fad891a4f4b6d02bcd03d6139f3547 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
@@ -6,6 +6,6 @@
<text name="desc txt">
説明：
</text>
- <button label="インワールドã§å†ç”Ÿã™ã‚‹" label_selected="インワールドã§å†ç”Ÿã™ã‚‹" name="Sound play btn" tool_tip="他人ã«ã‚‚èžã“ãˆã‚‹ã‚ˆã†ã«å†ç”Ÿã—ã¾ã™"/>
+ <button label="インワールドã§å†ç”Ÿ" label_selected="インワールドã§å†ç”Ÿ" name="Sound play btn" tool_tip="他人ã«ã‚‚èžã“ãˆã‚‹ã‚ˆã†ã«å†ç”Ÿã—ã¾ã™"/>
<button label="ãƒãƒ¼ã‚«ãƒ«å†ç”Ÿ" label_selected="ãƒãƒ¼ã‚«ãƒ«å†ç”Ÿ" name="Sound audition btn" tool_tip="自分ã ã‘ãŒèžã“ãˆã‚‹ã‚ˆã†ã«å†ç”Ÿã—ã¾ã™"/>
</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index e9de43189c89c45d6d6d43d6426dbaec450074e3..a8261a7493f9f139d787a85f3322cf51ccd08561 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -69,7 +69,7 @@
</text>
<check_box label="両å´ã‚’引伸ã°ã™" left="116" name="checkbox uniform"/>
<check_box initial_value="true" label="テクスãƒãƒ£ã‚’引伸ã°ã™" name="checkbox stretch textures"/>
- <check_box initial_value="true" label="グリッドãƒã‚¤ãƒ³ãƒˆã«ã‚¹ãƒŠãƒƒãƒ—" left_delta="27" name="checkbox snap to grid"/>
+ <check_box initial_value="true" label="グリッドã«ã‚¹ãƒŠãƒƒãƒ—" left_delta="27" name="checkbox snap to grid"/>
<combo_box left_delta="60" name="combobox grid mode" tool_tip="オブジェクトã®é…ç½®ã«ä½¿ã†ã‚°ãƒªãƒƒãƒ‰ãƒ«ãƒ¼ãƒ©ã‚’é¸æŠžã—ã¾ã™" width="76">
<combo_box.item label="インワールドグリッド" name="World"/>
<combo_box.item label="ãƒãƒ¼ã‚«ãƒ«ã‚°ãƒªãƒƒãƒ‰" name="Local"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
index 5a0694e5c5ecfb59505d45e4259ec5c9f50d2bfc..5af8f20690f2c4f2a7c5a55edb31c9367a8f2778 100644
--- a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
@@ -16,6 +16,9 @@
è¿‘ãã«ãƒœã‚¤ã‚¹ã‚’有効ã«ã—ã¦ã„る人ã¯ã„ã¾ã›ã‚“。
</string>
<layout_stack name="my_call_stack">
+ <layout_panel name="my_panel">
+ <text name="user_text" value="マイ ã‚¢ãƒã‚¿ãƒ¼ï¼š"/>
+ </layout_panel>
<layout_panel name="leave_call_btn_panel">
<button label="コール終了" name="leave_call_btn"/>
</layout_panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_water.xml b/indra/newview/skins/default/xui/ja/floater_water.xml
index 52cd91a08a32d2d20f116a6057569a33ddb4a8b7..fb64332e7978e3046631ea283e5f1feb00954d6b 100644
--- a/indra/newview/skins/default/xui/ja/floater_water.xml
+++ b/indra/newview/skins/default/xui/ja/floater_water.xml
@@ -28,10 +28,10 @@
<slider label="2" name="WaterNormalScaleY"/>
<slider label="3" name="WaterNormalScaleZ"/>
<text name="HDText">
- フレãƒãƒ«ãƒ»ã‚¹ã‚±ãƒ¼ãƒ«
+ フレãƒãƒ«ã®ã‚¹ã‚±ãƒ¼ãƒ«
</text>
<text name="FresnelOffsetText">
- フレãƒãƒ«ãƒ»ã‚ªãƒ•ã‚»ãƒƒãƒˆ
+ フレãƒãƒ«ã®ã‚ªãƒ•ã‚»ãƒƒãƒˆ
</text>
<text name="DensMultText">
æ°´é¢ã®å±ˆæŠ˜ã‚¹ã‚±ãƒ¼ãƒ«
@@ -63,7 +63,7 @@
Y
</text>
<text name="BHText3">
- ノーマル・マップ
+ ノーマルマップ
</text>
</panel>
</tab_container>
diff --git a/indra/newview/skins/default/xui/ja/menu_object.xml b/indra/newview/skins/default/xui/ja/menu_object.xml
index 1ff2dfec7b5a9ca57b4bc4a85beda90de3b494cd..e59a50053409f8af1494c4087b121f6a88960e27 100644
--- a/indra/newview/skins/default/xui/ja/menu_object.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object.xml
@@ -5,6 +5,7 @@
<menu_item_call label="制作" name="Build"/>
<menu_item_call label="é–‹ã" name="Open"/>
<menu_item_call label="ã“ã“ã«åº§ã‚‹" name="Object Sit"/>
+ <menu_item_call label="ç«‹ã¡ä¸ŠãŒã‚‹" name="Object Stand Up"/>
<menu_item_call label="オブジェクトã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«" name="Object Inspect"/>
<menu_item_call label="ズームイン" name="Zoom In"/>
<context_menu label="è£…ç€ â–¶" name="Put On">
@@ -18,6 +19,7 @@
<menu_item_call label="è¿”å´" name="Return..."/>
<menu_item_call label="削除" name="Delete"/>
</context_menu>
+ <menu_item_call label="è²·ã†" name="Pie Object Bye"/>
<menu_item_call label="å–ã‚‹" name="Pie Object Take"/>
<menu_item_call label="コピーをå–ã‚‹" name="Take Copy"/>
<menu_item_call label="支払ã†" name="Pay..."/>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
index 4788803789a99297c13723de5dcf46537a730b06..8d84b0e521cec30169201f568b706128cae0e352 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
@@ -5,6 +5,7 @@
<menu_item_call label="フレンドを削除" name="Remove Friend"/>
<menu_item_call label="IM" name="IM"/>
<menu_item_call label="コール" name="Call"/>
+ <menu_item_call label="地図" name="Map"/>
<menu_item_call label="共有" name="Share"/>
<menu_item_call label="支払ã†" name="Pay"/>
<menu_item_check label="ブãƒãƒƒã‚¯ãƒ»ãƒ–ãƒãƒƒã‚¯è§£é™¤" name="Block/Unblock"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index a97e7f2f5d9eac91ae458761cbbd45d22aa54d37..e6fb07f120184661c9564e36b85f8223a124caa1 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -6,12 +6,12 @@
<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=ja"/>
</menu_item_call>
<menu_item_call label="L$ ã®è³¼å…¥" name="Buy and Sell L$"/>
- <menu_item_call label="マイ プãƒãƒ•ã‚£ãƒ¼ãƒ«" name="Profile"/>
- <menu_item_call label="マイ 容姿" name="Appearance"/>
- <menu_item_check label="マイ æŒã¡ç‰©" name="Inventory"/>
+ <menu_item_call label="プãƒãƒ•ã‚£ãƒ¼ãƒ«" name="Profile"/>
+ <menu_item_call label="容姿" name="Appearance"/>
+ <menu_item_check label="æŒã¡ç‰©" name="Inventory"/>
<menu_item_check label="æŒã¡ç‰©" name="ShowSidetrayInventory"/>
- <menu_item_check label="マイ ジェスãƒãƒ£ãƒ¼" name="Gestures"/>
- <menu label="マイ ãƒã‚°ã‚¤ãƒ³çŠ¶æ…‹" name="Status">
+ <menu_item_check label="ジェスãƒãƒ£ãƒ¼" name="Gestures"/>
+ <menu label="ãƒã‚°ã‚¤ãƒ³çŠ¶æ…‹" name="Status">
<menu_item_call label="一時退å¸ä¸" name="Set Away"/>
<menu_item_call label="å–ã‚Šè¾¼ã¿ä¸" name="Set Busy"/>
</menu>
@@ -43,6 +43,8 @@
<menu_item_check label="ビーコン（標è˜ï¼‰" name="beacons"/>
<menu_item_check label="プãƒãƒ‘ティ境界線" name="Property Lines"/>
<menu_item_check label="土地所有者" name="Land Owners"/>
+ <menu_item_check label="座標" name="Coordinates"/>
+ <menu_item_check label="区画プãƒãƒ‘ティ" name="Parcel Properties"/>
</menu>
<menu_item_call label="ホームã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆ" name="Teleport Home"/>
<menu_item_call label="ç¾åœ¨åœ°ã‚’ホームã«è¨å®š" name="Set Home to Here"/>
@@ -81,6 +83,7 @@
<menu_item_call label="é¸æŠžã—ãŸã‚‚ã®ã«ç„¦ç‚¹ã‚’åˆã‚ã›ã‚‹" name="Focus on Selection"/>
<menu_item_call label="é¸æŠžã—ãŸã‚‚ã®ã‚’ズームã™ã‚‹" name="Zoom to Selection"/>
<menu label="オブジェクト" name="Object">
+ <menu_item_call label="è²·ã†" name="Menu Object Buy"/>
<menu_item_call label="å–ã‚‹" name="Menu Object Take"/>
<menu_item_call label="コピーをå–ã‚‹" name="Take Copy"/>
<menu_item_call label="「æŒã¡ç‰©ã€ã«ä¿å˜" name="Save Object Back to My Inventory"/>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 2f877a6abae42c152ce28ef5ec517346908dc56d..4fc3f1d46f3e9824ee3d5fe6ddd9d750a2f190d6 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -339,10 +339,10 @@ L$ ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ã
ã¾ã èªã¿è¾¼ã¾ã‚Œã¦ã„ãªã„ãŸã‚ã€ãã®ã‚¢ã‚¤ãƒ†ãƒ を装ç€ã§ãã¾ã›ã‚“。後ã§ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。
</notification>
<notification name="MustHaveAccountToLogIn">
- ãŠã£ã¨! 記入æ¼ã‚ŒãŒã‚ã‚Šã¾ã™ã‚ˆã€‚
+ ãŠã£ã¨ï¼è¨˜å…¥æ¼ã‚ŒãŒã‚ã‚Šã¾ã™ã‚ˆã€‚
ã‚¢ãƒã‚¿ãƒ¼ã®ãƒ•ã‚¡ãƒ¼ã‚¹ãƒˆãƒãƒ¼ãƒ ã¨ãƒ©ã‚¹ãƒˆãƒãƒ¼ãƒ ã®ä¸¡æ–¹ã‚’入力ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
-[SECOND_LIFE]ã«å…¥ã‚‹ã«ã¯ã€ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãŒå¿…è¦ã§ã™ã€‚ アカウントを作æˆã—ã¾ã™ã‹ï¼Ÿ
+[SECOND_LIFE] ã«å…¥ã‚‹ã«ã¯ã€ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãŒå¿…è¦ã§ã™ã€‚ アカウントを作æˆã—ã¾ã™ã‹ï¼Ÿ
<url name="url">
https://join.secondlife.com/index.php?lang=ja-JP
</url>
@@ -470,7 +470,6 @@ L$ ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ã
<notification name="UnsupportedHardware">
ãŠä½¿ã„ã®ã‚³ãƒ³ãƒ”ューター㯠[APP_NAME] ã®å¿…è¦æœ€ä½Žé™ã®å‹•ä½œç’°å¢ƒã‚’満ãŸã—ã¦ã„ã¾ã›ã‚“。 パフォーマンスã®ä½Žä¸‹ã‚’æ„Ÿã˜ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。 æれ入りã¾ã™ãŒ [SUPPORT_SITE] ã§ã¯ã‚µãƒãƒ¼ãƒˆå¯¾è±¡å¤–ã®ã‚·ã‚¹ãƒ†ãƒ ã«é–¢ã™ã‚‹æŠ€è¡“的サãƒãƒ¼ãƒˆã¯è¡Œã£ã¦ãŠã‚Šã¾ã›ã‚“。
-最低動作環境
[_URL] ã«ç§»å‹•ã—ã¦ç¢ºèªã‚’ã—ã¾ã™ã‹ï¼Ÿ
<url name="url" option="0">
http://secondlife.com/support/sysreqs.php?lang=ja
@@ -586,7 +585,7 @@ L$ ãŒä¸è¶³ã—ã¦ã„ã‚‹ã®ã§ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ã
ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®æ‹¡å¼µåãŒæ£ã—ã„ã‹ã©ã†ã‹ã‚’確èªã—ã¦ãã ã•ã„。
</notification>
<notification name="InvalidFileExtension">
- [EXTENSION]ã¯ç„¡åŠ¹ã§ã™ã€‚
+ [EXTENSION] ã¯ç„¡åŠ¹ã§ã™ã€‚
æ£ã—ã„æ‹¡å¼µå：[VALIDS]
<usetemplate name="okbutton" yestext="OK"/>
</notification>
@@ -1345,7 +1344,7 @@ F1 ã‚ーを押ã—ã¦ãã ã•ã„。
</notification>
<notification name="ConfirmKick">
ã™ã¹ã¦ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’グリッドã®å¤–ã«ã‚ックã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚æ“作を続行ã—ã¾ã™ã‹ï¼Ÿ
- <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="å…¨ã¦ã®ãƒ¦ãƒ¼ã‚¶ã‚’追ã„出ã™"/>
+ <usetemplate name="okcancelbuttons" notext="ã‚ャンセル" yestext="å…¨ã¦ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’追ã„出ã™"/>
</notification>
<notification name="MuteLinden">
リンデンをブãƒãƒƒã‚¯ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。
@@ -1447,15 +1446,15 @@ F1 ã‚ーを押ã—ã¦ãã ã•ã„。
</notification>
<notification name="TeleportFromLandmark">
ã“ã®ã¾ã¾ <nolink>[LOCATION]</nolink> ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã™ã‹ï¼Ÿ
- <usetemplate ignoretext="ランドマークã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ãŸã„ã‹ã®ç¢ºèª" name="okcancelignore" notext="ã‚ャンセル" yestext="テレãƒãƒ¼ãƒˆ"/>
+ <usetemplate ignoretext="ランドマークã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ãŸã„ã‹ã©ã†ã‹ã®ç¢ºèª" name="okcancelignore" notext="ã‚ャンセル" yestext="テレãƒãƒ¼ãƒˆ"/>
</notification>
<notification name="TeleportToPick">
[PICK] ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã™ã‹ï¼Ÿ
- <usetemplate ignoretext="ピックã®å ´æ‰€ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ãŸã„ã‹ã®ç¢ºèª" name="okcancelignore" notext="ã‚ャンセル" yestext="テレãƒãƒ¼ãƒˆ"/>
+ <usetemplate ignoretext="ピックã®å ´æ‰€ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ãŸã„ã‹ã©ã†ã‹ã®ç¢ºèª" name="okcancelignore" notext="ã‚ャンセル" yestext="テレãƒãƒ¼ãƒˆ"/>
</notification>
<notification name="TeleportToClassified">
[CLASSIFIED] ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã™ã‹ï¼Ÿ
- <usetemplate ignoretext="クラシファイド広告ã®å ´æ‰€ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ãŸã„ã‹ã®ç¢ºèª" name="okcancelignore" notext="ã‚ャンセル" yestext="テレãƒãƒ¼ãƒˆ"/>
+ <usetemplate ignoretext="クラシファイド広告ã®å ´æ‰€ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ãŸã„ã‹ã©ã†ã‹ã®ç¢ºèª" name="okcancelignore" notext="ã‚ャンセル" yestext="テレãƒãƒ¼ãƒˆ"/>
</notification>
<notification label="ã‚ãªãŸã®ä¸å‹•ç”£å†…ã®å…¨å“¡ã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ä¿¡" name="MessageEstate">
今ã‚ãªãŸã®ä¸å‹•ç”£ã«ã„る人全員ã«é€ã‚‹ã€çŸã„メッセージを入力ã—ã¦ãã ã•ã„。
@@ -1931,7 +1930,7 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="ForceCloseChatterBoxSession">
- [NAME]ã¨ã®ãƒãƒ£ãƒƒãƒˆã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚’é–‰ã˜ã¾ã™ã€‚
+ [NAME] ã¨ã®ãƒãƒ£ãƒƒãƒˆã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚’é–‰ã˜ã¾ã™ã€‚
[REASON]
<usetemplate name="okbutton" yestext="OK"/>
</notification>
@@ -1944,8 +1943,8 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»
<usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="AutoWearNewClothing">
- 作æˆã—よã†ã¨ã—ã¦ã„る衣類を自動的ã«è£…ç€ã—ã¾ã™ã‹ï¼Ÿ
- <usetemplate ignoretext="「マイ 容姿ã€ã‚’編集ä¸ã«ã€ä½œæˆã™ã‚‹è¡£é¡žã‚’装ç€ã™ã‚‹ã¨ã" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/>
+ 作æˆã™ã‚‹è¡£é¡žã‚’自動的ã«è£…ç€ã—ã¾ã™ã‹ï¼Ÿ
+ <usetemplate ignoretext="「容姿ã€ã‚’編集ä¸ã«ã€ä½œæˆã™ã‚‹è¡£é¡žã‚’装ç€ã™ã‚‹ã¨ã" name="okcancelignore" notext="ã„ã„ãˆ" yestext="ã¯ã„"/>
</notification>
<notification name="NotAgeVerified">
年齢確èªã‚’済ã¾ã›ã¦ã„ãªã„ã¨ã“ã®åŒºç”»ã‚’訪れるã“ã¨ãŒã§ãã¾ã›ã‚“。 [SECOND_LIFE] サイトã§å¹´é½¢ã®ç¢ºèªã‚’è¡Œã„ã¾ã™ã‹ï¼Ÿ
@@ -2229,27 +2228,27 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»
ãã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«ã„ãªã„ã¨å…¬å…±ã®åœŸåœ°ã‚’å–å¾—ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。
</notification>
<notification name="RegionTPAccessBlocked">
- ã‚ãªãŸã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ã«ã‚ˆã‚Šãã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ã¸ã¯å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 年齢確èªã‚’è¡Œã†ã‹ã€æœ€æ–°ãƒ“ューワをインストールã—ã¦ãã ã•ã„。
+ ã‚ãªãŸã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ã«ã‚ˆã‚Šãã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã¸ã¯å…¥ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。 年齢確èªã‚’è¡Œã†ã‹ã€æœ€æ–°ãƒ“ューワをインストールã—ã¦ãã ã•ã„。
ç¾åœ¨ã®ãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°åŒºåˆ†ã§ã‚¢ã‚¯ã‚»ã‚¹å¯èƒ½ãªã‚¨ãƒªã‚¢ã«é–¢ã™ã‚‹è©³ç´°ã¯ãƒŠãƒ¬ãƒƒã‚¸ãƒ™ãƒ¼ã‚¹ã‚’å‚ç…§ã—ã¦ãã ã•ã„。
</notification>
<notification name="URBannedFromRegion">
- ã‚ãªãŸã¯ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ã¸ã®ç«‹å…¥ãŒç¦æ¢ã•ã‚Œã¦ã„ã¾ã™ã€‚
+ ã‚ãªãŸã¯ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã¸ã®ç«‹å…¥ãŒç¦æ¢ã•ã‚Œã¦ã„ã¾ã™ã€‚
</notification>
<notification name="NoTeenGridAccess">
ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§ã¯ãƒ†ã‚£ãƒ¼ãƒ³ã‚°ãƒªãƒƒãƒ‰ã«æŽ¥ç¶šã§ãã¾ã›ã‚“。
</notification>
<notification name="ImproperPaymentStatus">
- ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ã«å…¥ã‚‹ãŸã‚ã«é©ã—ãŸæ”¯æ‰•ã„ステータスãŒã‚ã‚Šã¾ã›ã‚“。
+ ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«å…¥ã‚‹ãŸã‚ã«é©ã—ãŸæ”¯æ‰•ã„ステータスãŒã‚ã‚Šã¾ã›ã‚“。
</notification>
<notification name="MustGetAgeRgion">
- ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ã«å…¥ã‚‹ã«ã¯å¹´é½¢ç¢ºèªæ¸ˆã¿ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
+ ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«å…¥ã‚‹ãŸã‚ã«ã¯ã€å¹´é½¢ç¢ºèªã‚’済ã¾ã›ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
</notification>
<notification name="MustGetAgeParcel">
- ã“ã®åŒºç”»ã«å…¥ã‚‹ã«ã¯å¹´é½¢ç¢ºèªæ¸ˆã¿ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
+ ã“ã®åŒºç”»ã«å…¥ã‚‹ãŸã‚ã«ã¯ã€å¹´é½¢ç¢ºèªã‚’済ã¾ã›ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
</notification>
<notification name="NoDestRegion">
- 目的地ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚
+ 目的地ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚
</notification>
<notification name="NotAllowedInDest">
目的地ã«å…¥ã‚‹è¨±å¯ãŒã‚ã‚Šã¾ã›ã‚“。
@@ -2267,14 +2266,14 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»
テレãƒãƒ¼ãƒˆãŒã‚ャンセルã•ã‚Œã¾ã—ãŸã€‚
</notification>
<notification name="FullRegionTryAgain">
- å…¥ã‚ã†ã¨ã—ã¦ã„るリージョン（地域）ã¯ç¾åœ¨æº€å“¡ã§ã™ã€‚
+ å…¥ã‚ã†ã¨ã—ã¦ã„るリージョンã¯ç¾åœ¨æº€å“¡ã§ã™ã€‚
ã—ã°ã‚‰ãã—ã¦ã‹ã‚‰å†åº¦ãŠè©¦ã—ãã ã•ã„。
</notification>
<notification name="GeneralFailure">
よãã‚る失敗
</notification>
<notification name="RoutedWrongRegion">
- ç•°ãªã‚‹ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ã«è¿‚回ã•ã‚Œã¾ã—ãŸã€‚ ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。
+ ç•°ãªã‚‹ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«è¿‚回ã•ã‚Œã¾ã—ãŸã€‚ ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。
</notification>
<notification name="NoValidAgentID">
エージェント ID ãŒç„¡åŠ¹ã§ã™ã€‚
@@ -2295,7 +2294,7 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»
内部エラーãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚
</notification>
<notification name="NoGoodTPDestination">
- ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ï¼ˆåœ°åŸŸï¼‰ã§ã¯é©åˆ‡ãªãƒ†ãƒ¬ãƒãƒ¼ãƒˆç›®çš„地ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚
+ ã“ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã§ã¯ã€é©åˆ‡ãªãƒ†ãƒ¬ãƒãƒ¼ãƒˆç›®çš„地ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚
</notification>
<notification name="InternalErrorRegionResolver">
内部エラーãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚
@@ -2382,7 +2381,7 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»
[TO_NAME] ã«ãƒ•ãƒ¬ãƒ³ãƒ‰ç™»éŒ²ã‚’申ã—出ã¾ã—ãŸã€‚
</notification>
<notification name="OfferFriendshipNoMessage">
- [NAME]ã¯ã€
+ [NAME] ã¯ã€
フレンド登録を申ã—込んã§ã„ã¾ã™ã€‚
（デフォルトã§ãŠäº’ã„ã®ã‚ªãƒ³ãƒ©ã‚¤ãƒ³çŠ¶æ…‹ã‚’見るã“ã¨ãŒã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚）
@@ -2397,6 +2396,12 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»
<notification name="FriendshipDeclined">
[NAME]ã¯ã€ãƒ•ãƒ¬ãƒ³ãƒ‰ç™»éŒ²ã‚’æ–ã‚Šã¾ã—ãŸã€‚
</notification>
+ <notification name="FriendshipAcceptedByMe">
+ フレンドã®ç™»éŒ²ä¾é ¼ãŒæ‰¿èªã•ã‚Œã¾ã—ãŸã€‚
+ </notification>
+ <notification name="FriendshipDeclinedByMe">
+ フレンドã®ç™»éŒ²ä¾é ¼ãŒæ‹’å¦ã•ã‚Œã¾ã—ãŸã€‚
+ </notification>
<notification name="OfferCallingCard">
[FIRST] [LAST] ãŒã‚³ãƒ¼ãƒªãƒ³ã‚°ã‚«ãƒ¼ãƒ‰ã‚’渡ãã†ã¨ã—ã¦ã„ã¾ã™ã€‚
ã‚ãªãŸã®ã€ŒæŒã¡ç‰©ã€ã«ãƒ–ックマークãŒè¿½åŠ ã•ã‚Œã€ã“ã®ä½äººã«ç´ æ—©ã IM ã‚’é€ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
@@ -2418,9 +2423,9 @@ Web ページã«ãƒªãƒ³ã‚¯ã™ã‚‹ã¨ã€ä»–人ãŒã“ã®å ´æ‰€ã«ç°¡å˜ã«ã‚¢ã‚¯ã‚»
[MESSAGE]
-èªã¿è¾¼ã¿å…ƒã®ã‚ªãƒ–ジェクト：[OBJECTNAME]ã€æ‰€æœ‰è€…：[NAME]？
+èªã¿è¾¼ã¿å…ƒã®ã‚ªãƒ–ジェクト：[OBJECTNAME]ã€æ‰€æœ‰è€…：[NAME]
<form name="form">
- <button name="Gotopage" text="移動"/>
+ <button name="Gotopage" text="ページã«ç§»å‹•"/>
<button name="Cancel" text="å–り消ã—"/>
</form>
</notification>
@@ -2585,7 +2590,7 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚
[VOICE_CHANNEL_NAME] ã®ãƒœã‚¤ã‚¹ãƒãƒ£ãƒƒãƒˆã«æŽ¥ç¶šä¸ã«ã€ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚後ã§ã‚‚ã†ä¸€åº¦ãŠè©¦ã—ãã ã•ã„。
</notification>
<notification name="ServerVersionChanged">
- ç•°ãªã‚‹ã‚µãƒ¼ãƒãƒ¼ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«æ¥ã¾ã—ãŸã€‚パフォーマンスã«å½±éŸ¿ã™ã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ [[URL] リリースノートを確èª]
+ サーãƒãƒ¼ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒç•°ãªã‚‹ãƒªãƒ¼ã‚¸ãƒ§ãƒ³ã«æ¥ã¾ã—ãŸã€‚パフォーマンスã«å½±éŸ¿ã™ã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ [[URL] リリースノートを確èª]
</notification>
<notification name="UnsupportedCommandSLURL">
クリックã—㟠SLurl ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。
@@ -2605,7 +2610,7 @@ M ã‚ーを押ã—ã¦å¤‰æ›´ã—ã¾ã™ã€‚
</notification>
<notification name="ConfirmCloseAll">
ã™ã¹ã¦ã® IM ã‚’é–‰ã˜ã¾ã™ã‹ï¼Ÿ
- <usetemplate name="okcancelignore" notext="ã‚ャンセル" yestext="OK"/>
+ <usetemplate ignoretext="ã™ã¹ã¦ã® IM ã‚’é–‰ã˜ã‚‹å‰ã®ç¢ºèª" name="okcancelignore" notext="ã‚ャンセル" yestext="OK"/>
</notification>
<notification name="AttachmentSaved">
アタッãƒãƒ¡ãƒ³ãƒˆãŒä¿å˜ã•ã‚Œã¾ã—ãŸã€‚
diff --git a/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fdc489f375ec6eabd344b633f4fb6eb00c3ccef3
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="friend_online_status" name="friend_online_status"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index bad4cdbc054dfa090acf924d76bdff7f53c2b631..5097a352e5abc7f526f85eec6670ee3ece632daa 100644
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -21,7 +21,7 @@
<accordion_tab name="tab_all" title="全員"/>
</accordion>
<text name="no_friends_msg">
- ãŠå‹é”ã‚’è¿½åŠ ã™ã‚‹ã«ã¯ã€[secondlife:///app/search/people ã‚°ãƒãƒ¼ãƒãƒ«æ¤œç´¢] ã‚’ã™ã‚‹ã‹ã€ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’クリックã—ã¦è¡Œã£ã¦ãã ã•ã„。
+ ãƒ•ãƒ¬ãƒ³ãƒ‰ã‚’è¿½åŠ ã™ã‚‹ã«ã¯ã€[secondlife:///app/search/people ã‚°ãƒãƒ¼ãƒãƒ«æ¤œç´¢] ã‚’ã™ã‚‹ã‹ã€ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’å³ã‚¯ãƒªãƒƒã‚¯ã—ã¦ãã ã•ã„。
誰ã‹ä¸€ç·’ã«è¡Œå‹•ã‚’ã™ã‚‹äººã‚’ãŠæŽ¢ã—ã®æ™‚ã¯ã€[secondlife:///app/worldmap 地図をãŠè©¦ã—ã ã•ã„]。
</text>
<panel label="bottom_panel" name="bottom_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_places.xml b/indra/newview/skins/default/xui/ja/panel_places.xml
index e2dba19c1d6c4bd15ac6ff9fb5dc900a87780845..a7fbc7988486d3dc551a5f50a42d4a306b09ef33 100644
--- a/indra/newview/skins/default/xui/ja/panel_places.xml
+++ b/indra/newview/skins/default/xui/ja/panel_places.xml
@@ -7,9 +7,9 @@
<button label="テレãƒãƒ¼ãƒˆ" name="teleport_btn" tool_tip="該当ã™ã‚‹ã‚¨ãƒªã‚¢ã«ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã™"/>
<button label="地図" name="map_btn"/>
<button label="編集" name="edit_btn" tool_tip="ランドマークã®æƒ…å ±ã‚’ç·¨é›†ã—ã¾ã™"/>
- <button name="overflow_btn" tool_tip="ãã®ä»–ã®ã‚ªãƒ—ションを表示"/>
- <button label="é–‰ã˜ã‚‹" name="close_btn"/>
- <button label="ã‚ャンセル" name="cancel_btn"/>
+ <button label="â–¼" name="overflow_btn" tool_tip="ãã®ä»–ã®ã‚ªãƒ—ションを表示"/>
<button label="ä¿å˜" name="save_btn"/>
+ <button label="ã‚ャンセル" name="cancel_btn"/>
+ <button label="é–‰ã˜ã‚‹" name="close_btn"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
index af64a217f6fe0f85ab2f17a3ae5478c6c0ce259e..fe830d864fe491db5b73ea20d6ddadba26d18561 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
@@ -13,9 +13,12 @@
<check_box label="有効" name="enable_voice_check"/>
<check_box label="メディアを自動å†ç”Ÿã™ã‚‹" name="media_auto_play_btn" tool_tip="ã“ã“ã«ãƒã‚§ãƒƒã‚¯ã‚’入れã¦ãƒ¡ãƒ‡ã‚£ã‚¢ã®è‡ªå‹•å†ç”Ÿã‚’許å¯ã—ã¾ã™" value="true"/>
<check_box label="ä»–ã®ã‚¢ãƒã‚¿ãƒ¼ã«å–り付ã‘られãŸãƒ¡ãƒ‡ã‚£ã‚¢ã‚’å†ç”Ÿã—ã¾ã™" name="media_show_on_others_btn" tool_tip="ã“ã®ãƒã‚§ãƒƒã‚¯ã‚’外ã™ã¨ã€è¿‘ãã«ã„ã‚‹ä»–ã®ã‚¢ãƒã‚¿ãƒ¼ã«å–り付ã‘られãŸãƒ¡ãƒ‡ã‚£ã‚¢ã‚’éžè¡¨ç¤ºã«ã—ã¾ã™ã€‚" value="true"/>
- <text name="Listen from">
+ <text name="voice_chat_settings">
ボイスãƒãƒ£ãƒƒãƒˆã®è¨å®š
</text>
+ <text name="Listen from">
+ æ–¹å‘：
+ </text>
<radio_group name="ear_location">
<radio_item label="カメラã®ä½ç½®ã‹ã‚‰èžã" name="0"/>
<radio_item label="ã‚¢ãƒã‚¿ãƒ¼ã®ä½ç½®ã‹ã‚‰èžã" name="1"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
index 9a517d79e9819c52220e0dd6c36b279072fcd46b..5214f7914147d2ce779d704452382d4e07a3ef2f 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
@@ -30,7 +30,7 @@
約款ã®å¤‰æ›´ã¯ä¸å‹•ç”£å…¨åŒºç”»ã«é©ç”¨ã¨ãªã‚Šã¾ã™ã€‚
</text>
<text name="covenant_instructions" width="390">
- ã“ã®ä¸å‹•ç”£ç´„款ã®å¤‰æ›´ã‚’ã™ã‚‹éš›ã¯ã€ãƒŽãƒ¼ãƒˆã‚«ãƒ¼ãƒ‰ã‚’ドラッグ＆ドãƒãƒƒãƒ—ã—ã¦ãã ã•ã„。
+ ã“ã®ä¸å‹•ç”£ç´„款を変更ã™ã‚‹éš›ã¯ã€ãƒŽãƒ¼ãƒˆã‚«ãƒ¼ãƒ‰ã‚’ドラッグ＆ドãƒãƒƒãƒ—ã—ã¦ãã ã•ã„。
</text>
<text bottom_delta="-34" font="SansSerifLarge" name="region_section_lbl" width="200">
地域
diff --git a/indra/newview/skins/default/xui/ja/panel_side_tray.xml b/indra/newview/skins/default/xui/ja/panel_side_tray.xml
index 5364b8726f1149a468ad13c4b6072c7d9edc0c87..3fd14ece06c633910d29c85e15f33405ac119516 100644
--- a/indra/newview/skins/default/xui/ja/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_side_tray.xml
@@ -20,10 +20,10 @@
<sidetray_tab description="è¡ŒããŸã„å ´æ‰€ã€è¡Œã£ãŸã“ã¨ã®ã‚ã‚‹å ´æ‰€ã‚’æŽ¢ã—ã¦ãã ã•ã„。" label="å ´æ‰€" name="sidebar_places" tab_title="å ´æ‰€">
<panel label="å ´æ‰€" name="panel_places"/>
</sidetray_tab>
- <sidetray_tab description="ã‚ãªãŸã®æŒã¡ç‰©ã‚’眺ã‚ã¦ãã ã•ã„。" name="sidebar_inventory" tab_title="マイ æŒã¡ç‰©">
+ <sidetray_tab description="ã‚ãªãŸã®æŒã¡ç‰©ã‚’眺ã‚ã¦ãã ã•ã„。" name="sidebar_inventory" tab_title="æŒã¡ç‰©">
<panel label="æŒã¡ç‰©ã‚’編集" name="sidepanel_inventory"/>
</sidetray_tab>
- <sidetray_tab description="ã‚ãªãŸã®å®¹å§¿ã‚„ç¾åœ¨ã®è¦‹ãŸç›®ã‚’変更ã—ã¦ãã ã•ã„。" name="sidebar_appearance" tab_title="マイ 容姿">
+ <sidetray_tab description="ã‚ãªãŸã®å®¹å§¿ã‚„ç¾åœ¨ã®è¦‹ãŸç›®ã‚’変更ã—ã¦ãã ã•ã„。" name="sidebar_appearance" tab_title="容姿">
<panel label="容姿ã®ç·¨é›†" name="sidepanel_appearance"/>
</sidetray_tab>
</side_tray>
diff --git a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
index aef1f90298de982db23374031a210069f6b6689e..ea17cd6526d4b28b9af071073d71f4a7c8e99fc4 100644
--- a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
@@ -22,13 +22,13 @@
</text>
</panel>
<panel name="sidebar_appearance">
- <text name="tab_name" value="マイ 容姿"/>
+ <text name="tab_name" value="容姿"/>
<text name="tab_description">
ã‚ãªãŸã®å®¹å§¿ã‚„ç¾åœ¨ã®è¦‹ãŸç›®ã‚’変更ã—ã¾ã™ã€‚
</text>
</panel>
<panel name="sidebar_inventory">
- <text name="tab_name" value="マイ æŒã¡ç‰©"/>
+ <text name="tab_name" value="æŒã¡ç‰©"/>
<text name="tab_description">
ã‚ãªãŸã®æŒã¡ç‰©ã‚’眺ã‚ã¾ã™ã€‚
</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
index a9e13cfd9f9e6d79ce70c99254d1a726bf241e80..8ffcd8863ed0399e433ce759e230cabc396dc76f 100644
--- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
@@ -22,10 +22,10 @@
L$ [AMT]
</panel.string>
<button label="" label_selected="" name="buycurrency" tool_tip="所æŒé‡‘"/>
- <button label="L$ ã®è³¼å…¥" name="buyL" tool_tip="クリックã—㦠L$ を購入ã—ã¾ã™"/>
+ <button label="è²·ã†" name="buyL" tool_tip="クリックã—㦠L$ を購入ã—ã¾ã™"/>
<text name="TimeText" tool_tip="ç¾åœ¨æ™‚刻（太平洋）">
24:00 AM PST
</text>
- <button name="media_toggle_btn" tool_tip="クリックã—ã¦ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’切り替ãˆã¾ã™"/>
+ <button name="media_toggle_btn" tool_tip="ã™ã¹ã¦ã®ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’開始・åœæ¢ï¼ˆéŸ³æ¥½ã€ãƒ“デオã€Web ページ）"/>
<button name="volume_btn" tool_tip="ã‚°ãƒãƒ¼ãƒãƒ«éŸ³é‡è¨å®š"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
index 2264ae965b0810a09b9df72e9a9e27248ee80787..c1bf81f7e7900a8b4c442db8c7151b264bb78fee 100644
--- a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
@@ -12,6 +12,6 @@
<accordion_tab name="6_months_and_older" title="åŠå¹´ä»¥ä¸Šå‰"/>
</accordion>
<panel label="bottom_panel" name="bottom_panel">
- <button name="gear_btn" tool_tip="ãã®ä»–ã®ã‚ªãƒ—ションを表示"/>
+ <button name="gear_btn" tool_tip="オプションを表示ã—ã¾ã™"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 76b702e581b3f2317d4378eafe93315e2012378b..de0de5a0c94b5edba7364b5eb2c63ad0f8e1b87a 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -1506,6 +1506,9 @@
<string name="NoPicksClassifiedsText">
ピックやクラシファイド広告を作æˆã—ã¦ã„ã¾ã›ã‚“。 作æˆã™ã‚‹ã«ã¯ã€ä¸‹ã«ã‚る「プラスã€ãƒœã‚¿ãƒ³ã‚’クリックã—ã¾ã™ã€‚
</string>
+ <string name="NoAvatarPicksClassifiedsText">
+ ピックã€ã¾ãŸã¯ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘ŠãŒã‚ã‚Šã¾ã›ã‚“
+ </string>
<string name="PicksClassifiedsLoadingText">
ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚°...
</string>
diff --git a/indra/newview/skins/default/xui/pl/floater_auction.xml b/indra/newview/skins/default/xui/pl/floater_auction.xml
index 37e35ed1e96efa7165d6e52d896f4e2769c7d3c0..815c36606c86b7f72d6d79d5a803b89a9c2ecda4 100644
--- a/indra/newview/skins/default/xui/pl/floater_auction.xml
+++ b/indra/newview/skins/default/xui/pl/floater_auction.xml
@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_auction" title="ROZPOCZNIJ SPRZEDAÅ» POSIADÅOÅšCI">
- <check_box label="Zawierając żółte ogrodzenie" name="fence_check" />
- <button label="Zdjęce" label_selected="Zdjęce" name="snapshot_btn" />
- <button label="OK" label_selected="OK" name="ok_btn" />
- <string name="already for sale">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_auction" title="ROZPOCZNIJ SPRZEDAÅ» POSIADÅOÅšCI LINDENÓW">
+ <floater.string name="already for sale">
Nie możesz umieścić posiadłości na aukcji, jeżeli już została wystawiona na sprzedaż.
- </string>
+ </floater.string>
+ <check_box initial_value="true" label="Zawierając żółte ogrodzenie" name="fence_check"/>
+ <button label="Zdjęce" label_selected="Zdjęce" name="snapshot_btn"/>
+ <button label="Sprzedaj Każdemu" label_selected="Sprzedaj Każdemu" name="sell_to_anyone_btn"/>
+ <button label="Wyczyść Ustawienia" label_selected="Wyczyść Ustawienia" name="reset_parcel_btn"/>
+ <button label="Rozpocznij AukcjÄ™" label_selected="Rozpocznij AukcjÄ™" name="start_auction_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_camera.xml b/indra/newview/skins/default/xui/pl/floater_camera.xml
index 5957018144f05ab2160ae7b5b8084f38d21a1179..95d82a3f9c779a85506db6a5a14d05c25b162543 100644
--- a/indra/newview/skins/default/xui/pl/floater_camera.xml
+++ b/indra/newview/skins/default/xui/pl/floater_camera.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="camera_floater" title="">
<floater.string name="rotate_tooltip">
Obracaj kamerę wokół obiektu
@@ -10,7 +10,22 @@
Poruszaj kamerą w dół/górę oraz w prawo/lewo
</floater.string>
<panel name="controls">
- <joystick_track name="cam_track_stick" tool_tip="Poruszaj kamerą w dół/górę oraz w prawo/lewo"/>
- <joystick_zoom name="zoom" tool_tip="Najedź kamerą w kierunku obiektu"/>
+ <joystick_track name="cam_track_stick" tool_tip="Poruszaj kamerą w górę, w dół, w lewo i w prawo"/>
+ <panel name="zoom" tool_tip="Najedź kamerą w kierunku obiektu">
+ <slider_bar name="zoom_slider" tool_tip="Przybliż kamerę do ogniskowej"/>
+ </panel>
+ <joystick_rotate name="cam_rotate_stick" tool_tip="Obracaj kamerę wokoł osi"/>
+ <panel name="camera_presets">
+ <button name="rear_view" tool_tip="Widok z Tyłu"/>
+ <button name="group_view" tool_tip="PodglÄ…d Grupy"/>
+ <button name="front_view" tool_tip="Widok z Przodu"/>
+ <button name="mouselook_view" tool_tip="Widok Panoramiczny"/>
+ </panel>
+ </panel>
+ <panel name="buttons">
+ <button label="" name="orbit_btn" tool_tip="Obracaj KamerÄ™"/>
+ <button label="" name="pan_btn" tool_tip="Kamera Horyzontalna"/>
+ <button label="" name="avatarview_btn" tool_tip="Widok Awatara"/>
+ <button label="" name="freecamera_btn" tool_tip="PodglÄ…d Obiektu"/>
</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_color_picker.xml b/indra/newview/skins/default/xui/pl/floater_color_picker.xml
index 904a2cc2704ace9038d2bf7e0f6d8cf3d6f0f727..7bbdc35f940c25be7155fc44400880a816e695a9 100644
--- a/indra/newview/skins/default/xui/pl/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/pl/floater_color_picker.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="ColorPicker" title="WYBÓR KOLORU">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="ColorPicker" title="WYBIERZ KOLOR">
<text name="r_val_text">
Czerwony:
</text>
@@ -18,14 +18,14 @@
<text name="l_val_text">
Luminacja:
</text>
- <check_box label="Zastosuj od razu" name="apply_immediate" />
- <button label="" label_selected="" name="color_pipette" />
- <button label="Anuluj" label_selected="Anuluj" name="cancel_btn" />
- <button label="Wybierz" label_selected="Wybierz" name="select_btn" />
+ <check_box label="Zastosuj teraz" name="apply_immediate"/>
+ <button label="" label_selected="" name="color_pipette"/>
+ <button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/>
+ <button label="Ok" label_selected="Ok" name="select_btn"/>
<text name="Current color:">
Obecny Kolor:
</text>
<text name="(Drag below to save.)">
- (PrzeciÄ…gnij tutaj)
+ (Przeciągnij tutaj by zapisać)
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_hud.xml b/indra/newview/skins/default/xui/pl/floater_hud.xml
index ff2d702132dd2f382abcd4f77899d8ac84ece777..a5d85aca4ec40a8f0c334965a896d109b8f21b37 100644
--- a/indra/newview/skins/default/xui/pl/floater_hud.xml
+++ b/indra/newview/skins/default/xui/pl/floater_hud.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_hud" title="SAMOUCZEK" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_hud" title="SAMOUCZEK"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_im_session.xml b/indra/newview/skins/default/xui/pl/floater_im_session.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f4dd7d00e1406b2a83f9402b6bfa608b476107db
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/floater_im_session.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="panel_im">
+ <layout_stack name="im_panels">
+ <layout_panel label="Panel Kontroli Wiadomości Prywatnej (IM)" name="panel_im_control_panel"/>
+ <layout_panel>
+ <line_editor label="Do" name="chat_editor"/>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml
index 8120ff8c777d8b481807fae0932bc9e1cd1fd958..e03c5faaeb51b77ae65d879c6bbb5e18d1b97304 100644
--- a/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml
@@ -1,12 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="script ed float" title="SKRYPT: NOWY SKRYPT">
- <button label="Zresetuj" label_selected="Zresetuj" name="Reset" />
- <check_box label="WÅ‚Ä…cz" name="running" />
- <check_box label="Mono" name="mono" />
- <string name="not_allowed">
- Nie masz praw by widzieć zawartość tego skryptu.
- </string>
- <string name="script_running">
+ <floater.string name="not_allowed">
+ Nie posiadasz praw do zobaczenia lub edycji kodu tego skryptu ponieważ udostępnione Ci prawa to "brak kopiowania". Musisz posiadać pełne prawa by móc zobaczyć lub edytować kod skryptu w zawartości obiektu.
+ </floater.string>
+ <floater.string name="script_running">
WÅ‚Ä…cz
- </string>
+ </floater.string>
+ <floater.string name="Title">
+ SKRYPT: [NAME]
+ </floater.string>
+ <button label="Zresetuj" label_selected="Zresetuj" name="Reset"/>
+ <check_box initial_value="true" label="WÅ‚Ä…cz" name="running"/>
+ <check_box initial_value="true" label="Mono" name="mono"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml
index 88a878af7257e7820413d1a35bb2460a9d3cf5b3..87d74f6c1597f9f31ac54d37ab41b5c520030fcb 100644
--- a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="MemLeak" title="SYMULACJA PRZECIEKÓW ALOKACJI PAMIĘCI">
- <spinner label="Prędkość Przecieków (byty na klatkę):" name="leak_speed" />
- <spinner label="Max Przecieki (MB):" name="max_leak" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="MemLeak" title="STYMULACJA WYCIEKU PAMIĘCI">
+ <spinner label="Prędkość Przecieków (byty na klatkę):" name="leak_speed"/>
+ <spinner label="Max Przecieki (MB):" name="max_leak"/>
<text name="total_leaked_label">
Przeciekło: [SIZE] KB
</text>
@@ -11,8 +11,8 @@
<text name="note_label_2">
[NOTE2]
</text>
- <button label="Start" name="start_btn" />
- <button label="Stop" name="stop_btn" />
- <button label="Uwolnij" name="release_btn" />
- <button label="Zamknij" name="close_btn" />
+ <button label="Start" name="start_btn"/>
+ <button label="Stop" name="stop_btn"/>
+ <button label="Uwolnij" name="release_btn"/>
+ <button label="Zamknij" name="close_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_my_friends.xml b/indra/newview/skins/default/xui/pl/floater_my_friends.xml
index 0bcf6ba4d50e1dbdf945122c05ab7e859b0609e5..847c93f8919beb2f0de0b638789a1e7c50e09f6b 100644
--- a/indra/newview/skins/default/xui/pl/floater_my_friends.xml
+++ b/indra/newview/skins/default/xui/pl/floater_my_friends.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_my_friends" title="KONTAKTY">
<tab_container name="friends_and_groups">
- <panel label="Znajomi" name="friends_panel" />
- <panel label="Grupy" name="groups_panel" />
+ <panel label="Znajomi" name="friends_panel"/>
+ <panel label="Grupy" name="groups_panel"/>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml
index 834552e2b005ef7973ffac1f5a69a0508a680353..1b0dd6113efd6036f10ad204b6d116e9f8e07491 100644
--- a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="perm prefs" title="PRAWA DOMYÅšLNE">
+<floater name="perm prefs" title="USTAWIENIA DOMYÅšLNE ÅADOWANIA">
<panel label="Prawa" name="permissions">
<button label="?" label_selected="?" name="help"/>
<check_box label="Udostępnij grupie" name="share_with_group"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml
index 7139c470a44c1e12eb319eecb752d1657d13654a..2a49864e930b068eb5adadb6d4e34242c4210f72 100644
--- a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="preview_anim">
+ <floater.string name="Title">
+ Animacja: [NAME]
+ </floater.string>
<text name="desc txt">
Opis:
</text>
- <button label="Używaj w Świecie" label_selected="Stop" name="Anim play btn"
- tool_tip="Animacja będzie widoczna dla wszystkich." width="131" left="20"/>
- <button label="Używaj lokalnie" label_selected="Stop" name="Anim audition btn"
- tool_tip="Animacja będzie widoczna tylko dla Ciebie." width="125" left="162"/>
+ <button label="Używaj w Świecie" label_selected="Stop" left="20" name="Anim play btn" tool_tip="Uruchom tę animację by widzieli ją pozostali Rezydenci" width="131"/>
+ <button label="Używaj lokalnie" label_selected="Stop" left="162" name="Anim audition btn" tool_tip="Uruchom tę animację widoczną tylko przez Ciebie" width="125"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_classified.xml b/indra/newview/skins/default/xui/pl/floater_preview_classified.xml
index eae9ba2690f1a92c1c2cf89fae3e3ccf09c1e20b..d3d6588397f7702f3d47cdb1afb4612bf17c7b5e 100644
--- a/indra/newview/skins/default/xui/pl/floater_preview_classified.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preview_classified.xml
@@ -1,2 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="classified_preview" title="REKLAMA" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="classified_preview" title="INFO O REKLAMIE">
+ <floater.string name="Title">
+ Reklama: [NAME]
+ </floater.string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_select_key.xml b/indra/newview/skins/default/xui/pl/floater_select_key.xml
index 194a6da1bd5a4cb1c4dba8aff3471d8c9da1a99b..cf0abb2c23b63c441a7ecf7cbfa37c660b5251dd 100644
--- a/indra/newview/skins/default/xui/pl/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/pl/floater_select_key.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="modal container" title="">
- <button label="Anuluj" label_selected="Anuluj" name="Cancel" />
+ <button label="Anuluj" label_selected="Anuluj" name="Cancel"/>
<text name="Save item as:">
- By wybrać wciśnij klawisz
+ Naciśnij by uruchomić przycisk mówienia.
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml
index 0826508fd6c7bdfc69463475b7bc836f574eb3d0..c66ac0a98fe83615f99706d8992366ac398f82e9 100644
--- a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="Sound Preview" title="DŹWIĘK.WAV">
<text name="name_label">
Opis:
@@ -6,6 +6,6 @@
<text name="description_label">
Opis:
</text>
- <button label="Anuluj" label_selected="Anuluj" name="cancel_btn" />
- <button label="Załaduj (L$[AMOUNT])" label_selected="Załaduj (L$[AMOUNT])" name="ok_btn" />
+ <button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/>
+ <button label="Załaduj (L$[AMOUNT])" label_selected="Załaduj (L$[AMOUNT])" name="ok_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml
index 48366e2b6459798673902a6837b7576d09768929..011dc8ee7c2e514809ef71b8805a24bd3da7391a 100644
--- a/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="texture picker" title="WYBÓR TEKSTURY">
+<floater name="texture picker" title="ULUBIONE: TEKSTURA">
<string name="choose_picture">
Kliknij by wybrać obraz
</string>
<text name="Multiple">
- Wiele
+ Wiele Tekstur
</text>
<text name="unknown">
- Wymiary: [DIMENSIONS]
+ Rozmiar: [DIMENSIONS]
</text>
<button label="Domyślna" label_selected="Domyślna" name="Default"/>
<button label="Żadna" label_selected="Żadna" name="None"/>
<button label="Pusta" label_selected="Pusta" name="Blank"/>
<check_box label="Pokaż Foldery" name="show_folders_check"/>
- <search_editor label="Wpisz nazwę tutaj by wyszukać" name="inventory search editor"/>
- <check_box label="Zastosuj od razu" name="apply_immediate_check"/>
+ <search_editor label="Filtruj Tektury" name="inventory search editor"/>
+ <check_box label="Zastosuj teraz" name="apply_immediate_check"/>
<button label="" label_selected="" name="Pipette"/>
<button label="Anuluj" label_selected="Anuluj" name="Cancel"/>
- <button label="Wybierz" label_selected="Wybierz" name="Select"/>
+ <button label="Ok" label_selected="Ok" name="Select"/>
<string name="pick title">
Wybór:
</string>
diff --git a/indra/newview/skins/default/xui/pl/inspect_avatar.xml b/indra/newview/skins/default/xui/pl/inspect_avatar.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4ba36de6faa633e6409e0c4cfbd462f7e73cac38
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/inspect_avatar.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+ Not can_close / no title to avoid window chrome
+ Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="inspect_avatar">
+ <string name="Subtitle">
+ [AGE]
+ </string>
+ <string name="Details">
+ [SL_PROFILE]
+ </string>
+ <slider name="volume_slider" tool_tip="Posiom Głośności" value="0.5"/>
+ <button label="Dodaj Znajomość" name="add_friend_btn"/>
+ <button label="IM" name="im_btn"/>
+ <button label="Więcej" name="view_profile_btn"/>
+ <panel name="moderator_panel">
+ <button label="Wyłącz Komunikację Głosową" name="disable_voice"/>
+ <button label="WÅ‚Ä…cz KomunikacjÄ™ GÅ‚osowÄ…" name="enable_voice"/>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/inspect_group.xml b/indra/newview/skins/default/xui/pl/inspect_group.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d434443794cb837c8497b6ef394e66dd057255be
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/inspect_group.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+ Not can_close / no title to avoid window chrome
+ Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="inspect_group">
+ <string name="PrivateGroup">
+ Grupa Prywatna
+ </string>
+ <string name="FreeToJoin">
+ Wstęp Wolny
+ </string>
+ <string name="CostToJoin">
+ L$[AMOUNT] by dołączyć
+ </string>
+ <string name="YouAreMember">
+ Jesteś członkiem
+ </string>
+ <button label="Dołącz" name="join_btn"/>
+ <button label="Opuść" name="leave_btn"/>
+ <button label="Zobacz Profil" name="view_profile_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/inspect_remote_object.xml b/indra/newview/skins/default/xui/pl/inspect_remote_object.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0d570940c1ae43db8f45d713d2c1f636a3331e6c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/inspect_remote_object.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+ Not can_close / no title to avoid window chrome
+ Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="inspect_remote_object">
+ <text name="object_owner_label">
+ Właściciel:
+ </text>
+ <button label="Mapa" name="map_btn"/>
+ <button label="Zablokuj" name="block_btn"/>
+ <button label="Zamknij" name="close_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/mime_types_mac.xml b/indra/newview/skins/default/xui/pl/mime_types_mac.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bd39ff7ac3adb6682fe8a82e7ed587840daf7cdd
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/mime_types_mac.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<mimetypes name="default">
+ <widgetset name="web">
+ <label name="web_label">
+ Zawartość Przeglądarki Internetowej
+ </label>
+ <tooltip name="web_tooltip">
+ To miejsce posiada zawartość internetową
+ </tooltip>
+ <playtip name="web_playtip">
+ Pokaż Zawartość Przeglądarki Internetowej
+ </playtip>
+ </widgetset>
+ <widgetset name="movie">
+ <label name="movie_label">
+ Film
+ </label>
+ <tooltip name="movie_tooltip">
+ To miejsce posiada zawartość filmową
+ </tooltip>
+ <playtip name="movie_playtip">
+ OglÄ…daj Film
+ </playtip>
+ </widgetset>
+ <widgetset name="image">
+ <label name="image_label">
+ Obraz
+ </label>
+ <tooltip name="image_tooltip">
+ To miejsce posiada zwartość graficzną
+ </tooltip>
+ <playtip name="image_playtip">
+ Zobacz zdjęcie miejsca
+ </playtip>
+ </widgetset>
+ <widgetset name="audio">
+ <label name="audio_label">
+ Audio
+ </label>
+ <tooltip name="audio_tooltip">
+ To miejsce posiada zwartość audio
+ </tooltip>
+ <playtip name="audio_playtip">
+ Rozpocznij odtwarzanie audio
+ </playtip>
+ </widgetset>
+ <scheme name="rtsp">
+ <label name="rtsp_label">
+ Synchroniczne Strumienie Medialne
+ </label>
+ </scheme>
+ <mimetype name="blank">
+ <label name="blank_label">
+ - Żadne -
+ </label>
+ </mimetype>
+ <mimetype name="none/none">
+ <label name="none/none_label">
+ - Żadne -
+ </label>
+ </mimetype>
+ <mimetype name="audio/*">
+ <label name="audio2_label">
+ Audio
+ </label>
+ </mimetype>
+ <mimetype name="video/*">
+ <label name="video2_label">
+ Video
+ </label>
+ </mimetype>
+ <mimetype name="image/*">
+ <label name="image2_label">
+ Obraz
+ </label>
+ </mimetype>
+ <mimetype name="video/vnd.secondlife.qt.legacy">
+ <label name="vnd.secondlife.qt.legacy_label">
+ Film (QuickTime)
+ </label>
+ </mimetype>
+ <mimetype name="application/javascript">
+ <label name="application/javascript_label">
+ Skrypt Java
+ </label>
+ </mimetype>
+ <mimetype name="application/ogg">
+ <label name="application/ogg_label">
+ Ogg Audio/Video
+ </label>
+ </mimetype>
+ <mimetype name="application/pdf">
+ <label name="application/pdf_label">
+ Dokument PDF
+ </label>
+ </mimetype>
+ <mimetype name="application/postscript">
+ <label name="application/postscript_label">
+ Dokument Postscript
+ </label>
+ </mimetype>
+ <mimetype name="application/rtf">
+ <label name="application/rtf_label">
+ Dokument RTF
+ </label>
+ </mimetype>
+ <mimetype name="application/smil">
+ <label name="application/smil_label">
+ Język Integracyjnej Synchronizacji Multimedialnej (SMIL)
+ </label>
+ </mimetype>
+ <mimetype name="application/xhtml+xml">
+ <label name="application/xhtml+xml_label">
+ Strona Internetowa (XHTML)
+ </label>
+ </mimetype>
+ <mimetype name="application/x-director">
+ <label name="application/x-director_label">
+ Macromedia Director
+ </label>
+ </mimetype>
+ <mimetype name="audio/mid">
+ <label name="audio/mid_label">
+ Audio (MIDI)
+ </label>
+ </mimetype>
+ <mimetype name="audio/mpeg">
+ <label name="audio/mpeg_label">
+ Audio (MP3)
+ </label>
+ </mimetype>
+ <mimetype name="audio/x-aiff">
+ <label name="audio/x-aiff_label">
+ Audio (AIFF)
+ </label>
+ </mimetype>
+ <mimetype name="audio/x-wav">
+ <label name="audio/x-wav_label">
+ Audio (WAV)
+ </label>
+ </mimetype>
+ <mimetype name="image/bmp">
+ <label name="image/bmp_label">
+ Obraz (BMP)
+ </label>
+ </mimetype>
+ <mimetype name="image/gif">
+ <label name="image/gif_label">
+ Obraz (GIF)
+ </label>
+ </mimetype>
+ <mimetype name="image/jpeg">
+ <label name="image/jpeg_label">
+ Obraz (JPEG)
+ </label>
+ </mimetype>
+ <mimetype name="image/png">
+ <label name="image/png_label">
+ Obraz (PNG)
+ </label>
+ </mimetype>
+ <mimetype name="image/svg+xml">
+ <label name="image/svg+xml_label">
+ Obraz (SVG)
+ </label>
+ </mimetype>
+ <mimetype name="image/tiff">
+ <label name="image/tiff_label">
+ Obraz (TIFF)
+ </label>
+ </mimetype>
+ <mimetype name="text/html">
+ <label name="text/html_label">
+ Strona Internetowa
+ </label>
+ </mimetype>
+ <mimetype name="text/plain">
+ <label name="text/plain_label">
+ Tekst
+ </label>
+ </mimetype>
+ <mimetype name="text/xml">
+ <label name="text/xml_label">
+ XML
+ </label>
+ </mimetype>
+ <mimetype name="video/mpeg">
+ <label name="video/mpeg_label">
+ Film (MPEG)
+ </label>
+ </mimetype>
+ <mimetype name="video/mp4">
+ <label name="video/mp4_label">
+ Film (MP4)
+ </label>
+ </mimetype>
+ <mimetype name="video/quicktime">
+ <label name="video/quicktime_label">
+ Film (QuickTime)
+ </label>
+ </mimetype>
+ <mimetype name="video/x-ms-asf">
+ <label name="video/x-ms-asf_label">
+ Film (Windows Media ASF)
+ </label>
+ </mimetype>
+ <mimetype name="video/x-ms-wmv">
+ <label name="video/x-ms-wmv_label">
+ Film (Windows Media WMV)
+ </label>
+ </mimetype>
+ <mimetype name="video/x-msvideo">
+ <label name="video/x-msvideo_label">
+ Film (AVI)
+ </label>
+ </mimetype>
+</mimetypes>
diff --git a/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5c362ab772cb5f37d592282803ee57d8850ec923
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="avatar_list_item">
+ <string name="FormatSeconds">
+ [COUNT]s
+ </string>
+ <string name="FormatMinutes">
+ [COUNT]m
+ </string>
+ <string name="FormatHours">
+ [COUNT]h
+ </string>
+ <string name="FormatDays">
+ [COUNT]d
+ </string>
+ <string name="FormatWeeks">
+ [COUNT]tyg
+ </string>
+ <string name="FormatMonths">
+ [COUNT]mc
+ </string>
+ <string name="FormatYears">
+ [COUNT]lat
+ </string>
+ <text name="avatar_name" value="Nieznane"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml
new file mode 100644
index 0000000000000000000000000000000000000000..27d8981e80f10e7bcd418cbd5242424045a33b88
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_shirt_panel">
+ <panel name="avatar_shirt_color_panel">
+ <texture_picker label="Materiał" name="Fabric" tool_tip="Kliknij by wybrać grafikę"/>
+ <color_swatch label="Kolor/Odcień" name="Color/Tint" tool_tip="Kliknij by wybrać kolor"/>
+ </panel>
+ <accordion name="wearable_accordion">
+ <accordion_tab name="shirt_main_tab" title="Spódnica"/>
+ </accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5efa402698d5dbff125cbe3f3226cf14da60683c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="edit_tattoo_panel">
+ <panel name="avatar_tattoo_color_panel">
+ <texture_picker label="Tatuaż Głowy" name="Head Tattoo" tool_tip="Kliknij by wybrać grafikę"/>
+ <texture_picker label="Tatuaż Górnej Części Ciała" name="Upper Tattoo" tool_tip="Kliknij by wybrać grafikę"/>
+ <texture_picker label="Tatuaż Dolnej Części Ciała" name="Lower Tattoo" tool_tip="Kliknij by wybrać grafikę"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_list_item.xml b/indra/newview/skins/default/xui/pl/panel_group_list_item.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e8e819e7ceebc427b6ca0dddedc167a91cbc07fe
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_group_list_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="group_list_item">
+ <text name="group_name" value="Nieznana"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_group_roles.xml b/indra/newview/skins/default/xui/pl/panel_group_roles.xml
index dd46b4aeaa472a82e4102df9d8a7da858a15d380..6a0cbbd23a47876459dd46058b88dae340ca7bfd 100644
--- a/indra/newview/skins/default/xui/pl/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_roles.xml
@@ -16,7 +16,7 @@ Możesz wybrać wielu Członków naciskając Ctrl i klikając na ich imionach.
<name_list name="member_list">
<name_list.columns label="Członek" name="name"/>
<name_list.columns label="Dotacje" name="donated"/>
- <name_list.columns label="Ostatnio w SL" name="online"/>
+ <name_list.columns label="Status" name="online"/>
</name_list>
<button label="ZaproÅ› do Grupy" name="member_invite"/>
<button label="Usuń z Grupy" name="member_eject"/>
@@ -29,7 +29,7 @@ jedną lub wiele funkcji. Każda grupa może posiadać maksymalnie 10 funkcji,
łącznie z funkcją Każdy i Właściciel.
</panel.string>
<panel.string name="cant_delete_role">
- Specjalne Funkcje Każdy i Właściciel nie mogą zostać usunięte.
+ Funkcje "Wszyscy" oraz "Właściciele" są domyślnie oraz nie mogą zostać usunięte.
</panel.string>
<panel.string name="power_folder_icon">
Inv_FolderClosed
@@ -38,7 +38,7 @@ jedną lub wiele funkcji. Każda grupa może posiadać maksymalnie 10 funkcji,
<scroll_list name="role_list">
<scroll_list.columns label="Funkcja" name="name"/>
<scroll_list.columns label="Tytuł" name="title"/>
- <scroll_list.columns label="Liczba" name="members"/>
+ <scroll_list.columns label="#" name="members"/>
</scroll_list>
<button label="Stwórz Nową Funkcję" name="role_create"/>
<button label="Usuń Funkcję" name="role_delete"/>
@@ -57,7 +57,7 @@ Istnieje wiele Przywilei.
</tab_container>
<panel name="members_footer">
<text name="static">
- Funkcje
+ Przypisani Członkowie
</text>
<scroll_list name="member_assigned_roles">
<scroll_list.columns label="" name="checkbox"/>
@@ -73,13 +73,13 @@ Istnieje wiele Przywilei.
</panel>
<panel name="roles_footer">
<text name="static">
- Nazwa
+ Nazwa Funkcji
</text>
<line_editor name="role_name">
Liczba
</line_editor>
<text name="static3">
- Tytuł
+ Nazwa Funkcji
</text>
<line_editor name="role_title">
(proszę czekać)
diff --git a/indra/newview/skins/default/xui/pl/panel_landmark_info.xml b/indra/newview/skins/default/xui/pl/panel_landmark_info.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dc73d08680922c236464eba048a6862b1cc1152f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_landmark_info.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="landmark_info">
+ <string name="title_create_landmark" value="Zapamiętaj Miejsce"/>
+ <string name="title_edit_landmark" value="Edytuj Zapamiętane Miejsce"/>
+ <string name="title_landmark" value="Zapamiętane Miejsce (LM)"/>
+ <string name="not_available" value="(N\A)"/>
+ <string name="unknown" value="(nieznane)"/>
+ <string name="public" value="(publiczne)"/>
+ <string name="server_update_text">
+ Informacje o miejscu nie są dostępne bez aktualizacji serwera.
+ </string>
+ <string name="server_error_text">
+ Informacje o miejscu nie są dostępne w tej chwili. Prosimy sprobować później.
+ </string>
+ <string name="server_forbidden_text">
+ Informacje o miejscu są niedostępne z powodu braku dostępu. Prosimy sprawdzić swoje prawa z właścicielem posiadłości.
+ </string>
+ <string name="acquired_date">
+ [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+ </string>
+ <text name="title" value="Profil Miejsca"/>
+ <scroll_container name="place_scroll">
+ <panel name="scrolling_panel">
+ <text name="maturity_value" value="nieznany"/>
+ <panel name="landmark_info_panel">
+ <text name="owner_label" value="Właściciel:"/>
+ <text name="creator_label" value="Twórca:"/>
+ <text name="created_label" value="Stworzone:"/>
+ </panel>
+ <panel name="landmark_edit_panel">
+ <text name="title_label" value="Tytuł:"/>
+ <text name="notes_label" value="Moje notatki:"/>
+ <text name="folder_label" value="Lokalizacja zapisanego miejsca:"/>
+ </panel>
+ </panel>
+ </scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_login.xml b/indra/newview/skins/default/xui/pl/panel_login.xml
index cec7e34da542be76bf9b2ba01c14b6c77ecc0831..42088eae28a1e62c1a1bbff8451fef753a9cbc89 100644
--- a/indra/newview/skins/default/xui/pl/panel_login.xml
+++ b/indra/newview/skins/default/xui/pl/panel_login.xml
@@ -6,33 +6,29 @@
<panel.string name="forgot_password_url">
http://secondlife.com/account/request.php
</panel.string>
- <panel name="login_widgets">
- <text name="first_name_text">
- ImiÄ™:
- </text>
- <line_editor name="first_name_edit" tool_tip="[SECOND_LIFE] ImiÄ™"/>
- <text name="last_name_text">
- Nazwisko
- </text>
- <line_editor name="last_name_edit" tool_tip="[SECOND_LIFE] Nazwisko"/>
- <text name="password_text">
- Hasło:
- </text>
- <button label="Zaloguj" label_selected="Zaloguj" name="connect_btn"/>
- <text name="start_location_text">
- Miejsce Startu:
- </text>
- <combo_box name="start_location_combo">
- <combo_box.item label="Moje Ostatnie Miejsce" name="MyLastLocation"/>
- <combo_box.item label="Moje Miejsce Startu" name="MyHome"/>
- <combo_box.item label="<Wpisz nazwÄ™ regionu>" name="Typeregionname"/>
- </combo_box>
- <check_box label="Zapamiętaj Hasło" name="remember_check"/>
- <text name="create_new_account_text">
- Załóż Nowe Konto
- </text>
- <text name="forgot_password_text">
- Nie pamiętasz swojego imienia lub hasła?
- </text>
- </panel>
+ <layout_stack name="login_widgets">
+ <layout_panel name="login">
+ <text name="first_name_text">
+ ImiÄ™:
+ </text>
+ <line_editor label="ImiÄ™" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/>
+ <line_editor label="Nazwisko" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/>
+ <check_box label="Zapamiętaj hasło" name="remember_check"/>
+ <text name="start_location_text">
+ Rozpocznij w:
+ </text>
+ <combo_box name="start_location_combo">
+ <combo_box.item label="Moje Miejsce Startu" name="MyHome"/>
+ </combo_box>
+ <button label="Połącz" name="connect_btn"/>
+ </layout_panel>
+ <layout_panel name="links">
+ <text name="create_new_account_text">
+ Utwórz nowe konto
+ </text>
+ <text name="login_help">
+ Potrzebujesz pomocy z logowaniem siÄ™?
+ </text>
+ </layout_panel>
+ </layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4d91c3cdc8c636aba5a98300414de560ad1b0cf7
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Dopasuj" name="Media settings for controls">
+ <text name="controls_label">
+ Ustawienia:
+ </text>
+ <combo_box name="controls">
+ <combo_item name="Standard">
+ Standardowe
+ </combo_item>
+ <combo_item name="Mini">
+ Mini
+ </combo_item>
+ </combo_box>
+ <check_box initial_value="false" label="Pozwól na Nawigację & Interaktywność" name="perms_owner_interact"/>
+ <check_box initial_value="false" label="Pokaż Pasek Kontroli" name="perms_owner_control"/>
+ <check_box initial_value="false" label="Pozwól na Nawigację & Interaktywność" name="perms_group_interact"/>
+ <check_box initial_value="false" label="Pokaż Pasek Kontroli" name="perms_group_control"/>
+ <check_box initial_value="false" label="Pozwól na Nawigację & Interaktywność" name="perms_anyone_interact"/>
+ <check_box initial_value="false" label="Pokaż Pasek Kontroli" name="perms_anyone_control"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml
new file mode 100644
index 0000000000000000000000000000000000000000..162df37e5257183caf0f195cbbce028da9650f04
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="Outfits">
+ <accordion name="outfits_accordion">
+ <accordion_tab name="tab_cof" title="Aktualne Ubranie"/>
+ <accordion_tab name="tab_outfits" title="Moje Ubrania"/>
+ </accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_people.xml b/indra/newview/skins/default/xui/pl/panel_people.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ff65cd2abbdef4417c6ef96549bbc8d8e23f0c0c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_people.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Side tray panel -->
+<panel label="Ludzie" name="people_panel">
+ <string name="no_people" value="Brak ludzi"/>
+ <string name="no_one_near" value="Nikogo w pobliżu"/>
+ <string name="no_friends_online" value="Brak dostępnych przyjaciół"/>
+ <string name="no_friends" value="Brak przyjaciół"/>
+ <string name="no_groups" value="Brak grup"/>
+ <string name="people_filter_label" value="Filtruj Ludzi"/>
+ <string name="groups_filter_label" value="Filtruj Grupy"/>
+ <filter_editor label="Filtr" name="filter_input"/>
+ <tab_container name="tabs">
+ <panel label="W POBLIŻU" name="nearby_panel">
+ <panel label="bottom_panel" name="bottom_panel">
+ <button name="nearby_view_sort_btn" tool_tip="Opcje"/>
+ <button name="add_friend_btn" tool_tip="Dodaj wybranych Rezydentów do swojej listy znajomych"/>
+ </panel>
+ </panel>
+ <panel label="ZNAJOMI" name="friends_panel">
+ <accordion name="friends_accordion">
+ <accordion_tab name="tab_online" title="Dostępni"/>
+ <accordion_tab name="tab_all" title="Wszyscy"/>
+ </accordion>
+ <panel label="bottom_panel" name="bottom_panel">
+ <button name="friends_viewsort_btn" tool_tip="Opcje"/>
+ <button name="add_btn" tool_tip="Zaproponuj znajomość"/>
+ <button name="del_btn" tool_tip="Usuń wybraną osobę ze swojej listy znajomych"/>
+ </panel>
+ </panel>
+ <panel label="GRUPY" name="groups_panel">
+ <panel label="bottom_panel" name="bottom_panel">
+ <button name="groups_viewsort_btn" tool_tip="Opcje"/>
+ <button name="plus_btn" tool_tip="Dołącz do grupy/Stwórz nową grupę"/>
+ <button name="activate_btn" tool_tip="Aktywuj wybranÄ… grupÄ™"/>
+ </panel>
+ </panel>
+ <panel label="OSTATNIE" name="recent_panel">
+ <panel label="bottom_panel" name="bottom_panel">
+ <button name="recent_viewsort_btn" tool_tip="Opcje"/>
+ <button name="add_friend_btn" tool_tip="Zaproponuj znajomość"/>
+ </panel>
+ </panel>
+ </tab_container>
+ <panel name="button_bar">
+ <button label="Profil" name="view_profile_btn" tool_tip="Pokaż grafiki, grupy oraz inne informacje dostępne o Rezydentach"/>
+ <button label="IM" name="im_btn" tool_tip="Rozpocznij rozmowÄ™ prywatnÄ… (IM)"/>
+ <button label="Zadzwoń" name="call_btn" tool_tip="Zadzwoń do tego Rezydenta"/>
+ <button label="Podziel siÄ™" name="share_btn"/>
+ <button label="Teleportuj" name="teleport_btn" tool_tip="Zaproponuj teleportacjÄ™"/>
+ <button label="Profil grupy" name="group_info_btn" tool_tip="Pokaż informacje o grupie"/>
+ <button label="Konferencja Grupowa" name="chat_btn" tool_tip="Rozpocznij konferencÄ™"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_picks.xml b/indra/newview/skins/default/xui/pl/panel_picks.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5d69c25ff3780e723ee3476df20dd3a09236c3e8
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_picks.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Ulubione" name="panel_picks">
+ <string name="no_picks" value="Brak Ulubionych"/>
+ <string name="no_classifieds" value="Brak Reklam"/>
+ <text name="empty_picks_panel_text">
+ Brak ulubionych/reklam w tym miejscu
+ </text>
+ <accordion name="accordion">
+ <accordion_tab name="tab_picks" title="Ulubione"/>
+ <accordion_tab name="tab_classifieds" title="Reklamy"/>
+ </accordion>
+ <panel label="bottom_panel" name="edit_panel">
+ <button name="new_btn" tool_tip="Stwórz w obecnym miejscu nową zakładkę w ulubionych lub reklamę"/>
+ </panel>
+ <panel name="buttons_cucks">
+ <button label="Info" name="info_btn" tool_tip="Pokaż info o ulubionych"/>
+ <button label="Teleportuj" name="teleport_btn" tool_tip="Teleportuj do odpowiadajÄ…cego miejsca"/>
+ <button label="Mapa" name="show_on_map_btn" tool_tip="Pokaż odpowiadające miejsce w Mapie Świata"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
index e3cdaae840da93f86ca6a4efa3e62cbefa951eb2..d72f13fabd6ac0495404d45b3feb3895f15f0547 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
@@ -1,33 +1,26 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Komunikacja" name="im">
- <text name="text_box">
- Mój Status Online:
+ <panel.string name="log_in_to_change">
+ Zaloguj się ponownie, aby zmienić
+ </panel.string>
+ <button label="Wyczyść Historię" name="clear_cache"/>
+ <text name="cache_size_label_l">
+ (Miejsca, obrazy, przeglÄ…darka internetowa, wyszukiwarka historii)
</text>
- <check_box label="Mój status online jest dostepny tylko dla Znajomych i Grup"
- name="online_visibility" />
- <text name="text_box2">
- Ustawienia IM:
+ <check_box label="Mój status online jest dostępny tylko dla znajomych i grup do których należę" name="online_visibility"/>
+ <check_box label="Możliwość wysyłania wiadomości prywatnej (IM) oraz rozmowy głosowej tylko dla znajomych i grup do których należę" name="voice_call_friends_only_check"/>
+ <check_box label="Wyłącz mikrofon po zakończeniu rozmowy głosowej" name="auto_disengage_mic_check"/>
+ <check_box label="Akceptuj Ciasteczka" name="cookies_enabled"/>
+ <check_box label="Zezwól na Automatyczne Uruchomianie Mediów Strumieniowych" name="autoplay_enabled"/>
+ <text name="Logs:">
+ Logi:
</text>
- <string name="log_in_to_change">
- zaloguj się żeby zmienić
- </string>
- <check_box label="Wysyłaj IMy na email ([EMAIL])" name="send_im_to_email" />
- <check_box label="Dołącz IMy do Konsola Czatu" name="include_im_in_chat_console" />
- <check_box label="Pokazuj czas w IM" name="show_timestamps_check" />
- <check_box label="Powiadamiaj o zalogowanych znajomych"
- name="friends_online_notify_checkbox" />
- <text name="text_box3">
- Pracuś Mówi:
+ <check_box label="Zapisz logi rozmów ogólnych na moim komputerze" name="log_nearby_chat"/>
+ <check_box label="Zapisuj logi wiadomości prywatnych (IM) na moim komputerze" name="log_instant_messages"/>
+ <check_box label="Pokazuj czas" name="show_timestamps_check_im"/>
+ <text name="log_path_desc">
+ Pokazuj miejsce logu
</text>
- <text name="text_box4">
- Ustawienia Zapisu:
- </text>
- <check_box label="Zapisuj IMy" name="log_instant_messages" />
- <check_box label="Pokazuj czas w zapisie IM" name="log_instant_messages_timestamp" />
- <check_box label="Pokazuj koniec ostatniego dialogu IM" name="log_show_history" />
- <check_box label="Zapisuj czat" name="log_chat" />
- <check_box label="Pokazuj czas w zapisie czatu" name="log_chat_timestamp" />
- <check_box label="Pokazuj nowe IMy w zapisie czatu" name="log_chat_IM" />
- <check_box label="Pokazuj czas Å‚Ä…cznie z datÄ…" name="log_date_timestamp" />
- <button label="Lokacja" label_selected="Lokacja" name="log_path_button" />
+ <button label="PrzeglÄ…daj" label_selected="PrzeglÄ…daj" name="log_path_button"/>
+ <button label="Lista Zablokowanych" name="block_list"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_profile.xml b/indra/newview/skins/default/xui/pl/panel_profile.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1ff115e0b591df65a9bc95e8fdf3c1d4763e7c66
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_profile.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Profil" name="panel_profile">
+ <string name="no_partner_text" value="Brak"/>
+ <string name="RegisterDateFormat">
+ [REG_DATE] ([AGE])
+ </string>
+ <scroll_container name="profile_scroll">
+ <panel name="scroll_content_panel">
+ <panel name="second_life_image_panel">
+ <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
+ </panel>
+ <panel name="first_life_image_panel">
+ <text name="title_rw_descr_text" value=":"/>
+ </panel>
+ <text name="me_homepage_text">
+ Strona Domowa:
+ </text>
+ <text name="title_member_text" value="Członek od:"/>
+ <text name="title_acc_status_text" value="Status Konta:"/>
+ <text name="acc_status_text" value="Rezydent. Brak Danych Konta"/>
+ <text name="title_partner_text" value="Partner:"/>
+ <text name="title_groups_text" value="Groupy:"/>
+ </panel>
+ </scroll_container>
+ <panel name="profile_buttons_panel">
+ <button label="Dodaj Znajomość" name="add_friend" tool_tip="Dodaj tego Rezydenta do znajomych"/>
+ <button label="IM" name="im" tool_tip="Rozpocznij rozmowÄ™ prywatnÄ…"/>
+ <button label="Zadzwoń" name="call" tool_tip="Zadzwoń do tego Rezydenta"/>
+ <button label="Mapa" name="show_on_map_btn" tool_tip="Pokaż tego Rezydenta na mapie"/>
+ <button label="Teleportuj" name="teleport" tool_tip="Zaoferuj TeleportacjÄ™"/>
+ <button label="▼" name="overflow_btn" tool_tip="Zapłać lub wyślij obiekt temu Rezydentowi"/>
+ </panel>
+ <panel name="profile_me_buttons_panel">
+ <button label="Edytuj Profil" name="edit_profile_btn"/>
+ <button label="Edytuj WyglÄ…d" name="edit_appearance_btn"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml
index f20387dd25db8558652cd2fb4b2fb0d4de4a2d3c..31b410c931d4d8ea47a999b8c5b827135b756909 100644
--- a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Umowa" name="Covenant">
<text name="estate_section_lbl">
- MajÄ…tek:
+ MajÄ…tek
</text>
<text name="estate_name_lbl">
Nazwa:
@@ -26,44 +26,44 @@
Brak umowy dla tego majÄ…tku.
</text_editor>
<button label="Wyresetuj" name="reset_covenant"/>
- <text name="covenant_help_text" bottom_delta="-6">
+ <text bottom_delta="-6" name="covenant_help_text">
Zmiany w umowie zostaną wyświetlone we
wszystkich posiadłościach majątku.
</text>
- <text name="covenant_instructions" bottom_delta="-36">
- Przeciągnij oraz wrzuć notę by zmienić umowę dla tego majątku.
+ <text bottom_delta="-36" name="covenant_instructions">
+ Przeciągnij oraz wrzuć notkę by zmienić umowę dla tego majątku.
</text>
<text name="region_section_lbl">
- Region:
+ Region
</text>
<text name="region_name_lbl">
Nazwa:
</text>
- <text name="region_name_text" left="115">
+ <text left="115" name="region_name_text">
leyla
</text>
<text name="region_landtype_lbl">
Typ:
</text>
- <text name="region_landtype_text" left="115">
+ <text left="115" name="region_landtype_text">
Region Główny / Ziemia
</text>
<text name="region_maturity_lbl">
Rodzaj:
</text>
- <text name="region_maturity_text" left="115">
+ <text left="115" name="region_maturity_text">
'Adult'
</text>
<text name="resellable_lbl">
Odsprzedaj:
</text>
- <text name="resellable_clause" left="115" width="350">
+ <text left="115" name="resellable_clause" width="350">
Posiadłość zakupiona w tym regionie nie może być odsprzedana.
</text>
<text name="changeable_lbl">
Podziel:
</text>
- <text name="changeable_clause" left="115" width="350">
+ <text left="115" name="changeable_clause" width="350">
Posiadłość zakupiona w tym regionie nie może być
Å‚Ä…czona/dzielona.
</text>
diff --git a/indra/newview/skins/default/xui/pl/panel_script_ed.xml b/indra/newview/skins/default/xui/pl/panel_script_ed.xml
new file mode 100644
index 0000000000000000000000000000000000000000..09c3d8ad04121b3b34b6a13c86f91f4d0ca07fcc
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_script_ed.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="script panel">
+ <panel.string name="loading">
+ Åadowanie...
+ </panel.string>
+ <panel.string name="can_not_view">
+ Nie posiadasz praw do zobaczenia lub edycji kodu tego skryptu ponieważ udostępnione Ci prawa to "brak kopiowania". Musisz posiadać pełne prawa by móc zobaczyć lub edytować kod skryptu w zawartości obiektu.
+ </panel.string>
+ <panel.string name="public_objects_can_not_run">
+ Publiczne obiekty nie mogą uruchamiać skryptów
+ </panel.string>
+ <panel.string name="script_running">
+ Uruchomione
+ </panel.string>
+ <panel.string name="Title">
+ Skrypt: [NAME]
+ </panel.string>
+ <text_editor name="Script Editor">
+ Åadowanie...
+ </text_editor>
+ <button label="Zapisz" label_selected="Zapisz" name="Save_btn"/>
+ <combo_box label="Wklej..." name="Insert..."/>
+ <menu_bar name="script_menu">
+ <menu label="Plik" name="File">
+ <menu_item_call label="Zapisz" name="Save"/>
+ <menu_item_call label="Cofnij wszystkie zmiany" name="Revert All Changes"/>
+ </menu>
+ <menu label="Edytuj" name="Edit">
+ <menu_item_call label="Cofnij" name="Undo"/>
+ <menu_item_call label="Do Przodu" name="Redo"/>
+ <menu_item_call label="Wytnij" name="Cut"/>
+ <menu_item_call label="Kopiuj" name="Copy"/>
+ <menu_item_call label="Wklej" name="Paste"/>
+ <menu_item_call label="Wybierz Wszystko" name="Select All"/>
+ <menu_item_call label="Odznacz" name="Deselect"/>
+ <menu_item_call label="Znajdź / Zamień..." name="Search / Replace..."/>
+ </menu>
+ <menu label="Pomoc" name="Help">
+ <menu_item_call label="Pomoc..." name="Help..."/>
+ <menu_item_call label="Pomoc..." name="Keyword Help..."/>
+ </menu>
+ </menu_bar>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_side_tray.xml b/indra/newview/skins/default/xui/pl/panel_side_tray.xml
new file mode 100644
index 0000000000000000000000000000000000000000..369097cd0b5881f44366f32bdaea2b51f74e0c13
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_side_tray.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Side tray cannot show background because it is always
+ partially on screen to hold tab buttons. -->
+<side_tray name="sidebar">
+ <sidetray_tab description="Miejsce Startu." name="sidebar_home" tab_title="Home">
+ <panel label="miejsce startu" name="panel_home"/>
+ </sidetray_tab>
+ <sidetray_tab description="Znajdź swoich znajomych, kontakty oraz Rezydentów w pobliżu Ciebie." name="sidebar_people" tab_title="People">
+ <panel_container name="panel_container">
+ <panel label="Info o Grupie" name="panel_group_info_sidetray"/>
+ <panel label="Zablokowani Rezydenci & Obiekty" name="panel_block_list_sidetray"/>
+ </panel_container>
+ </sidetray_tab>
+ <sidetray_tab description="Znajdź i odwiedź miejsca, w których byłeś wcześniej." label="Miejsca" name="sidebar_places" tab_title="Places">
+ <panel label="Miejsca" name="panel_places"/>
+ </sidetray_tab>
+ <sidetray_tab description="Edytuj swój publiczny profil oraz ulubione zakładki." name="sidebar_me" tab_title="My Profile">
+ <panel label="Ja" name="panel_me"/>
+ </sidetray_tab>
+ <sidetray_tab description="Zmień swój obecny wygląd i ubranie." name="sidebar_appearance" tab_title="My Appearance">
+ <panel label="Edytuj WyglÄ…d" name="sidepanel_appearance"/>
+ </sidetray_tab>
+ <sidetray_tab description="PrzeglÄ…daj SzafÄ™." name="sidebar_inventory" tab_title="My Inventory">
+ <panel label="Edytuj SzafÄ™" name="sidepanel_inventory"/>
+ </sidetray_tab>
+</side_tray>
diff --git a/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e47a15b67a27b51ac86c9bba659649947e0f9fbc
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Width and height of this panel should be synchronized with "panel_modes" in the floater_moveview.xml-->
+<panel name="panel_stand_stop_flying">
+ <button label="Wstań" name="stand_btn" tool_tip="Kliknij tutaj by wstać."/>
+ <button label="Zatrzymaj Latanie" name="stop_fly_btn" tool_tip="Zatrzymaj Latanie"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_teleport_history.xml b/indra/newview/skins/default/xui/pl/panel_teleport_history.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d88d98f104b584e02d515a387fa099bbee4bdd1f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_teleport_history.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="Teleport History">
+ <accordion name="history_accordion">
+ <accordion_tab name="today" title="Dzisiaj"/>
+ <accordion_tab name="yesterday" title="Wczoraj"/>
+ <accordion_tab name="2_days_ago" title="2 dni temu"/>
+ <accordion_tab name="3_days_ago" title="3 dni temu"/>
+ <accordion_tab name="4_days_ago" title="4 dni temu"/>
+ <accordion_tab name="5_days_ago" title="5 dni temu"/>
+ <accordion_tab name="6_days_and_older" title="6 dni i więcej"/>
+ <accordion_tab name="1_month_and_older" title="1 miesiąc i więcej"/>
+ <accordion_tab name="6_months_and_older" title="6 miesięcy i więcej"/>
+ </accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b70c76f652b6b8dca7cc3b3e2b81d0104ba3557f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="item properties" title="Właściwości Obiektu w Szafie">
+ <panel.string name="unknown">
+ (nieznany)
+ </panel.string>
+ <panel.string name="public">
+ (publiczny)
+ </panel.string>
+ <panel.string name="you_can">
+ Ty możesz:
+ </panel.string>
+ <panel.string name="owner_can">
+ Właściciel może:
+ </panel.string>
+ <panel.string name="acquiredDate">
+ [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+ </panel.string>
+ <text name="title" value="Właściwości Obiektu"/>
+ <panel label="">
+ <text name="LabelItemNameTitle">
+ Nazwa:
+ </text>
+ <text name="LabelItemDescTitle">
+ Opis:
+ </text>
+ <text name="LabelCreatorTitle">
+ Twórca:
+ </text>
+ <button label="Profil..." name="BtnCreator"/>
+ <text name="LabelOwnerTitle">
+ Właściciel:
+ </text>
+ <button label="Profil..." name="BtnOwner"/>
+ <text name="LabelAcquiredTitle">
+ Nabyte:
+ </text>
+ <text name="LabelAcquiredDate">
+ Wed May 24 12:50:46 2006
+ </text>
+ <text name="OwnerLabel">
+ Ty:
+ </text>
+ <check_box label="Edytuj" name="CheckOwnerModify"/>
+ <check_box label="Kopiuj" name="CheckOwnerCopy"/>
+ <check_box label="Oddawaj" name="CheckOwnerTransfer"/>
+ <text name="AnyoneLabel">
+ Każdemu:
+ </text>
+ <check_box label="Kopiuj" name="CheckEveryoneCopy"/>
+ <text name="GroupLabel">
+ Groupa:
+ </text>
+ <check_box label="Podziel siÄ™" name="CheckShareWithGroup"/>
+ <text name="NextOwnerLabel">
+ Następny właściciel:
+ </text>
+ <check_box label="Edytuje" name="CheckNextOwnerModify"/>
+ <check_box label="Kopiuje" name="CheckNextOwnerCopy"/>
+ <check_box label="Oddaje" name="CheckNextOwnerTransfer"/>
+ <check_box label="Na Sprzedaż" name="CheckPurchase"/>
+ <combo_box name="combobox sale copy">
+ <combo_box.item label="Kopia" name="Copy"/>
+ <combo_box.item label="Originał" name="Original"/>
+ </combo_box>
+ <spinner label="Cena:" name="Edit Cost"/>
+ <text name="CurrencySymbol">
+ L$
+ </text>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
index d6e1c925b0c4d721254c268cef4d44e688a109a4..39548dc4978cff77921fdf84bdaceac881aaa0dc 100644
--- a/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_about" title="SOBRE O [CAPITALIZED_APP_NAME]">
+<floater name="floater_about" title="SOBRE [CAPITALIZED_APP_NAME]">
<floater.string name="AboutHeader">
[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
</floater.string>
@@ -7,7 +7,7 @@
ConstruÃdo com [COMPILER] versão [COMPILER_VERSION]
</floater.string>
<floater.string name="AboutPosition">
- Você está em [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] em [REGION] localizado em [HOSTNAME] ([HOSTIP])
+ Você está em [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] em [REGION] localizado em [HOSTNAME]</nolink>([HOSTIP])
[SERVER_VERSION]
[[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]]
</floater.string>
@@ -42,12 +42,19 @@ Versão Vivox: [VIVOX_VERSION]
</panel>
<panel label="Créditos" name="credits_panel">
<text_editor name="credits_editor">
- Second Life é oferecido a você por Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl e muitos outros.
+ O Second Life é o resultado do trabalho de Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les e muitos mais.
- Obrigado aos seguintes residentes por ajudar a garantir para que esta versão seja ainda melhor: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
+Agradecemos também aos seguintes residentes por sua colaboração na mais nova versão do Second Life: (in progress)
- Para ter sucesso nos negócios, seja ousado, seja o primeiro, seja diferente. --Henry Marchant
+
+
+
+
+
+
+Raras são as mentes capazes de tornar óbvio o até então inexistente. Dizer 'eu poderia ter pensado a mesma coisa' é comum, revelador e nem sempre a verdade; porque de fato não pensaram.
+ -- Douglas Adams
</text_editor>
</panel>
<panel label="Licenças" name="licenses_panel">
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 bf6faf50cc477671bc15fe5daefb045976b0838d..ebb9bfc32db04f0e7894ff7016137736b8730661 100644
--- a/indra/newview/skins/default/xui/pt/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml
@@ -81,6 +81,9 @@ Vá para o menu Mundo > Sobre a Terra ou selecione outro lote para mostrar se
<text name="Group:">
Grupo:
</text>
+ <text name="GroupText">
+ Leyla Linden
+ </text>
<button label="Ajustar..." label_selected="Ajustar..." name="Set..."/>
<check_box label="Permitir posse para o grupo" name="check deed" tool_tip="O gerente do grupo pode acionar essa terra ao grupo, então esta será mantida pelo gestor da ilha"/>
<button label="Passar..." label_selected="Passar..." name="Deed..." tool_tip="Você só pode delegar esta terra se você for um gerente selecionado pelo grupo."/>
@@ -124,6 +127,7 @@ Vá para o menu Mundo > Sobre a Terra ou selecione outro lote para mostrar se
0
</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 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..."/>
@@ -253,7 +257,7 @@ ou sub-dividida.
[COUNT]
</text>
<text left="4" name="Autoreturn" width="412">
- Auto-retornar objetos dos outros residentes (minutos, 0 para desligado):
+ Devolver objetos de outros residentes automaticamente (digite 0 para desligar)
</text>
<line_editor name="clean other time" right="-10"/>
<text name="Object Owners:">
@@ -301,7 +305,7 @@ Apenas lotes maiores podem ser listados na busca.
Sem Empurrar (Imposição na Região)
</panel.string>
<text name="allow_label">
- Permitir outros residentes a:
+ Autorizar outros residentes a:
</text>
<check_box label="Editar Terreno" name="edit land check" tool_tip="Se ativado, qualquer um pode modificar a forma da sua terra. É melhor deixar esta opção desativada, uma vez que você sempre pode editar seu próprio terreno."/>
<check_box label="Voar" name="check fly" tool_tip="Se ativado, os Residentes podem voar na sua terra. Se desativado, eles podem voar apenas para dentro e por cima de sua terra."/>
@@ -384,9 +388,6 @@ Apenas lotes maiores podem ser listados na busca.
</text>
<line_editor left="97" name="media_url"/>
<button label="Definir..." label_selected="Definir..." name="set_media_url"/>
- <text name="CurrentURL:">
- Página atual:
- </text>
<check_box label="Esconder a URL da MÃdia" left="97" name="hide_media_url" tool_tip="Ativando esta opção, a URL da mÃdia se ocultará para quaisquer visualizadores não autorizados a ver esta informação do lote. Notar que isto não está disponÃvel para tipos HTML."/>
<text name="Description:">
Descrição:
@@ -398,9 +399,7 @@ Textura:
</text>
<texture_picker label="" left="97" name="media texture" tool_tip="Clique para escolher uma imagem"/>
<text name="replace_texture_help">
- (Objetos usando esta textura, mostrarão o filme ou
-a página web depois que você clicar na seta de
-reproduzir.)
+ Objetos com esta textura vão aparecer no filme ou página da web depois de clicar em Tocar. Selecione outras texturas clicando nas miniaturas.
</text>
<check_box label="Escala automática" left="97" name="media_auto_scale" tool_tip="Marcando esta opção o conteúdo se ajustará ao lote automaticamente. A mÃdia pode se tornar lenta e com baixa qualidade visual mas nenhum outro ajuste de textura ou alinhamento será necessário."/>
<text left="102" name="media_size" tool_tip="Tamanho para desenhar a mÃdia Web, deixar 0 como padrão." width="115">
@@ -418,8 +417,10 @@ MÃdia:
<check_box label="MÃdia em Repetição" name="media_loop" tool_tip="Executar a mÃdia repetidamente. Quando a mÃdia terminar a execução, ela reiniciará do começo."/>
</panel>
<panel label="SOM" name="land_audio_panel">
+ <check_box label="Ocultar URL" name="hide_music_url" tool_tip="Selecionar esta opção oculta o URL de música a visitantes não autorizados aos dados do terreno."/>
<check_box label="Ativar voz" name="parcel_enable_voice_channel"/>
<check_box label="Ativar voz (definições do terreno)" name="parcel_enable_voice_channel_is_estate_disabled"/>
+ <check_box label="Limitar bate-papo de voz a este lote" name="parcel_enable_voice_channel_local"/>
</panel>
<panel label="ACESSO" name="land_access_panel">
<panel.string name="access_estate_defined">
@@ -435,7 +436,7 @@ MÃdia:
<text name="Only Allow">
Restringir acesso a contas confirmardas por:
</text>
- <check_box label="Dados de pagamento fornecidos [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Banir residentes não identificados."/>
+ <check_box label="Dados de pagamento fornecidos [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Banir residentes sem identificação."/>
<check_box label="Idade confirmada: [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Banir residentes que não comprovaram a idade. Consulte o [SUPPORT_SITE] para saber mais."/>
<check_box label="Permitir Acesso do Grupo: [GROUP]" name="GroupCheck" tool_tip="Definir grupo na aba Geral."/>
<check_box label="Vender passes para:" name="PassCheck" tool_tip="Permite acesso temporário a este terreno"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_animation_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
index 020cfbc81110fb310c62b93f17f41b1fdb22a442..78bcde251a7221b336a519bb16d94dffb7bebc90 100644
--- a/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
@@ -106,6 +106,9 @@ A duração máxima de animação permitida é de [MAX_LENGTH] segundos.
<floater.string name="E_ST_NO_XLT_EMOTE">
ImpossÃvel ler nome do emote.
</floater.string>
+ <floater.string name="E_ST_BAD_ROOT">
+ Nome da junta incorreto, use "quadril".
+ </floater.string>
<text name="name_label">
Nome:
</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
index 0d52fec23bc06398f396ab5e8b5fef947609045d..5fb64f64b3bd15d92afd19dcee5806554aa861ff 100644
--- a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
@@ -7,26 +7,37 @@
Texturas compostas
</text>
<button label="Tombar" label_selected="Tombar" name="Dump"/>
- <texture_picker label="Cabelo" name="hair_grain"/>
- <texture_picker label="Cabelo alpha" name="hair_alpha"/>
- <texture_picker label="Maquilagem" name="head_bodypaint"/>
- <texture_picker label="Cabeça Alpha" name="head_alpha"/>
- <texture_picker label="Tatuagem na cabeça" name="head_tattoo"/>
- <texture_picker label="Olho" name="eyes_iris"/>
- <texture_picker label="Olhos Alpha" name="eyes_alpha"/>
- <texture_picker label="Pintura corporal, cintura para cima" name="upper_bodypaint"/>
- <texture_picker label="Camiseta" name="upper_undershirt"/>
- <texture_picker label="Luvas" name="upper_gloves"/>
- <texture_picker label="Camisa" name="upper_shirt"/>
- <texture_picker label="Jaqueta (cima)" name="upper_jacket"/>
- <texture_picker label="Alpha de cima" name="upper_alpha"/>
- <texture_picker label="Tatuagem parte de cima" name="upper_tattoo"/>
- <texture_picker label="Pintura corporal, cintura para baixo" name="lower_bodypaint"/>
- <texture_picker label="Roupa de baixo" name="lower_underpants"/>
- <texture_picker label="Meias" name="lower_socks"/>
- <texture_picker label="Sapatos" name="lower_shoes"/>
- <texture_picker label="Calças" name="lower_pants"/>
- <texture_picker label="Jaqueta" name="lower_jacket"/>
- <texture_picker label="Alpha inferior" name="lower_alpha"/>
- <texture_picker label="Tatuagem de baixo" name="lower_tattoo"/>
+ <scroll_container name="profile_scroll">
+ <panel name="scroll_content_panel">
+ <texture_picker label="Cabelo" name="hair-baked"/>
+ <texture_picker label="Cabelo" name="hair_grain"/>
+ <texture_picker label="Cabelo alpha" name="hair_alpha"/>
+ <texture_picker label="Cabeça" name="head-baked"/>
+ <texture_picker label="Maquilagem" name="head_bodypaint"/>
+ <texture_picker label="Cabeça Alpha" name="head_alpha"/>
+ <texture_picker label="Tatuagem na cabeça" name="head_tattoo"/>
+ <texture_picker label="Olhos" name="eyes-baked"/>
+ <texture_picker label="Olho" name="eyes_iris"/>
+ <texture_picker label="Olhos Alpha" name="eyes_alpha"/>
+ <texture_picker label="Cintura acima" name="upper-baked"/>
+ <texture_picker label="Pintura corporal, cintura para cima" name="upper_bodypaint"/>
+ <texture_picker label="Camiseta" name="upper_undershirt"/>
+ <texture_picker label="Luvas" name="upper_gloves"/>
+ <texture_picker label="Camisa" name="upper_shirt"/>
+ <texture_picker label="Jaqueta (cima)" name="upper_jacket"/>
+ <texture_picker label="Alpha de cima" name="upper_alpha"/>
+ <texture_picker label="Tatuagem parte de cima" name="upper_tattoo"/>
+ <texture_picker label="Cintura para baixo" name="lower-baked"/>
+ <texture_picker label="Pintura corporal, cintura para baixo" name="lower_bodypaint"/>
+ <texture_picker label="Roupa de baixo" name="lower_underpants"/>
+ <texture_picker label="Meias" name="lower_socks"/>
+ <texture_picker label="Sapatos" name="lower_shoes"/>
+ <texture_picker label="Calças" name="lower_pants"/>
+ <texture_picker label="Jaqueta" name="lower_jacket"/>
+ <texture_picker label="Alpha inferior" name="lower_alpha"/>
+ <texture_picker label="Tatuagem de baixo" name="lower_tattoo"/>
+ <texture_picker label="Saia" name="skirt-baked"/>
+ <texture_picker label="Saia" name="skirt"/>
+ </panel>
+ </scroll_container>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
index b3cce2d78fbf45bd6332de9b77121d6bc8559ab9..1d0b3c4cd9b5114aeffecf2013017b43e612ef95 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
@@ -46,7 +46,7 @@
L$ [AMT]
</text>
<text name="currency_links">
- [http://www.secondlife.com/ payment method] | [http://www.secondlife.com/ currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate]
+ [http://www.secondlife.com/my/account/payment_method_management.php payment method] | [http://www.secondlife.com/my/account/currency.php currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate]
</text>
<text name="exchange_rate_note">
Digite o valor novamente para ver o câmbio atual.
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 f0e5808df363263294d35a9dd707c306eb62e37c..9500ba94e575bf87175d2d4aad4de94d110bfe8b 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_land.xml
@@ -1,5 +1,131 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="buy land" title="COMPRAR TERRENO">
+ <floater.string name="can_resell">
+ Pode ser revendida.
+ </floater.string>
+ <floater.string name="can_not_resell">
+ Não pode ser revendida.
+ </floater.string>
+ <floater.string name="can_change">
+ Pode ser unida ou subdivida.
+ </floater.string>
+ <floater.string name="can_not_change">
+ Não pode ser unida ou subdividida.
+ </floater.string>
+ <floater.string name="cant_buy_for_group">
+ Você não tem permissão para comprar terra para seu grupo ativo.
+ </floater.string>
+ <floater.string name="no_land_selected">
+ Nenhuma terra selecionada.
+ </floater.string>
+ <floater.string name="multiple_parcels_selected">
+ Múltiplos e diferentes lotes selecionados. Tente selecionar uma área menor.
+ </floater.string>
+ <floater.string name="no_permission">
+ Você não tem permissão para comprar uma terra para seu grupo ativo.
+ </floater.string>
+ <floater.string name="parcel_not_for_sale">
+ O lote selecionado não está a venda.
+ </floater.string>
+ <floater.string name="group_already_owns">
+ O grupo já possui o lote.
+ </floater.string>
+ <floater.string name="you_already_own">
+ Você já possui o lote.
+ </floater.string>
+ <floater.string name="set_to_sell_to_other">
+ O lote selecionado está configurado para ser vendido para outro grupo.
+ </floater.string>
+ <floater.string name="no_public_land">
+ 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.
+ </floater.string>
+ <floater.string name="processing">
+ Processando sua compra...
+
+(Isso pode levar um minuto.)
+ </floater.string>
+ <floater.string name="fetching_error">
+ Houve um erro ao buscar informações sobre compra de terras.
+ </floater.string>
+ <floater.string name="buying_will">
+ Comprar esta terra irá:
+ </floater.string>
+ <floater.string name="buying_for_group">
+ Ao comprar terra para o grupo:
+ </floater.string>
+ <floater.string name="cannot_buy_now">
+ Não foi possÃvel comprar agora:
+ </floater.string>
+ <floater.string name="not_for_sale">
+ Não disponÃvel para venda:
+ </floater.string>
+ <floater.string name="none_needed">
+ nada necessário
+ </floater.string>
+ <floater.string name="must_upgrade">
+ Sua conta deve ser evoluÃda para adquirir um lote.
+ </floater.string>
+ <floater.string name="cant_own_land">
+ Sua conta pode possuir uma terra.
+ </floater.string>
+ <floater.string name="land_holdings">
+ Você tem [BUYER] m².
+ </floater.string>
+ <floater.string name="pay_to_for_land">
+ Pagar L$ [AMOUNT] para [SELLER] por esta terra
+ </floater.string>
+ <floater.string name="buy_for_US">
+ Compre L$ [AMOUNT] por cerca de [LOCAL_AMOUNT],
+ </floater.string>
+ <floater.string name="parcel_meters">
+ Este lote tem [AMOUNT] m²
+ </floater.string>
+ <floater.string name="premium_land">
+ Esse é um terreno premium e custa o equivalente a [AMOUNT] m².
+ </floater.string>
+ <floater.string name="discounted_land">
+ Esse é um terreno com desconto, e custa o equivalente a [AMOUNT] m².
+ </floater.string>
+ <floater.string name="meters_supports_object">
+ [AMOUNT] m²
+suporta [AMOUNT2] objetos
+ </floater.string>
+ <floater.string name="sold_with_objects">
+ vendido com objetos
+ </floater.string>
+ <floater.string name="sold_without_objects">
+ objetos não incluÃdos
+ </floater.string>
+ <floater.string name="info_price_string">
+ L$ [PRICE]
+(L$ [PRICE_PER_SQM]/m²)
+[SOLD_WITH_OBJECTS]
+ </floater.string>
+ <floater.string name="insufficient_land_credits">
+ O grupo [GROUP] precisará de fundos suficientes de terras
+contribuÃdas para cobrir este lote antes da aquisição se completar.
+ </floater.string>
+ <floater.string name="have_enough_lindens">
+ Você tem L$ [AMOUNT], suficiente para comprar este lote.
+ </floater.string>
+ <floater.string name="not_enough_lindens">
+ Você tem somente L$ [AMOUNT], e precisa de mais L$ [AMOUNT2].
+ </floater.string>
+ <floater.string name="balance_left">
+ Após a compra, restará L$ [AMOUNT].
+ </floater.string>
+ <floater.string name="balance_needed">
+ Você precisa comprar pelo menos L$ [AMOUNT] para ter recursos para este lote.
+ </floater.string>
+ <floater.string name="no_parcel_selected">
+ (nenhum lote selecionado)
+ </floater.string>
+ <floater.string name="icon_PG" value="Parcel_PG_Dark"/>
+ <floater.string name="icon_M" value="Parcel_M_Dark"/>
+ <floater.string name="icon_R" value="Parcel_R_Dark"/>
<text name="region_name_label">
Região:
</text>
@@ -106,130 +232,4 @@ Este lote mede 512 m².
<check_box label="Subtrair [AMOUNT] m² da minha contribuição." name="remove_contribution"/>
<button label="Adquirir" name="buy_btn"/>
<button label="Cancelar" name="cancel_btn"/>
- <string name="can_resell">
- Pode ser revendida.
- </string>
- <string name="can_not_resell">
- Não pode ser revendida.
- </string>
- <string name="can_change">
- Pode ser unida ou subdivida.
- </string>
- <string name="can_not_change">
- Não pode ser unida ou subdividida.
- </string>
- <string name="cant_buy_for_group">
- Você não tem permissão para comprar terra para seu grupo ativo.
- </string>
- <string name="no_land_selected">
- Nenhuma terra selecionada.
- </string>
- <string name="multiple_parcels_selected">
- Múltiplos e diferentes lotes selecionados. Tente selecionar uma área menor.
- </string>
- <string name="no_permission">
- Você não tem permissão para comprar uma terra para seu grupo ativo.
- </string>
- <string name="parcel_not_for_sale">
- O lote selecionado não está a venda.
- </string>
- <string name="group_already_owns">
- O grupo já possui o lote.
- </string>
- <string name="you_already_own">
- Você já possui o lote.
- </string>
- <string name="set_to_sell_to_other">
- O lote selecionado está configurado para ser vendido para outro grupo.
- </string>
- <string name="no_public_land">
- A área selecionada não tem terras públicas.
- </string>
- <string name="not_owned_by_you">
- Está selecionada uma terra pertencente a outro usuário. Tente selecionar uma área menor.
- </string>
- <string name="processing">
- Processando sua compra...
-
-(Isso pode levar um minuto.)
- </string>
- <string name="fetching_error">
- Houve um erro ao buscar informações sobre compra de terras.
- </string>
- <string name="buying_will">
- Comprar esta terra irá:
- </string>
- <string name="buying_for_group">
- Ao comprar terra para o grupo:
- </string>
- <string name="cannot_buy_now">
- Não foi possÃvel comprar agora:
- </string>
- <string name="not_for_sale">
- Não disponÃvel para venda:
- </string>
- <string name="none_needed">
- nada necessário
- </string>
- <string name="must_upgrade">
- Sua conta deve ser evoluÃda para adquirir um lote.
- </string>
- <string name="cant_own_land">
- Sua conta pode possuir uma terra.
- </string>
- <string name="land_holdings">
- Você tem [BUYER] m².
- </string>
- <string name="pay_to_for_land">
- Pagar L$ [AMOUNT] para [SELLER] por esta terra
- </string>
- <string name="buy_for_US">
- Compre L$ [AMOUNT] por cerca de [LOCAL_AMOUNT],
- </string>
- <string name="parcel_meters">
- Este lote tem [AMOUNT] m²
- </string>
- <string name="premium_land">
- Esse é um terreno premium e custa o equivalente a [AMOUNT] m².
- </string>
- <string name="discounted_land">
- Esse é um terreno com desconto, e custa o equivalente a [AMOUNT] m².
- </string>
- <string name="meters_supports_object">
- [AMOUNT] m²
-suporta [AMOUNT2] objetos
- </string>
- <string name="sold_with_objects">
- vendido com objetos
- </string>
- <string name="sold_without_objects">
- objetos não incluÃdos
- </string>
- <string name="info_price_string">
- L$ [PRICE]
-(L$ [PRICE_PER_SQM]/m²)
-[SOLD_WITH_OBJECTS]
- </string>
- <string name="insufficient_land_credits">
- O grupo [GROUP] precisará de fundos suficientes de terras
-contribuÃdas para cobrir este lote antes da aquisição se completar.
- </string>
- <string name="have_enough_lindens">
- Você tem L$ [AMOUNT], suficiente para comprar este lote.
- </string>
- <string name="not_enough_lindens">
- Você tem somente L$ [AMOUNT], e precisa de mais L$ [AMOUNT2].
- </string>
- <string name="balance_left">
- Após a compra, restará L$ [AMOUNT].
- </string>
- <string name="balance_needed">
- Você precisa comprar pelo menos L$ [AMOUNT] para ter recursos para este lote.
- </string>
- <string name="no_parcel_selected">
- (nenhum lote selecionado)
- </string>
- <string name="buy_currency">
- Comprar L$ [LINDENS] por aproxim. US$ [USD]
- </string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_color_picker.xml b/indra/newview/skins/default/xui/pt/floater_color_picker.xml
index d60a815f3066e610bc105c8f9c79003155eda987..4ea014335ff5b792de2d1c19cd8350179f5b2114 100644
--- a/indra/newview/skins/default/xui/pt/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/pt/floater_color_picker.xml
@@ -21,7 +21,7 @@
<check_box label="inscrever-se agora" name="apply_immediate"/>
<button left_delta="150" name="color_pipette"/>
<button label="Cancelar" label_selected="Cancelar" left_delta="55" name="cancel_btn"/>
- <button label="Ok" label_selected="Ok" name="select_btn"/>
+ <button label="OK" label_selected="OK" name="select_btn"/>
<text name="Current color:">
Cor atual:
</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_customize.xml b/indra/newview/skins/default/xui/pt/floater_customize.xml
index 447ca8c5436deabdfa3f6c1dad177ec6e07aa496..318c73e52d84577b094251cb11506a6b1328859d 100644
--- a/indra/newview/skins/default/xui/pt/floater_customize.xml
+++ b/indra/newview/skins/default/xui/pt/floater_customize.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater customize" title="APARÊNCIA" width="546">
<tab_container name="customize tab container" tab_min_width="115" width="544">
- <placeholder label="Partes de corpo" name="body_parts_placeholder"/>
+ <text label="Partes de corpo" name="body_parts_placeholder">
+ Partes do corpo
+ </text>
<panel label="Forma" name="Shape">
<button label="Reverter" label_selected="Reverter" name="Revert"/>
<button label="Corpo" label_selected="Corpo" name="Body"/>
@@ -14,8 +16,8 @@
<button label="Tórax" label_selected="Tórax" name="Torso"/>
<button label="Pernas" label_selected="Pernas" name="Legs"/>
<radio_group name="sex radio">
- <radio_item label="Feminino" name="radio"/>
- <radio_item label="Masculino" name="radio2"/>
+ <radio_item label="Feminino" name="radio" value="0"/>
+ <radio_item label="Masculino" name="radio2" value="1"/>
</radio_group>
<text name="title">
[DESC]
@@ -33,8 +35,7 @@
Localizado em [PATH]
</text>
<text name="not worn instructions">
- Coloque uma nova forma arrastando uma do seu inventário para seu avatar.
-Alternativamente, você pode criar uma nova de um esboço e usá-la.
+ Para obter um fÃsico novo, arraste um do inventário para o seu avatar. Ou crie um novo.
</text>
<text name="no modify instructions">
Você não tem permissão para modificar esta vestimenta.
@@ -67,9 +68,7 @@ Alternativamente, você pode criar uma nova de um esboço e usá-la.
Localizada em [PATH]
</text>
<text name="not worn instructions">
- Coloque uma nova pele arrastando uma de seu inventário para seu avatar.
-Alternativamente, você pode criar uma nova forma a partir de um esboço
-e usá-la.
+ Para obter uma pele nova, arraste uma do inventário para o seu avatar. Ou crie uma pele nova.
</text>
<text name="no modify instructions">
Você não tem permissão para modificar esta vestimenta.
@@ -106,9 +105,7 @@ e usá-la.
Localizado em [PATH]
</text>
<text name="not worn instructions">
- Ponha um novo cabelo em seu avatar arrastando um do seu inventário.
-Alternativamente, você pode criar um novo modelo a partir de um esboço
-e usá-lo.
+ Para obter um cabelo novo, arraste um tipo de cabelo do inventário para o seu avatar. Ou crie um cabelo novo.
</text>
<text name="no modify instructions">
Você não ter permissão para modificar essa vestimenta.
@@ -139,8 +136,7 @@ e usá-lo.
Localizado em [PATH]
</text>
<text name="not worn instructions">
- Para colocar novos olhos, arraste um do seu inventário para seu avatar.
-Alternativamente, você pode criar um novo modelo de um esboço e usá-lo.
+ Para obter novos olhos, arraste um tipo de olhos do inventário para o seu avatar. Ou crie olhos novos.
</text>
<text name="no modify instructions">
Você não tem permissão para alterar esta vestimenta.
@@ -154,12 +150,14 @@ Alternativamente, você pode criar um novo modelo de um esboço e usá-lo.
<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
<button label="Reverter" label_selected="Reverter" name="Revert"/>
</panel>
- <placeholder label="Roupas" name="clothes_placeholder"/>
+ <text label="Roupas" name="clothes_placeholder">
+ Roupa
+ </text>
<panel label="Camisa" name="Shirt">
<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
- <button label="Criar Nova Camisa" label_selected="Criar Nova Camisa" name="Create New"/>
<button label="Remover" label_selected="Remover" name="Take Off"/>
+ <button label="Criar Nova Camisa" label_selected="Criar Nova Camisa" name="Create New"/>
<button label="Salvar" label_selected="Salvar" name="Save"/>
<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
<button label="Reverter" label_selected="Reverter" name="Revert"/>
@@ -179,9 +177,7 @@ Alternativamente, você pode criar um novo modelo de um esboço e usá-lo.
Localizado em [PATH]
</text>
<text name="not worn instructions">
- Para por uma nova camisa em seu avatar, arraste uma do seu inventário para
-seu avatar. Alternativamente, você pode criar um novo modelo a partir de
-um esboço e usá-lo.
+ Para obter uma camisa nova, arraste uma do inventário para o seu avatar. Ou crie uma camisa nova.
</text>
<text name="no modify instructions">
Você não ter permissão para modificar esta vestimenta.
@@ -193,8 +189,8 @@ um esboço e usá-lo.
<panel label="Calças" name="Pants">
<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
- <button label="Criar Novas Calças" label_selected="Criar Novas Calças" name="Create New"/>
<button label="Remover" label_selected="Remover" name="Take Off"/>
+ <button label="Criar Novas Calças" label_selected="Criar Novas Calças" name="Create New"/>
<button label="Salvar" label_selected="Salvar" name="Save"/>
<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
<button label="Reverter" label_selected="Reverter" name="Revert"/>
@@ -214,9 +210,7 @@ um esboço e usá-lo.
Localizado em [PATH]
</text>
<text name="not worn instructions">
- Para por uma nova calça em seu avatar, basta arrastar uma outra do seu
-inventário. Alternativamente, você pode criar um novo modelo a partir
-de um esboço e usá-lo.
+ Para obter calças novas, arraste uma do inventário para o seu avatar. Ou crie calças novas.
</text>
<text name="no modify instructions">
Você não tem permissão para modificar esta vestimenta.
@@ -242,10 +236,9 @@ de um esboço e usá-lo.
Localizado em [PATH]
</text>
<text name="not worn instructions">
- Para por novos sapatos em seu avatar, basta arrastar um novo do seu
-inventário. Alternativamente, você pode criar um novo modelo a partir
-de um esboço e usá-lo.
+ Para obter novos olhos, arraste um tipo de olhos do inventário para o seu avatar. Ou crie olhos novos.
</text>
+ <button label="Criar Novos Sapatos" label_selected="Criar Novos Sapatos" name="Create New" width="166"/>
<text name="no modify instructions">
Você não tem permissão para modificar esta vestimenta.
</text>
@@ -254,7 +247,6 @@ de um esboço e usá-lo.
</text>
<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
- <button label="Criar Novos Sapatos" label_selected="Criar Novos Sapatos" name="Create New" width="166"/>
<button label="Remover" label_selected="Remover" name="Take Off"/>
<button label="Salvar" label_selected="Salvar" name="Save"/>
<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
@@ -277,10 +269,9 @@ de um esboço e usá-lo.
Localizado em [PATH]
</text>
<text name="not worn instructions">
- Para por novas meias em seu avatar, basta arrastar uma nova do seu
-inventário. Alternativamente, você pode criar novas meias a partir de
-um esboço e usá-las.
+ Para obter meias novas, arraste um par do inventário para o seu avatar. Ou crie meias novas.
</text>
+ <button label="Criar Novas Meias" label_selected="Criar Novas Meias" name="Create New"/>
<text name="no modify instructions">
Você não tem permissão para modificar essa vestimenta.
</text>
@@ -289,7 +280,6 @@ um esboço e usá-las.
</text>
<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
- <button label="Criar Novas Meias" label_selected="Criar Novas Meias" name="Create New"/>
<button label="Remover" label_selected="Remover" name="Take Off"/>
<button label="Salvar" label_selected="Salvar" name="Save"/>
<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
@@ -312,10 +302,9 @@ um esboço e usá-las.
Localizado em [PATH]
</text>
<text name="not worn instructions">
- Para por uma nova jaqueta em seu avatar, basta arrastar um novo modelo
-do seu inventário. Alternativamente, você pode criar um novo modelo a
-partir de um esboço e usá-lo.
+ Para por uma jaqueta nova, arraste uma do inventário para o seu avatar. Ou crie uma jaqueta nova.
</text>
+ <button label="Criar Nova Jaqueta" label_selected="Criar Nova Jaqueta" name="Create New"/>
<text name="no modify instructions">
Você não tem permissão para modificar esta vestimenta.
</text>
@@ -325,7 +314,6 @@ partir de um esboço e usá-lo.
<texture_picker label="Tecido Superior" name="Upper Fabric" tool_tip="Clique para escolher uma imagem." width="84"/>
<texture_picker label="Tecido Inferior" name="Lower Fabric" tool_tip="Clique para escolher uma imagem." width="84"/>
<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
- <button label="Criar Nova Jaqueta" label_selected="Criar Nova Jaqueta" name="Create New"/>
<button label="Remover" label_selected="Remover" name="Take Off"/>
<button label="Salvar" label_selected="Salvar" name="Save"/>
<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
@@ -348,10 +336,9 @@ partir de um esboço e usá-lo.
Localizado em [PATH]
</text>
<text name="not worn instructions">
- Para colocar uma nova jaqueta em seu avatar, basta arrastar um novo modelo
-do seu inventário. Alternativamente, você pode criar uma novo modelo a
-partir de um esboço e usá-lo.
+ Para obter luvas novas, arraste um par do inventário para o seu avatar. Ou crie luvas novas.
</text>
+ <button label="Criar Novas Luvas" label_selected="Criar Novas Luvas" name="Create New"/>
<text name="no modify instructions">
Você não tem permissão para modificar essa vestimenta.
</text>
@@ -360,7 +347,6 @@ partir de um esboço e usá-lo.
</text>
<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
- <button label="Criar Novas Luvas" label_selected="Criar Novas Luvas" name="Create New"/>
<button label="Remover" label_selected="Remover" name="Take Off"/>
<button label="Salvar" label_selected="Salvar" name="Save"/>
<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
@@ -383,10 +369,9 @@ partir de um esboço e usá-lo.
Localizado em [PATH]
</text>
<text name="not worn instructions">
- Para por uma nova Camiseta em seu avatar, basta arrastar um novo modelo
-de seu inventário. Alternativamente, você pode criar um novo modelo a
-partir de um esboço e usá-lo.
+ Para obter uma camiseta nova, arraste uma do inventário para o seu avatar. Ou crie uma camiseta nova.
</text>
+ <button label="Criar Nova Camiseta" label_selected="Criar Nova Camiseta" name="Create New"/>
<text name="no modify instructions">
Você não ter permissão para modificar essa vestimenta.
</text>
@@ -395,7 +380,6 @@ partir de um esboço e usá-lo.
</text>
<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
- <button label="Criar Nova Camiseta" label_selected="Criar Nova Camiseta" name="Create New"/>
<button label="Remover" label_selected="Remover" name="Take Off"/>
<button label="Salvar" label_selected="Salvar" name="Save"/>
<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
@@ -418,10 +402,9 @@ partir de um esboço e usá-lo.
Localizado em [PATH]
</text>
<text name="not worn instructions">
- Para por novas roupas de baixo em seu avatar, basta arrastar um novo
-modelo do seu inventário. Alternativamente, você pode criar um novo
-modelo a partir de um esboço e usá-lo.
+ Para obter roupa de baixo nova, arraste um modelo do inventário para o seu avatar. Ou crie uma roupa de baixo nova.
</text>
+ <button label="Criar Novas Roupas de Baixo" label_selected="Criar Novas Roupas de Baixo" name="Create New" width="180"/>
<text name="no modify instructions">
Você não tem permissão para modificar essa vestimenta.
</text>
@@ -430,7 +413,6 @@ modelo a partir de um esboço e usá-lo.
</text>
<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
- <button label="Criar Novas Roupas de Baixo" label_selected="Criar Novas Roupas de Baixo" name="Create New" width="180"/>
<button label="Remover" label_selected="Remover" name="Take Off"/>
<button label="Salvar" label_selected="Salvar" name="Save"/>
<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
@@ -453,10 +435,9 @@ modelo a partir de um esboço e usá-lo.
Localizado em [PATH]
</text>
<text name="not worn instructions">
- Para por uma nova saia em seu avatar, basta arrastar um novo modelo
-do seu inventário. Alternativamente, você pode criar um novo modelo a
-partir de um esboço e usá-lo.
+ Para obter um saia nova, arraste uma saia do inventário para o seu avatar. Ou crie uma saia nova.
</text>
+ <button label="Criar Nova Saia" label_selected="Criar Nova Saia" name="Create New"/>
<text name="no modify instructions">
Você não tem permissão para modificar esta vestimenta.
</text>
@@ -465,13 +446,12 @@ partir de um esboço e usá-lo.
</text>
<texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
<color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/>
- <button label="Criar Nova Saia" label_selected="Criar Nova Saia" name="Create New"/>
<button label="Remover" label_selected="Remover" name="Take Off"/>
<button label="Salvar" label_selected="Salvar" name="Save"/>
<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
<button label="Reverter" label_selected="Reverter" name="Revert"/>
</panel>
- <panel label="Alpha" name="Alpha">
+ <panel label="Tatuagem" name="Tattoo">
<text name="title">
[DESC]:
</text>
@@ -488,27 +468,24 @@ partir de um esboço e usá-lo.
Localização: [PATH]
</text>
<text name="not worn instructions">
- Para por uma máscara alpha nova, arraste a máscara do inventário para o seu avatar.
-Ou crie uma máscara nova e coloque-a.
+ Para por uma tatuagem nova, arraste uma tatuagem do inventário para o seu avatar. Ou crie uma tatuagem nova.
</text>
+ <button label="Criar tatuagem" label_selected="Criar tatuagem" name="Create New"/>
<text name="no modify instructions">
Você não está autorizado a modificar este acessório.
</text>
<text name="Item Action Label">
- Alpha:
+ Tatuagem:
</text>
- <texture_picker label="Alpha inferior" name="Lower Alpha" tool_tip="Selecionar imagem"/>
- <texture_picker label="Alpha de cima" name="Upper Alpha" tool_tip="Selecionar imagem"/>
- <texture_picker label="Cabeça Alpha" name="Head Alpha" tool_tip="Selecionar imagem"/>
- <texture_picker label="Olhos Alpha" name="Eye Alpha" tool_tip="Selecionar imagem"/>
- <texture_picker label="Cabelo alpha" name="Hair Alpha" tool_tip="Selecionar imagem"/>
- <button label="Criar Alpha novo" label_selected="Criar Alpha novo" name="Create New"/>
+ <texture_picker label="Tatuagem na cabeça" name="Head Tattoo" tool_tip="Selecionar imagem"/>
+ <texture_picker label="Tatuagem parte de cima" name="Upper Tattoo" tool_tip="Selecionar imagem"/>
+ <texture_picker label="Tatuagem de baixo" name="Lower Tattoo" tool_tip="Selecionar imagem"/>
<button label="Tirar" label_selected="Tirar" name="Take Off"/>
<button label="Salvar" label_selected="Salvar" name="Save"/>
<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
<button label="Reverter" label_selected="Reverter" name="Revert"/>
</panel>
- <panel label="Tatuagem" name="Tattoo">
+ <panel label="Alpha" name="Alpha">
<text name="title">
[DESC]:
</text>
@@ -525,19 +502,20 @@ Ou crie uma máscara nova e coloque-a.
Localização: [PATH]
</text>
<text name="not worn instructions">
- Para por uma tatuagem nova, arraste uma tatuagem do inventário para o seu avatar.
-Ou crie uma tatuagem nova.
+ Para por uma máscara alpha nova, arraste a máscara do inventário para o seu avatar. Ou crie uma máscara nova.
</text>
+ <button label="Criar Alpha novo" label_selected="Criar Alpha novo" name="Create New"/>
<text name="no modify instructions">
Você não está autorizado a modificar este acessório.
</text>
<text name="Item Action Label">
- Tatuagem:
+ Alpha:
</text>
- <texture_picker label="Tatuagem na cabeça" name="Head Tattoo" tool_tip="Selecionar imagem"/>
- <texture_picker label="Tatuagem parte de cima" name="Upper Tattoo" tool_tip="Selecionar imagem"/>
- <texture_picker label="Tatuagem de baixo" name="Lower Tattoo" tool_tip="Selecionar imagem"/>
- <button label="Criar tatuagem" label_selected="Criar tatuagem" name="Create New"/>
+ <texture_picker label="Alpha inferior" name="Lower Alpha" tool_tip="Selecionar imagem"/>
+ <texture_picker label="Alpha de cima" name="Upper Alpha" tool_tip="Selecionar imagem"/>
+ <texture_picker label="Cabeça Alpha" name="Head Alpha" tool_tip="Selecionar imagem"/>
+ <texture_picker label="Olhos Alpha" name="Eye Alpha" tool_tip="Selecionar imagem"/>
+ <texture_picker label="Cabelo alpha" name="Hair Alpha" tool_tip="Selecionar imagem"/>
<button label="Tirar" label_selected="Tirar" name="Take Off"/>
<button label="Salvar" label_selected="Salvar" name="Save"/>
<button label="Salvar como..." label_selected="Salvar como..." name="Save As"/>
@@ -545,6 +523,7 @@ Ou crie uma tatuagem nova.
</panel>
</tab_container>
<scroll_container left="249" name="panel_container"/>
+ <button label="Dados do script" label_selected="Dados do script" name="script_info" tool_tip="Mostrar scripts anexados ao seu avatar"/>
<button label="Criar look" label_selected="Criar look" name="make_outfit_btn"/>
<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
<button label="OK" label_selected="OK" name="Ok"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_event.xml b/indra/newview/skins/default/xui/pt/floater_event.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4b2489654a2990d237a740e3726ede10ef21d31e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_event.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="Evento" name="Event" title="DETALHES DO EVENTO">
+ <floater.string name="none">
+ nenhum
+ </floater.string>
+ <floater.string name="notify">
+ Avisar
+ </floater.string>
+ <floater.string name="dont_notify">
+ Não avisar
+ </floater.string>
+ <layout_stack name="layout">
+ <layout_panel name="profile_stack">
+ <text name="event_name">
+ Evento sem nome... Terror! Terror Aterrorizante.
+ </text>
+ <text name="event_category">
+ (não categorizado)
+ </text>
+ <text name="event_runby_label">
+ Organização:
+ </text>
+ <text initial_value="(pesquisando)" name="event_runby"/>
+ <text name="event_date">
+ 10/10/2010
+ </text>
+ <text name="event_duration">
+ 1 hora
+ </text>
+ <text name="event_cover">
+ Grátis
+ </text>
+ <text name="event_location_label">
+ Localização:
+ </text>
+ <text name="event_location" value="LoteExemplo, Nome extenso (145, 228, 26)"/>
+ <text name="rating_label" value="Classificação:"/>
+ <text name="rating_value" value="(Desconhecido)"/>
+ </layout_panel>
+ <layout_panel name="button_panel">
+ <button name="create_event_btn" tool_tip="Criar evento"/>
+ <button name="god_delete_event_btn" tool_tip="Excluir evento"/>
+ <button label="Avise-me" name="notify_btn"/>
+ <button label="Teletransportar" name="teleport_btn"/>
+ <button label="Mapa" name="map_btn"/>
+ </layout_panel>
+ </layout_stack>
+</floater>
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 4b7b2eb34eefddfeeac9647e5e274c53a60bf61e..93b2f3e90d61c8c70e817f87a9b6194121046a23 100644
--- a/indra/newview/skins/default/xui/pt/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_god_tools.xml
@@ -11,7 +11,7 @@
</text>
<check_box label="Prelúdio" name="check prelude" tool_tip="Ajustar para tornar esta região um prelúdio."/>
<check_box label="Fixar Sol" name="check fixed sun" tool_tip="Fixa a posição do sol (como em Região/Estados) > Terreno."/>
- <check_box label="Redefinir Home no teletransporte" name="check reset home" tool_tip="Quando um residente se teletransporta, redefine sua home para a posição de destino."/>
+ <check_box label="Redefinir Home no teletransporte" name="check reset home" tool_tip="Quando um residente sair, definir o destino com sua posição inicial."/>
<check_box label="VisÃvel" name="check visible" tool_tip="Ajustar para fazer essa região visÃvel para os não-deuses"/>
<check_box label="Dano" name="check damage" tool_tip="Ajustar para permitir dano nesta região"/>
<check_box label="Bloquear ratreamento do Tráfego" name="block dwell" tool_tip="Configure isto para fazer a região não computar o tráfego."/>
@@ -73,17 +73,17 @@
Destino:
</text>
<combo_box name="destination">
- <combo_box.item name="item1" label="Seleção" />
- <combo_box.item name="item2" label="Região do Agente" />
+ <combo_box.item label="Seleção" name="item1"/>
+ <combo_box.item label="Região do Agente" name="item2"/>
</combo_box>
<text name="Request:">
Requisição:
</text>
<combo_box name="request">
- <combo_box.item name="item1" label="Passos de Colisão" />
- <combo_box.item name="item2" label="Contagem de scripts, padrão opcional" />
- <combo_box.item name="item3" label="Padrão de Objetos" />
- <combo_box.item name="item4" label="rez <asset_id>" />
+ <combo_box.item label="Passos de Colisão" name="item1"/>
+ <combo_box.item label="Contagem de scripts, padrão opcional" name="item2"/>
+ <combo_box.item label="Padrão de Objetos" name="item3"/>
+ <combo_box.item label="rez <asset_id>" name="item4"/>
</combo_box>
<text name="Parameter:">
Parametro:
diff --git a/indra/newview/skins/default/xui/pt/floater_help_browser.xml b/indra/newview/skins/default/xui/pt/floater_help_browser.xml
index 281bdbd183070ae7ae615cdd1d4bf550259ff953..9cc8a0a6b2e8782da6fe6a4aa65c14ba54ac3678 100644
--- a/indra/newview/skins/default/xui/pt/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/pt/floater_help_browser.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="floater_help_browser" title="NAVEGADOR DA AJUDA">
+ <floater.string name="loading_text">
+ Carregando...
+ </floater.string>
<layout_stack name="stack1">
- <layout_panel name="external_controls">
- <button label="Abrir no navegador" name="open_browser"/>
- </layout_panel>
+ <layout_panel name="external_controls"/>
</layout_stack>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_im_container.xml b/indra/newview/skins/default/xui/pt/floater_im_container.xml
index a21d4a6f1ef3f0e3f5c46d85be33af65d84fa85d..0fbb826a964ff2d22584daf2271862d8f121bfe6 100644
--- a/indra/newview/skins/default/xui/pt/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/pt/floater_im_container.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="Mensagens instantâneas"/>
+<multi_floater name="floater_im_box" title="CONVERSAS"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
index 79124966d184f8dd97db15103e2a428a2880f050..cdebe533bde23a39d978f785ca601c2cdb3fbefa 100644
--- a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="incoming call" title="LIGAÇÃO DE DESCONHECIDO">
+ <floater.string name="lifetime">
+ 5
+ </floater.string>
<floater.string name="localchat">
Bate-papo local
</floater.string>
@@ -12,6 +15,9 @@
<floater.string name="VoiceInviteAdHoc">
entrou numa ligação de voz via conferência.
</floater.string>
+ <floater.string name="VoiceInviteGroup">
+ entrou numa ligação de bate-papo de voz com o grupo [GROUP].
+ </floater.string>
<text name="question">
Sair do [CURRENT_CHAT] e entrar neste bate-papo?
</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory.xml b/indra/newview/skins/default/xui/pt/floater_inventory.xml
index 409261a136859fe8ecd1c282950890f39cb86597..ae3312eab008fe3150377f69d28a04f4f2a0a7c2 100644
--- a/indra/newview/skins/default/xui/pt/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="INVENTÃRIO">
+<floater name="Inventory" title="MEU INVENTÃRIO">
<floater.string name="Title">
- Inventário
+ MEU INVENTÃRIO
</floater.string>
<floater.string name="TitleFetching">
- Inventário ([ITEM_COUNT] Items) [FILTER] [FILTER]
+ MEU INVENTÃRIO (Pegando [ITEM_COUNT] items...) [FILTER]
</floater.string>
<floater.string name="TitleCompleted">
- Inventário ([ITEM_COUNT] Items) [FILTER]
+ MEU INVENTÃRIO ([ITEM_COUNT] items) [FILTER]
</floater.string>
<floater.string name="Fetched">
Obtido
diff --git a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
index 1717088eae9b40e38945d97ce4f86c8c3555066f..5ad116ac8a119175ab6ede75cd3ff8a977dd8cc1 100644
--- a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
@@ -7,7 +7,7 @@
Executando
</floater.string>
<floater.string name="Title">
- Script: [NAME]
+ SCRIPT: [NAME]
</floater.string>
<button label="Resetar" label_selected="Resetar" name="Reset"/>
<check_box initial_value="true" label="Correndo" name="running"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml b/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
index f9a5e08e9761bb6764b660a0fe593febc77d5b21..73f187f0e432fcea9504d16292361e18be4a6c36 100644
--- a/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script ed float" title="LSL WIKI">
+<floater name="script ed float" title="LSL REFERENCE">
<check_box label="Seguir o Cursor" name="lock_check"/>
<combo_box label="Bloquear" left_delta="120" name="history_combo" width="70"/>
<button label="Anterior" left_delta="75" name="back_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_map.xml b/indra/newview/skins/default/xui/pt/floater_map.xml
index ff60f77c4b59d2a0c5bb482d5c8bef224a5a488b..3a045282286d34c1709162b74b981b6eabdc54c5 100644
--- a/indra/newview/skins/default/xui/pt/floater_map.xml
+++ b/indra/newview/skins/default/xui/pt/floater_map.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Map">
+<floater name="Map" title="Mini Mapa">
<floater.string name="mini_map_north">
N
</floater.string>
diff --git a/indra/newview/skins/default/xui/pt/floater_media_browser.xml b/indra/newview/skins/default/xui/pt/floater_media_browser.xml
index 1cd6d5662c274e3af897731b37bedb89ec612046..74912180677158532839800bcc232d8ac4c99100 100644
--- a/indra/newview/skins/default/xui/pt/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/pt/floater_media_browser.xml
@@ -15,7 +15,7 @@
<button label="Ir" left_delta="505" name="go" width="35"/>
</layout_panel>
<layout_panel name="parcel_owner_controls">
- <button label="Enviar a URL atual para o terreno" name="assign"/>
+ <button label="Enviar esta página para lote" name="assign"/>
</layout_panel>
<layout_panel name="external_controls">
<button label="Abrir no meu Navegador de Web" name="open_browser" width="196"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_moveview.xml b/indra/newview/skins/default/xui/pt/floater_moveview.xml
index 7c4436537df4fbf807adb0beacb8d434ddc9996c..f67a16bb46fe9ac06c5a46ecd6a38134477ad9ec 100644
--- a/indra/newview/skins/default/xui/pt/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_moveview.xml
@@ -21,7 +21,7 @@
<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)"/>
- <button label="" label_selected="" name="move up btn" tool_tip="Voar para o alto (tecla E)"/>
+ <button label="" label_selected="" name="move up btn" tool_tip="Voar para cima (tecla E)"/>
<button label="" label_selected="" name="move down btn" tool_tip="Voar para baixo (tecla C)"/>
<joystick_turn name="forward btn" tool_tip="Andar para frente (flecha para cima ou W)"/>
<joystick_turn name="backward btn" tool_tip="Andar para trás (flecha para baixo ou S)"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dec8a7676ad4d465bdb3b0bf1686350c017bfed8
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="modal container" title="Salvar este look">
+ <button label="Salvar" label_selected="Salvar" name="Save"/>
+ <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+ <text name="Save item as:">
+ Veja o meu novo visual:
+ </text>
+ <line_editor name="name ed">
+ [DESC] (new)
+ </line_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml b/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml
index 20781853154d89486a29ed13642fc0657b87add7..8a536b90dbc338e4cc8be1644d413a0a098a0a8d 100644
--- a/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="outgoing call" title="LIGANDO">
+ <floater.string name="lifetime">
+ 5
+ </floater.string>
<floater.string name="localchat">
Bate-papo local
</floater.string>
@@ -21,6 +24,15 @@
<text name="noanswer">
Não há resposta. Tente novamente mais tarde.
</text>
+ <text name="nearby">
+ Você saiu da ligação com [VOICE_CHANNEL_NAME]. [RECONNECT_NEARBY]
+ </text>
+ <text name="nearby_P2P_by_other">
+ [VOICE_CHANNEL_NAME] encerrou a ligação. [RECONNECT_NEARBY]
+ </text>
+ <text name="nearby_P2P_by_agent">
+ Você encerrou a ligação. [RECONNECT_NEARBY]
+ </text>
<text name="leaving">
Saindo de [CURRENT_CHAT].
</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_pay_object.xml b/indra/newview/skins/default/xui/pt/floater_pay_object.xml
index 161c7c6d4be2bbb9ea9ad81f3a957238ab47dbb7..464afd7f188f76686619d52792ee11a7e5e7f324 100644
--- a/indra/newview/skins/default/xui/pt/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pay_object.xml
@@ -15,7 +15,7 @@
</text>
<icon name="icon_object" tool_tip="Objects"/>
<text left="105" name="object_name_text">
- ...
+ Meu objeto maravilho, fantástico e com nome comprido e imaginativo
</text>
<button label="L$1" label_selected="L$1" left="125" name="fastpay 1" width="70"/>
<button label="L$5" label_selected="L$5" left="200" name="fastpay 5" width="70"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_preferences.xml b/indra/newview/skins/default/xui/pt/floater_preferences.xml
index dc29bcf6b1ca27fb276b1dddc5c7b8e97767e6e9..803f2f87b86da9b4d522e4ea7f12a6bf3306eddd 100644
--- a/indra/newview/skins/default/xui/pt/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preferences.xml
@@ -6,7 +6,7 @@
<panel label="Público geral" name="general"/>
<panel label="VÃdeo" name="display"/>
<panel label="Privacidade" name="im"/>
- <panel label="Som" name="audio"/>
+ <panel label="Som e mÃdia" name="audio"/>
<panel label="Bate-papo" name="chat"/>
<panel label="Notificações" name="msgs"/>
<panel label="Configurações" name="input"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_animation.xml b/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
index c7d3affd738277d8be320712d82b8ebf4ca2ffa9..b66159354f579249369b9bc7b87ed3b6fc10b326 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
@@ -6,6 +6,6 @@
<text name="desc txt">
Descrição:
</text>
- <button label="Executar in World" label_selected="Parar" left="20" name="Anim play btn" tool_tip="Tocar essa animação de forma que outros possam ver" width="131"/>
+ <button label="Tocar inworld" label_selected="Parar" left="20" name="Anim play btn" tool_tip="Tocar essa animação de forma que outros possam ver" width="131"/>
<button label="Executar localmente" label_selected="Parar" left="162" name="Anim audition btn" tool_tip="Tocar essa animação de forma que apenas você possa ver" width="125"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
index af4dceaa8940ab13682c6b752d8c434c48f70f22..48f27f196830191b53665233d39bb98c996feb7c 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
@@ -24,6 +24,9 @@
<floater.string name="Title">
Gesto: [NAME]
</floater.string>
+ <text name="name_text">
+ Nome:
+ </text>
<text name="desc_label">
Descrição:
</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
index 6194bfffd65d7151c5aa87cbb36df975364dc4e1..e648a7d87377630615df30d709809296af6a2f12 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview notecard" title="NOTA:">
+<floater name="preview notecard" title="Anotação:">
<floater.string name="no_object">
- Não foi possÃvel encontrar o objeto que contém esta nota.
+ O objeto com esta anotação não foi encontrado.
</floater.string>
<floater.string name="not_allowed">
Você não está autorizado a ler esta nota.
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_sound.xml b/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
index 8691542d953254f550bb9bb46fc6efed7be9e5e7..7c5a1538f29b5ff8ad76ca1f6b1b6c8df54b9bf9 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
@@ -6,6 +6,6 @@
<text name="desc txt">
Descrição:
</text>
- <button label="Executar in-World" label_selected="Executar in-World" left_delta="-132" name="Sound play btn" tool_tip="Tocar som para todos ouvirem"/>
+ <button label="Tocar inworld" label_selected="Tocar inworld" left_delta="-132" name="Sound play btn" tool_tip="Tocar som para todos ouvirem"/>
<button label="Executar Localmente" label_selected="Executar Localmente" left="152" name="Sound audition btn" tool_tip="Tocar som de forma que apenas você possa ouvir" width="135"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_texture.xml b/indra/newview/skins/default/xui/pt/floater_preview_texture.xml
index 066cf0516349480d04b0386e393f4f9ad7c9549c..6f39635240e1de1f3952fc3785c7926868f13340 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_texture.xml
@@ -12,6 +12,9 @@
<text name="dimensions">
[WIDTH]px x [HEIGHT]px
</text>
+ <text name="aspect_ratio">
+ Visualizar relação de aspecto
+ </text>
<combo_box name="combo_aspect_ratio" tool_tip="Visualizar com proporção de aspecto fixa">
<combo_item name="Unconstrained">
Sem limites
@@ -38,7 +41,7 @@
2:1
</combo_item>
</combo_box>
- <button label="OK" name="keep"/>
- <button label="Cancelar" name="discard"/>
+ <button label="OK" name="Keep"/>
+ <button label="Descartar" name="Discard"/>
<button label="Salvar como" name="save_tex_btn"/>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
index 7988056a3bd20aa7b50ddae504ad1bcd61787eed..08413a9231dffed2da30024ac3b9dcbc4a1debca 100644
--- a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
@@ -41,8 +41,8 @@
<combo_box name="category_combo" tool_tip="Categoria -- Selecione a categoria que melhor descreve este report">
<combo_box.item label="Selecionar categoria" name="Select_category"/>
<combo_box.item label="Idade > Idade no jogo" name="Age__Age_play"/>
- <combo_box.item label="Idade > Residente adulto no Second Life Jovem" name="Age__Adult_resident_on_Teen_Second_Life"/>
- <combo_box.item label="Idade > Residente menor de idade fora do Second Life Teen" name="Age__Underage_resident_outside_of_Teen_Second_Life"/>
+ <combo_box.item label="Idade > Residente adulto ou adolescente" name="Age__Adult_resident_on_Teen_Second_Life"/>
+ <combo_box.item label="Idade > Residente menor de idade, fora do Second Life teen" name="Age__Underage_resident_outside_of_Teen_Second_Life"/>
<combo_box.item label="Assalto > Sandbox de combate / área não segura" name="Assault__Combat_sandbox___unsafe_area"/>
<combo_box.item label="Assalto > Ãrea segura" name="Assault__Safe_area"/>
<combo_box.item label="Assalto > Testando armas em sandbox" name="Assault__Weapons_testing_sandbox"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_script_limits.xml b/indra/newview/skins/default/xui/pt/floater_script_limits.xml
new file mode 100644
index 0000000000000000000000000000000000000000..64a8a49c851a02d1d9ed94bc0d81af0d733073c7
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_script_limits.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="scriptlimits" title="DADOS DO SCRIPT"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_script_preview.xml b/indra/newview/skins/default/xui/pt/floater_script_preview.xml
index 5fafb0d1b86331678d742ac2c3b2fd1ec72b98f1..5be866d05200ebc83670d5b6389a95bffd758be6 100644
--- a/indra/newview/skins/default/xui/pt/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_script_preview.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="preview lsl text" title="SCRIPT: ROTATION SCRIPT">
<floater.string name="Title">
- Script: [NAME]
+ SCRIPT: [NAME]
</floater.string>
<text name="desc txt">
Descrição:
diff --git a/indra/newview/skins/default/xui/pt/floater_select_key.xml b/indra/newview/skins/default/xui/pt/floater_select_key.xml
index 15772da43452a12e3dc3193d295bfdc8de06d0d7..7264a5a71377a67c0ab9f60ca9a9b0aa79393cf3 100644
--- a/indra/newview/skins/default/xui/pt/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/pt/floater_select_key.xml
@@ -2,6 +2,6 @@
<floater name="modal container" title="">
<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
<text name="Save item as:">
- Pressione uma tecla para definir o botão disparador do Falar.
+ Pressione uma tecla para definir o seu botão Falar.
</text>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_settings_debug.xml b/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
index dfffb89f307c0f999f09b3e8a0fd9bcbf3a8ae20..c6694d13b282222f1be2dec908fdbef4525d971e 100644
--- a/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="settings_debug" title="DEBUG SETTINGS">
- <combo_box name="boolean_combo">
- <combo_box.item label="TRUE" name="TRUE"/>
- <combo_box.item label="FALSE" name="FALSE"/>
- </combo_box>
+ <radio_group name="boolean_combo">
+ <radio_item label="TRUE" name="TRUE" value="verdadeiro"/>
+ <radio_item label="FALSE" name="FALSE" value=""/>
+ </radio_group>
<color_swatch label="Cor" name="val_color_swatch"/>
<spinner label="x" name="val_spinner_1"/>
<spinner label="x" name="val_spinner_2"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_snapshot.xml b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
index b5d070c9d57ba30f1b99715c8223ff971ba4ec3c..a3934a666744e8da79db7ca600c0ba9ee68922d2 100644
--- a/indra/newview/skins/default/xui/pt/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
@@ -4,12 +4,12 @@
Destino da foto
</text>
<radio_group label="Tipo de Foto" name="snapshot_type_radio">
- <radio_item label="Enviar por email" name="postcard"/>
- <radio_item label="Salvar no seu inventário (L$[AMOUNT])" name="texture"/>
- <radio_item label="Salvar no seu disco rÃgido" name="local"/>
+ <radio_item label="Email" name="postcard"/>
+ <radio_item label="Meu inventário (L$[AMOUNT])" name="texture"/>
+ <radio_item label="Salvar no meu PC" name="local"/>
</radio_group>
<text name="file_size_label">
- Tamanho do arquivo: [SIZE] KB
+ [SIZE] KB
</text>
<button label="Atualizar a foto" name="new_snapshot_btn"/>
<button label="Enviar" name="send_btn"/>
@@ -19,8 +19,8 @@
<flyout_button.item label="Salvar como..." name="saveas_item"/>
</flyout_button>
<button label="Cancelar" name="discard_btn"/>
- <button label="Mais >" name="more_btn" tool_tip="Opções avançadas"/>
- <button label="< Menos" name="less_btn" tool_tip="Opções avançadas"/>
+ <button label="Mais" name="more_btn" tool_tip="Opções avançadas"/>
+ <button label="Menos" name="less_btn" tool_tip="Opções avançadas"/>
<text name="type_label2">
Tamanho
</text>
@@ -58,8 +58,8 @@
</combo_box>
<spinner label="Largura" label_width="41" name="snapshot_width" width="101"/>
<spinner label="Altura" label_width="31" left="119" name="snapshot_height" width="91"/>
- <check_box label="Restringir proporções" name="keep_aspect_check"/>
- <slider label="Qualidade da Imagem" name="image_quality_slider"/>
+ <check_box label="Limitar proproções" name="keep_aspect_check"/>
+ <slider label="Qualidade da imagem" name="image_quality_slider"/>
<text name="layer_type_label">
Capturar:
</text>
@@ -68,10 +68,10 @@
<combo_box.item label="Formato" name="Depth"/>
<combo_box.item label="Decoração do Objeto" name="ObjectMattes"/>
</combo_box>
- <check_box label="Mostrar interface na Foto" name="ui_check"/>
- <check_box bottom_delta="-17" label="Mostrar Objetos HUD na Foto" name="hud_check"/>
+ <check_box label="Interface" name="ui_check"/>
+ <check_box bottom_delta="-17" label="HUDs" name="hud_check"/>
<check_box bottom_delta="-17" label="Manter aberto após salvar" name="keep_open_check"/>
- <check_box bottom_delta="-17" label="Quadro Congelado (prévia da tela inteira)" name="freeze_frame_check"/>
+ <check_box bottom_delta="-17" label="Gerar quadro (tela inteira)" name="freeze_frame_check"/>
<check_box bottom_delta="-29" label="Auto-atualizar" name="auto_snapshot_check"/>
<string name="unknown">
desconhecido
diff --git a/indra/newview/skins/default/xui/pt/floater_sys_well.xml b/indra/newview/skins/default/xui/pt/floater_sys_well.xml
index b4760835b066edfcaca0cfc6e2e4f79394678d23..38beec022cfe183efeff462ac02778b0fd080c6f 100644
--- a/indra/newview/skins/default/xui/pt/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/pt/floater_sys_well.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="sys_well_window" title="AVISOS">
<string name="title_im_well_window">
- MIs
+ CONVERSAS
</string>
<string name="title_notification_well_window">
AVISOS
diff --git a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
index 69ea67699c6cdc1603a14fb087b54f8c88df0fa4..144bc0340e9ba1eb589cdc7a8767e5b137390dbd 100644
--- a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
@@ -16,7 +16,7 @@
<search_editor label="Filtrar texturas" name="inventory search editor"/>
<check_box label="Applicar agora" name="apply_immediate_check"/>
<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
- <button label="Ok" label_selected="Ok" name="Select"/>
+ <button label="OK" label_selected="OK" name="Select"/>
<string name="pick title">
Pegar:
</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_top_objects.xml b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
index c6a62c911866efb65a5aff2642f3f41fa07db190..dc3bf738188eb6a3a46c479b17969eb213ca23c5 100644
--- a/indra/newview/skins/default/xui/pt/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
@@ -1,58 +1,59 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="top_objects" title="Principais objetos:">
+ <floater.string name="top_scripts_title">
+ Principais Scripts
+ </floater.string>
+ <floater.string name="top_scripts_text">
+ [COUNT] scripts tomando um total de [TIME] ms
+ </floater.string>
+ <floater.string name="scripts_score_label">
+ Tempo
+ </floater.string>
+ <floater.string name="scripts_mono_time_label">
+ Hora Mono
+ </floater.string>
+ <floater.string name="top_colliders_title">
+ Principais Colidentes
+ </floater.string>
+ <floater.string name="top_colliders_text">
+ [COUNT] objetos principais experimentando muitas potenciais colisões
+ </floater.string>
+ <floater.string name="colliders_score_label">
+ Placar
+ </floater.string>
+ <floater.string name="none_descriptor">
+ Nenhum encontrado.
+ </floater.string>
<text name="title_text">
Carregando...
</text>
<scroll_list name="objects_list">
- <column label="Placar" name="score"/>
- <column label="Nome" name="name"/>
- <column label="Proprietário" name="owner"/>
- <column label="Local" name="location"/>
- <column label="Tempo" name="time"/>
- <column label="Hora Mono" name="mono_time"/>
+ <scroll_list.columns label="Placar" name="score"/>
+ <scroll_list.columns label="Nome" name="name"/>
+ <scroll_list.columns label="Proprietário" name="owner"/>
+ <scroll_list.columns label="Local" name="location"/>
+ <scroll_list.columns label="Tempo" name="time"/>
+ <scroll_list.columns label="Hora Mono" name="mono_time"/>
+ <scroll_list.columns label="URLs" name="URLs"/>
</scroll_list>
<text name="id_text">
ID do Objeto:
</text>
+ <line_editor font="SansSerifSmall" left="140" name="id_editor" width="280"/>
<button label="Mostrar Avisos" name="show_beacon_btn"/>
<text name="obj_name_text">
Nome do objeto:
</text>
+ <line_editor font="SansSerifSmall" left="140" name="object_name_editor" width="280"/>
<button label="Filtro" name="filter_object_btn"/>
<text name="owner_name_text" width="130">
Proprietário:
</text>
- <line_editor font="SansSerifSmall" left="140" name="id_editor" width="280"/>
- <line_editor font="SansSerifSmall" left="140" name="object_name_editor" width="280"/>
<line_editor font="SansSerifSmall" left="140" name="owner_name_editor" width="280"/>
<button label="Filtro" name="filter_owner_btn"/>
+ <button label="Atualizar" name="refresh_btn"/>
<button label="Retornar Selecionado" name="return_selected_btn" width="170"/>
<button label="Retornar Tudo" left="190" name="return_all_btn"/>
<button label="Desabilitar Selecionado" name="disable_selected_btn" width="170"/>
<button label="Desabilitar Tudo" left="190" name="disable_all_btn"/>
- <button label="Atualizar" name="refresh_btn"/>
- <string name="top_scripts_title">
- Principais Scripts
- </string>
- <string name="top_scripts_text">
- [COUNT] scripts tomando um total de [TIME] ms
- </string>
- <string name="scripts_score_label">
- Tempo
- </string>
- <string name="scripts_mono_time_label">
- Hora Mono
- </string>
- <string name="top_colliders_title">
- Principais Colidentes
- </string>
- <string name="top_colliders_text">
- [COUNT] objetos principais experimentando muitas potenciais colisões
- </string>
- <string name="colliders_score_label">
- Placar
- </string>
- <string name="none_descriptor">
- Nenhum encontrado.
- </string>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_tos.xml b/indra/newview/skins/default/xui/pt/floater_tos.xml
index 9a9666f9db55fa689e0086923d77d52d390c6188..2fbbbde9e45e6ebef1b7c41e8935e688cfc08b9d 100644
--- a/indra/newview/skins/default/xui/pt/floater_tos.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tos.xml
@@ -4,7 +4,7 @@
<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
<check_box label="Eu concordo com os Termos do Serviço" name="agree_chk"/>
<text name="tos_heading">
- Leia com atenção os Termos do Serviço. Para continuar a entrar no [SECOND_LIFE], é preciso aceitar o contrato.
+ Leia com atenção os Termos do Serviço. Para continuar a entrar no [SECOND_LIFE], é preciso aceitar o contrato.
</text>
<text_editor name="tos_text">
TOS_TEXT
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 8348b375b13897e16b2ff6bb78a8a66a0e61d3fb..6ab10db96f9fc0d97a389a2cd94b01b9df79f8f2 100644
--- a/indra/newview/skins/default/xui/pt/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/pt/floater_voice_controls.xml
@@ -13,13 +13,14 @@
Ligação para [NAME]
</string>
<string name="no_one_near">
- Ninguém por perto
+ Ninguém por perto ativou a voz
</string>
- <panel name="control_panel">
- <layout_stack>
- <layout_panel name="leave_btn_panel">
- <button label="Desligar" name="leave_call_btn"/>
- </layout_panel>
- </layout_stack>
- </panel>
+ <layout_stack name="my_call_stack">
+ <layout_panel name="my_panel">
+ <text name="user_text" value="Mya Avatar:"/>
+ </layout_panel>
+ <layout_panel name="leave_call_btn_panel">
+ <button label="Desligar" name="leave_call_btn"/>
+ </layout_panel>
+ </layout_stack>
</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml
index 2b2c669a185f995c89d7f520571423ac17401bdd..282bf0e268c7168fbb685664d81478e1061f4ded 100644
--- a/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml
+++ b/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml
@@ -3,7 +3,7 @@
<button label="Salvar" label_selected="Salvar" name="Save"/>
<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
<text name="Save item as:">
- Salvar item como:
+ Salvar item no inventário como:
</text>
<line_editor name="name ed">
Novo [DESC]
diff --git a/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml
index 8f616396ca12980cf01f5131d74d1ee5bb43cae6..865d939d246f6371591ee9dfd8ef483967d7caa3 100644
--- a/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="whitelist_entry">
+<floater name="whitelist_entry" title="LISTA BRANCA">
<text name="media_label">
Digite um URL ou série de URLs para a lista de domÃnios permitidos
</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_window_size.xml b/indra/newview/skins/default/xui/pt/floater_window_size.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6a8ccbd00249e1c9358acaa9e18b299249a8a8d8
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_window_size.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="window_size" title="TAMANHO DA JANELA">
+ <string name="resolution_format">
+ [RES_X] x [RES_Y]
+ </string>
+ <text name="windowsize_text">
+ Definir tamanho da janela:
+ </text>
+ <combo_box name="window_size_combo" tool_tip="largura x altura">
+ <combo_box.item label="1000 x 700 (padrão)" name="item0"/>
+ <combo_box.item label="1024 x 768" name="item1"/>
+ <combo_box.item label="1280 x 720 (720p)" name="item2"/>
+ <combo_box.item label="1920 x 1080 (1080p)" name="item3"/>
+ </combo_box>
+ <button label="Definir" name="set_btn"/>
+ <button label="Cancelar" name="cancel_btn"/>
+</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 75f9d13ad3aa8b0f4eb5b8d1e946fa06e92b84ac..95bb8990717a55f6c794a410a19d5cc1f7862e23 100644
--- a/indra/newview/skins/default/xui/pt/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/pt/floater_world_map.xml
@@ -8,10 +8,13 @@
<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="person_label">
+ <text name="me_label">
Eu
</text>
<check_box label="Residente" name="people_chk"/>
+ <text name="person_label">
+ Pessoa
+ </text>
<check_box label="Infohub" name="infohub_chk"/>
<text name="infohub_label">
Infohub
@@ -20,9 +23,12 @@
<text name="land_sale_label">
Venda de terreno
</text>
- <text name="auction_label">
+ <text name="by_owner_label">
pelo dono
</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"/>
<text name="Home_label">
Casa
@@ -31,11 +37,17 @@
Eventos:
</text>
<check_box label="PG" name="event_chk"/>
+ <text name="pg_label">
+ Geral
+ </text>
<check_box initial_value="true" 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
+ </text>
</panel>
<panel
name="layout_panel_3">
@@ -53,6 +65,7 @@
</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"/>
<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"/>
diff --git a/indra/newview/skins/default/xui/pt/inspect_avatar.xml b/indra/newview/skins/default/xui/pt/inspect_avatar.xml
index 8f35acf19ecede16b0168ef908b58f8b908a59ad..a74ea15be02999f78265aab63a7f9026f2aa5fa7 100644
--- a/indra/newview/skins/default/xui/pt/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/pt/inspect_avatar.xml
@@ -13,7 +13,7 @@
<slider name="volume_slider" tool_tip="Volume de Voz" value="0.5"/>
<button label="Adicionar amigo" name="add_friend_btn"/>
<button label="MI" name="im_btn"/>
- <button label="Mais" name="view_profile_btn"/>
+ <button label="Perfil" name="view_profile_btn"/>
<panel name="moderator_panel">
<button label="Disabilitar Voz" name="disable_voice"/>
<button label="Habilitar Voz" name="enable_voice"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
index 99d5ae9bec4d9c22a891ae8aabba27bb156ecac0..abbf2e703203855006cef8bbf4f4939a53eeb0b5 100644
--- a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Self Pie">
<menu_item_call label="Ficar de pé" name="Stand Up"/>
- <context_menu label="Tirar >" name="Take Off >">
- <context_menu label="Roupa >" name="Clothes >">
+ <context_menu label="Tirar â–¶" name="Take Off >">
+ <context_menu label="Roupa â–¶" name="Clothes >">
<menu_item_call label="Camisa" name="Shirt"/>
<menu_item_call label="Calças" name="Pants"/>
<menu_item_call label="Saia" name="Skirt"/>
@@ -16,8 +16,8 @@
<menu_item_call label="Alpha" name="Self Alpha"/>
<menu_item_call label="Todas as roupas" name="All Clothes"/>
</context_menu>
- <context_menu label="HUD >" name="Object Detach HUD"/>
- <context_menu label="Tirar >" name="Object Detach"/>
+ <context_menu label="HUD â–¶" name="Object Detach HUD"/>
+ <context_menu label="Tirar â–¶" name="Object Detach"/>
<menu_item_call label="Tirar tudo" name="Detach All"/>
</context_menu>
<menu_item_call label="Minha aparência" name="Appearance..."/>
diff --git a/indra/newview/skins/default/xui/pt/menu_im_well_button.xml b/indra/newview/skins/default/xui/pt/menu_im_well_button.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2d37cefd6fec5f8e3a4b84713252bec4a68a235e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_im_well_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="IM Well Button Context Menu">
+ <menu_item_call label="Fechar tudo" name="Close All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml
index 46c536e64bfec4872fb5a1d38ce51c16d6b298a1..cdd8959cd4b49066d87218b1926c40898508ac37 100644
--- a/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml
@@ -7,6 +7,7 @@
<menu_item_call label="Teletransportar" name="teleport"/>
<menu_item_call label="Convidar para entrar no grupo" name="invite_to_group"/>
<menu_item_call label="Bloquear" name="block"/>
+ <menu_item_call label="Desbloquear" name="unblock"/>
<menu_item_call label="Denunciar" name="report"/>
<menu_item_call label="Congelar" name="freeze"/>
<menu_item_call label="Ejetar" name="eject"/>
@@ -14,4 +15,5 @@
<menu_item_call label="Localizar no mapa" name="find_on_map"/>
<menu_item_call label="Mais zoom" name="zoom_in"/>
<menu_item_call label="Pagar" name="pay"/>
+ <menu_item_call label="Compartilhar" name="share"/>
</menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory.xml b/indra/newview/skins/default/xui/pt/menu_inventory.xml
index de33849d0c11de408326c8706524e849e2dd5b77..8b565b9645b0f80393b61177c0a5932e16164f19 100644
--- a/indra/newview/skins/default/xui/pt/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inventory.xml
@@ -10,7 +10,7 @@
<menu_item_call label="Limpar Achados e perdidos" name="Empty Lost And Found"/>
<menu_item_call label="Nova Pasta" name="New Folder"/>
<menu_item_call label="Novo Script" name="New Script"/>
- <menu_item_call label="Nova Nota" name="New Note"/>
+ <menu_item_call label="Nova anotação" name="New Note"/>
<menu_item_call label="Novo Gesto" name="New Gesture"/>
<menu label="Novas roupas" name="New Clothes">
<menu_item_call label="Nova Camisa" name="New Shirt"/>
@@ -46,9 +46,10 @@
<menu_item_call label="Teletransporte" name="Landmark Open"/>
<menu_item_call label="Abrir" name="Animation Open"/>
<menu_item_call label="Abrir" name="Sound Open"/>
+ <menu_item_call label="Substituir equipamento" name="Replace Outfit"/>
+ <menu_item_call label="Adicionar ao equipamento" name="Add To Outfit"/>
<menu_item_call label="Remover item" name="Purge Item"/>
<menu_item_call label="Restaurar item" name="Restore Item"/>
- <menu_item_call label="Ir para o link" name="Goto Link"/>
<menu_item_call label="Abrir" name="Open"/>
<menu_item_call label="Propriedades" name="Properties"/>
<menu_item_call label="Renomear" name="Rename"/>
@@ -57,13 +58,11 @@
<menu_item_call label="Colar" name="Paste"/>
<menu_item_call label="Colar como link" name="Paste As Link"/>
<menu_item_call label="Apagar" name="Delete"/>
- <menu_item_call label="Remover os itens" name="Take Off Items"/>
- <menu_item_call label="Adicionar ao equipamento" name="Add To Outfit"/>
- <menu_item_call label="Substituir equipamento" name="Replace Outfit"/>
+ <menu_item_call label="Excluir pasta do sistema" name="Delete System Folder"/>
<menu_item_call label="Iniciar conversa em conferência" name="Conference Chat Folder"/>
<menu_item_call label="Executar" name="Sound Play"/>
<menu_item_call label="Sobre o marco" name="About Landmark"/>
- <menu_item_call label="Executar in World" name="Animation Play"/>
+ <menu_item_call label="Tocar inworld" name="Animation Play"/>
<menu_item_call label="Executar localmente" name="Animation Audition"/>
<menu_item_call label="Mandar Mensagem Instantânea" name="Send Instant Message"/>
<menu_item_call label="Oferecer teletransporte..." name="Offer Teleport..."/>
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory_add.xml b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml
index d1bdcd3a8abd5d44a9f7ff59350de599b2608709..81898c63bff9931ae667df359a5da17a3029284a 100644
--- a/indra/newview/skins/default/xui/pt/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml
@@ -8,7 +8,7 @@
</menu>
<menu_item_call label="Nova pasta" name="New Folder"/>
<menu_item_call label="Novo script" name="New Script"/>
- <menu_item_call label="Nova nota" name="New Note"/>
+ <menu_item_call label="Nova anotação" name="New Note"/>
<menu_item_call label="Novo gesto" name="New Gesture"/>
<menu label="Novas roupas" name="New Clothes">
<menu_item_call label="Nova camisa" name="New Shirt"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml
index 3dd5d2c1524d0f64f073d80071995509813ca387..6cc83d11d0f91da18c3cbc144a8207e080dfcc32 100644
--- a/indra/newview/skins/default/xui/pt/menu_login.xml
+++ b/indra/newview/skins/default/xui/pt/menu_login.xml
@@ -21,8 +21,8 @@
</menu>
<menu_item_call label="Mostrar configurações" name="Debug Settings"/>
<menu_item_call label="Configurações da interface e cor" name="UI/Color Settings"/>
- <menu_item_call label="Mostrar bandeja lateral" name="Show Side Tray"/>
<menu label="Testes de UI" name="UI Tests"/>
+ <menu_item_call label="Definir tamanho da janela:" name="Set Window Size..."/>
<menu_item_call label="Mostrar TOS" name="TOS"/>
<menu_item_call label="Mostrar mensagem crÃtica" name="Critical"/>
<menu_item_call label="Teste de navegador web" name="Web Browser Test"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml b/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml
new file mode 100644
index 0000000000000000000000000000000000000000..43ad4134ec114139c73a9e0831d9825c64b7f93a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Notification Well Button Context Menu">
+ <menu_item_call label="Fechar tudo" name="Close All"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_object.xml b/indra/newview/skins/default/xui/pt/menu_object.xml
index 658f44d692129b8233f07485a42b700fc320ad06..5121c9d0484056c5dac77b190c27559b15a1c11d 100644
--- a/indra/newview/skins/default/xui/pt/menu_object.xml
+++ b/indra/newview/skins/default/xui/pt/menu_object.xml
@@ -6,18 +6,20 @@
<menu_item_call label="Abrir" name="Open"/>
<menu_item_call label="Sentar aqui" name="Object Sit"/>
<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">
<menu_item_call label="Vestir" name="Wear"/>
<context_menu label="Anexar >" name="Object Attach"/>
<context_menu label="Anexar o HUD >" name="Object Attach HUD"/>
</context_menu>
<context_menu label="Tirar >" name="Remove">
- <menu_item_call label="Pegar" name="Pie Object Take"/>
<menu_item_call label="Denunciar abuso" name="Report Abuse..."/>
<menu_item_call label="Bloquear" name="Object Mute"/>
<menu_item_call label="Devolver" name="Return..."/>
<menu_item_call label="Excluir" name="Delete"/>
</context_menu>
+ <menu_item_call label="Comprar" name="Pie Object Bye"/>
+ <menu_item_call label="Pegar" name="Pie Object Take"/>
<menu_item_call label="Pegar uma cópia" name="Take Copy"/>
<menu_item_call label="Pagar" name="Pay..."/>
<menu_item_call label="Comprar" name="Buy..."/>
diff --git a/indra/newview/skins/default/xui/pt/menu_participant_list.xml b/indra/newview/skins/default/xui/pt/menu_participant_list.xml
index 6db1fe71054d250764c185c1c2b9ffa8e1192930..849dec3108426c64fdde150c0e9eed22b895f2de 100644
--- a/indra/newview/skins/default/xui/pt/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/pt/menu_participant_list.xml
@@ -1,16 +1,20 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Participant List Context Menu">
+ <menu_item_check label="Ordenar por nome" name="SortByName"/>
+ <menu_item_check label="Ordenar por conversas mais recentes" name="SortByRecentSpeakers"/>
<menu_item_call label="Ver perfil" name="View Profile"/>
<menu_item_call label="Adicionar amigo..." name="Add Friend"/>
<menu_item_call label="MI" name="IM"/>
<menu_item_call label="Ligar" name="Call"/>
<menu_item_call label="Compartilhar" name="Share"/>
<menu_item_call label="Pagar" name="Pay"/>
- <menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/>
- <menu_item_check label="Silenciar texto" name="MuteText"/>
- <menu_item_check label="Pode bater papo por escrito" name="AllowTextChat"/>
- <menu_item_call label="Silenciar este participante" name="ModerateVoiceMuteSelected"/>
- <menu_item_call label="Silenciar os demais" name="ModerateVoiceMuteOthers"/>
- <menu_item_call label="Desfazer silenciar deste participante" name="ModerateVoiceUnMuteSelected"/>
- <menu_item_call label="Desfazer silenciar dos demais" name="ModerateVoiceUnMuteOthers"/>
+ <menu_item_check label="Bloquear voz" name="Block/Unblock"/>
+ <menu_item_check label="Bloquear texto" name="MuteText"/>
+ <context_menu label="Opções do moderador >" name="Moderator Options">
+ <menu_item_check label="Pode bater papo por escrito" name="AllowTextChat"/>
+ <menu_item_call label="Silenciar este participante" name="ModerateVoiceMuteSelected"/>
+ <menu_item_call label="Silenciar os demais" name="ModerateVoiceMuteOthers"/>
+ <menu_item_call label="Desfazer silenciar deste participante" name="ModerateVoiceUnMuteSelected"/>
+ <menu_item_call label="Desfazer silenciar dos demais" name="ModerateVoiceUnMuteOthers"/>
+ </context_menu>
</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups.xml b/indra/newview/skins/default/xui/pt/menu_people_groups.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9a924ad7b93d23e68b284b160d1345d45b4cafad
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_groups.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_group_plus">
+ <menu_item_call label="Ver dados" name="View Info"/>
+ <menu_item_call label="Bate-papo" name="Chat"/>
+ <menu_item_call label="Ligar" name="Call"/>
+ <menu_item_call label="Ativar" name="Activate"/>
+ <menu_item_call label="Sair" name="Leave"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
index eb47f51ed02bedf1dabd88ba34e897f8d9dfda0f..7c720f262bae51f07ac232916877ba5fa0bc3d09 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
@@ -2,9 +2,12 @@
<context_menu name="Avatar Context Menu">
<menu_item_call label="Ver perfil" name="View Profile"/>
<menu_item_call label="Adicionar amigo..." name="Add Friend"/>
+ <menu_item_call label="Remover amigo..." name="Remove Friend"/>
<menu_item_call label="MI" name="IM"/>
<menu_item_call label="Ligar" name="Call"/>
+ <menu_item_call label="Mapa" name="Map"/>
<menu_item_call label="Compartilhar" name="Share"/>
<menu_item_call label="Pagar" name="Pay"/>
<menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/>
+ <menu_item_call label="Teletransportar?" name="teleport"/>
</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
index 855e7c9920c39afa3d03231b380a6ee2d13df3d7..fc08b3accb56c06b995028918698f495ce409f2c 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<context_menu name="Multi-Selected People Context Menu">
<menu_item_call label="Adicionar amigo..." name="Add Friends"/>
+ <menu_item_call label="Remover amigo..." name="Remove Friend"/>
<menu_item_call label="MI" name="IM"/>
<menu_item_call label="Ligar" name="Call"/>
<menu_item_call label="Compartilhar" name="Share"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml b/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml
index b3e09bc69570bd17db780c5f60548d4c0ca750e2..2635182290851d7973706e3396d1849bb429e319 100644
--- a/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml
@@ -2,4 +2,10 @@
<toggleable_menu name="profile_overflow_menu">
<menu_item_call label="Pagar" name="pay"/>
<menu_item_call label="Compartilhar" name="share"/>
+ <menu_item_call label="Bloquear" name="block"/>
+ <menu_item_call label="Desbloquear" name="unblock"/>
+ <menu_item_call label="Chutar" name="kick"/>
+ <menu_item_call label="Congelar" name="freeze"/>
+ <menu_item_call label="Descongelar" name="unfreeze"/>
+ <menu_item_call label="CSR" name="csr"/>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index acadc952ca6995d1bee7951dbf4b830c2c42c412..2b83386cad6530e832395edf3266a3c86b38620c 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -9,8 +9,8 @@
<menu_item_call label="Meu perfil" name="Profile"/>
<menu_item_call label="Minha aparência" name="Appearance"/>
<menu_item_check label="Meu inventário" name="Inventory"/>
- <menu_item_call label="Mostrar inventário na bandeja lateral" name="ShowSidetrayInventory"/>
- <menu_item_call label="Meus gestos" name="Gestures"/>
+ <menu_item_check label="Meu inventário" name="ShowSidetrayInventory"/>
+ <menu_item_check label="Meus gestos" name="Gestures"/>
<menu label="Meu status" name="Status">
<menu_item_call label="Ausente" name="Set Away"/>
<menu_item_call label="Ocupado" name="Set Busy"/>
@@ -24,35 +24,36 @@
<menu_item_call label="Meus grupos" name="My Groups"/>
<menu_item_check label="Bate-papo local" name="Nearby Chat"/>
<menu_item_call label="Pessoas por perto" name="Active Speakers"/>
- <menu_item_check label="MÃdia por perto" name="Nearby Media"/>
</menu>
<menu label="Mundo" name="World">
- <menu_item_check label="Movimentar" name="Movement Controls"/>
- <menu_item_check label="Exibir" name="Camera Controls"/>
- <menu_item_call label="Sobre terrenos" name="About Land"/>
- <menu_item_call label="Região/Propriedade" name="Region/Estate"/>
- <menu_item_call label="Comprar terreno" name="Buy Land"/>
+ <menu_item_check label="Mini Mapa" name="Mini-Map"/>
+ <menu_item_check label="Mapa-múndi" name="World Map"/>
+ <menu_item_call label="Foto" name="Take Snapshot"/>
+ <menu_item_call label="Criar marco deste lugar" name="Create Landmark Here"/>
+ <menu label="Perfil da região" name="Land">
+ <menu_item_call label="Sobre terrenos" name="About Land"/>
+ <menu_item_call label="Região/Propriedade" name="Region/Estate"/>
+ </menu>
+ <menu_item_call label="Comprar este terreno" name="Buy Land"/>
<menu_item_call label="Meus terrenos" name="My Land"/>
- <menu label="Mostrar" name="Land">
+ <menu label="Mostrar" name="LandShow">
+ <menu_item_check label="Controles de movimento" name="Movement Controls"/>
+ <menu_item_check label="Ver controles" name="Camera Controls"/>
<menu_item_check label="Limites" name="Ban Lines"/>
<menu_item_check label="Balizas" name="beacons"/>
<menu_item_check label="Limites do imóvel" name="Property Lines"/>
<menu_item_check label="Proprietários" name="Land Owners"/>
+ <menu_item_check label="Coordenadas" name="Coordinates"/>
+ <menu_item_check label="Propriedades do lote" name="Parcel Properties"/>
</menu>
- <menu label="Marcos" name="Landmarks">
- <menu_item_call label="Colocar marco aqui" name="Create Landmark Here"/>
- <menu_item_call label="Definir como casa" name="Set Home to Here"/>
- </menu>
- <menu_item_call label="InÃcio" name="Teleport Home"/>
- <menu_item_check label="Mini Mapa" name="Mini-Map"/>
- <menu_item_check label="Mapa-múndi" name="World Map"/>
- <menu_item_call label="Foto" name="Take Snapshot"/>
+ <menu_item_call label="Teletransportar para inÃcio" name="Teleport Home"/>
+ <menu_item_call label="Definir como casa" name="Set Home to Here"/>
<menu label="Sol" name="Environment Settings">
<menu_item_call label="Amanhecer" name="Sunrise"/>
<menu_item_call label="Meio-dia" name="Noon"/>
<menu_item_call label="Pôr-do-Sol" name="Sunset"/>
<menu_item_call label="Meia-noite" name="Midnight"/>
- <menu_item_call label="Usar o horário deste lugar" name="Revert to Region Default"/>
+ <menu_item_call label="Horário da propriedade" name="Revert to Region Default"/>
<menu_item_call label="Editor de ambiente" name="Environment Editor"/>
</menu>
</menu>
@@ -78,10 +79,12 @@
</menu>
<menu_item_call label="Link" name="Link"/>
<menu_item_call label="Desconectar links" name="Unlink"/>
+ <menu_item_check label="Edit Linked Parts" name="Edit Linked Parts"/>
<menu_item_call label="Focus on Selection" name="Focus on Selection"/>
<menu_item_call label="Ampliar seleção" name="Zoom to Selection"/>
<menu label="Objeto:" name="Object">
- <menu_item_call label="Comprar" name="Menu Object Take"/>
+ <menu_item_call label="Comprar" name="Menu Object Buy"/>
+ <menu_item_call label="Pegar" name="Menu Object Take"/>
<menu_item_call label="Pegar uma cópia" name="Take Copy"/>
<menu_item_call label="Salvar no meu inventário" name="Save Object Back to My Inventory"/>
<menu_item_call label="Save Back to Object Contents" name="Save Object Back to Object Contents"/>
@@ -94,25 +97,18 @@
<menu_item_call label="Scripts em modo não execução" name="Set Scripts to Not Running"/>
</menu>
<menu label="Opções" name="Options">
- <menu_item_check label="Edit Linked Parts" name="Edit Linked Parts"/>
<menu_item_call label="Set Default Upload Permissions" name="perm prefs"/>
<menu_item_check label="Mostrar permissões avançadas" name="DebugPermissions"/>
- <menu label="Seleção" name="Selection">
- <menu_item_check label="Só selecionar meus objetos" name="Select Only My Objects"/>
- <menu_item_check label="Só selecionar meus objetos" name="Select Only Movable Objects"/>
- <menu_item_check label="Selecionar contornando" name="Select By Surrounding"/>
- </menu>
- <menu label="Mostrar" name="Show">
- <menu_item_check label="Mostrar seleção oculta" name="Show Hidden Selection"/>
- <menu_item_check label="Show Light Radius for Selection" name="Show Light Radius for Selection"/>
- <menu_item_check label="Show Selection Beam" name="Show Selection Beam"/>
- </menu>
- <menu label="Grade" name="Grid">
- <menu_item_check label="Mostrar na grade" name="Snap to Grid"/>
- <menu_item_call label="Snap Object XY to Grid" name="Snap Object XY to Grid"/>
- <menu_item_call label="Use Selection for Grid" name="Use Selection for Grid"/>
- <menu_item_call label="Opções de grade" name="Grid Options"/>
- </menu>
+ <menu_item_check label="Só selecionar meus objetos" name="Select Only My Objects"/>
+ <menu_item_check label="Só selecionar meus objetos" name="Select Only Movable Objects"/>
+ <menu_item_check label="Selecionar contornando" name="Select By Surrounding"/>
+ <menu_item_check label="Mostrar seleção oculta" name="Show Hidden Selection"/>
+ <menu_item_check label="Show Light Radius for Selection" name="Show Light Radius for Selection"/>
+ <menu_item_check label="Show Selection Beam" name="Show Selection Beam"/>
+ <menu_item_check label="Mostrar na grade" name="Snap to Grid"/>
+ <menu_item_call label="Snap Object XY to Grid" name="Snap Object XY to Grid"/>
+ <menu_item_call label="Usar seleção em grade" name="Use Selection for Grid"/>
+ <menu_item_call label="Opções de grade" name="Grid Options"/>
</menu>
<menu label="Selecionar partes conectadas" name="Select Linked Parts">
<menu_item_call label="Select Next Part" name="Select Next Part"/>
@@ -123,15 +119,14 @@
</menu>
<menu label="Ajuda" name="Help">
<menu_item_call label="[SECOND_LIFE] Ajuda" name="Second Life Help"/>
- <menu_item_call label="Tutorial" name="Tutorial"/>
<menu_item_call label="Denunciar abuso" name="Report Abuse"/>
<menu_item_call label="Relatar bug" name="Report Bug"/>
</menu>
<menu label="Avançado" name="Advanced">
- <menu_item_check label="Status 'ausente' em 30 minutos" name="Go Away/AFK When Idle"/>
<menu_item_call label="Parar minha animação" name="Stop Animating My Avatar"/>
<menu_item_call label="Recarregar texturas" name="Rebake Texture"/>
<menu_item_call label="Interface tamanho padrão" name="Set UI Size to Default"/>
+ <menu_item_call label="Definir tamanho da janela:" name="Set Window Size..."/>
<menu_item_check label="Limitar distância da seleção" name="Limit Select Distance"/>
<menu_item_check label="Disable Camera Constraints" name="Disable Camera Distance"/>
<menu_item_check label="Foto de alta resolução" name="HighResSnapshot"/>
@@ -178,8 +173,8 @@
<menu_item_check label="Executar diversas instâncias" name="Run Multiple Threads"/>
<menu_item_call label="Limpar cache de grupo" name="ClearGroupCache"/>
<menu_item_check label="Mouse Smoothing" name="Mouse Smoothing"/>
- <menu_item_check label="Mostrar MIs no bate-papo" name="IMInChat"/>
<menu label="Atalhos" name="Shortcuts">
+ <menu_item_call label="Imagem (L$[COST])..." name="Upload Image"/>
<menu_item_check label="Busca" name="Search"/>
<menu_item_call label="Soltar objeto" name="Release Keys"/>
<menu_item_call label="Interface tamanho padrão" name="Set UI Size to Default"/>
@@ -219,6 +214,7 @@
<menu_item_call label="Region Info to Debug Console" name="Region Info to Debug Console"/>
<menu_item_check label="Câmera:" name="Camera"/>
<menu_item_check label="Vento" name="Wind"/>
+ <menu_item_check label="Crachá" name="Badge"/>
</menu>
<menu label="Show Info" name="Display Info">
<menu_item_check label="Mostrar hora" name="Show Time"/>
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 57130fb5cd7d6b26886b023a299e5ad4831b777a..60113bcf0bb3dbb7566fcc3ef68e03eecf0e2cba 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -11,18 +11,29 @@
</global>
<template name="okbutton">
<form>
- <button name="OK" text="$yestext"/>
+ <button name="OK_okbutton" text="$yestext"/>
+ </form>
+ </template>
+ <template name="okignore">
+ <form>
+ <button name="OK_okignore" text="$yestext"/>
</form>
</template>
- <template name="okignore"/>
<template name="okcancelbuttons">
<form>
- <button name="Cancel" text="$notext"/>
+ <button name="OK_okcancelbuttons" text="$yestext"/>
+ <button name="Cancel_okcancelbuttons" text="$notext"/>
+ </form>
+ </template>
+ <template name="okcancelignore">
+ <form>
+ <button name="OK_okcancelignore" text="$yestext"/>
+ <button name="Cancel_okcancelignore" text="$notext"/>
</form>
</template>
- <template name="okcancelignore"/>
<template name="okhelpbuttons">
<form>
+ <button name="OK_okhelpbuttons" text="$yestext"/>
<button name="Help" text="$helptext"/>
</form>
</template>
@@ -30,6 +41,7 @@
<form>
<button name="Yes" text="$yestext"/>
<button name="No" text="$notext"/>
+ <button name="Cancel_yesnocancelbuttons" text="$canceltext"/>
</form>
</template>
<notification functor="GenericAcknowledge" label="Notificação desconhecida" name="MissingAlert">
@@ -92,15 +104,18 @@ Por favor, selecione apenas um objeto e tente novamente.
Salvar todas as mudanças de roupas/ partes do corpo?
<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Não Salvar" yestext="Salvar tudo"/>
</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"/>
+ </notification>
<notification name="GrantModifyRights">
- Conceder direitos de modificar a outros residentes lhes permite trocar, deletar ou pegar QUAISQUER objetos que você possa ter no mundo.
-Seja MUITO cuidadoso(a) quando passar esta permissão.
-Você deseja conceder direitos de modificar para [FIRST_NAME] [LAST_NAME]?
+ 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.
+Deseja modificar os direitos de modificação de [FIRST_NAME] [LAST_NAME]?
<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
</notification>
<notification name="GrantModifyRightsMultiple">
- Conceder direitos para modificar seus objetos a outro residente permite ele mudar QUAISQUER objetos que você possa ter no mundo. Tenha muito cuidado quando conceder essa permissão.
-Você deseja permitir que os residentes selecionados tenham direito de edição?
+ Conceder direitos de modificação a outros residentes vai autorizá-los a mudar TODOS os seus objetos. Seja MUITO cuidadoso ao conceder esta autorização.
+Deseja conceder direitos de modificação para os residentes selecionados?
<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
</notification>
<notification name="RevokeModifyRights">
@@ -150,14 +165,21 @@ Qualquer membro numa função com esta habilidade, pode atribuir a sà mesmo --
Adicionar esta habilidade a '[ROLE_NAME]'?
<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
</notification>
- <notification name="ClickUnimplemented">
- Infelizmente isso ainda não foi implementado.
+ <notification name="AttachmentDrop">
+ Você está prestes a largar seu anexo.
+ Tem certeza de que quer prosseguir?
+ <usetemplate ignoretext="Confirmar antes de largar anexos" name="okcancelignore" notext="Não" yestext="Sim"/>
</notification>
<notification name="JoinGroupCanAfford">
Unir-se a esse grupo custa L$[COST].
Deseja prosseguir?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Unir-se"/>
</notification>
+ <notification name="JoinGroupNoCost">
+ Você está prestes a entrar no grupo [NAME].
+Deseja continuar?
+ <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Entrar"/>
+ </notification>
<notification name="JoinGroupCannotAfford">
Associar-se a este grupo custa L$[COST].
Você não tem L$ suficientes para associar-se a este grupo.
@@ -322,6 +344,10 @@ Tem certeza de que quer prosseguir?
Salvar as mudanças no classificado [NAME]?
<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Não Salvar" yestext="Salvar"/>
</notification>
+ <notification name="ClassifiedInsufficientFunds">
+ Fundos insuficientes para pagar o anúncio.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="DeleteAvatarPick">
Apagar pegar [PICK]?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Delete"/>
@@ -339,14 +365,6 @@ Tem certeza de que quer prosseguir?
<notification name="SelectHistoryItemToView">
Por favor, selecione um item do histórico para exibÃ-lo.
</notification>
- <notification name="ResetShowNextTimeDialogs">
- Você gostaria de reabilitar todas estas pop ups que você indicou previamente como 'Não me mostrar novamente'?
- <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
- </notification>
- <notification name="SkipShowNextTimeDialogs">
- Você gostaria de desabilitar todas as popups que podem ser puladas?
- <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
- </notification>
<notification name="CacheWillClear">
O cache será limpo quando o [APP_NAME] for iniciado.
</notification>
@@ -422,18 +440,18 @@ O objeto pode estar fora de alcance ou ter sido deletado.
Não foi possÃvel escrever o arquivo [[FILE]]
</notification>
<notification name="UnsupportedHardware">
- Aviso: Seu sistema não é compatÃvel com os requisitos mÃnimos exigidos pelo [APP_NAME]. Se você continuar usando o [APP_NAME] pode experimentar uma performance ruim. Infelizmente não podemos oferecer suporte técnico para configurações de sistema não suportado.
+ 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
-Você deseja visitar [_URL] para maiores informações?
+Consultar [_URL] para mais informações?
<url name="url" option="0">
http://secondlife.com/support/sysreqs.php?lang=pt
</url>
<usetemplate ignoretext="O hardware do meu computador não é suportado" name="okcancelignore" notext="Não" yestext="Sim"/>
</notification>
<notification name="UnknownGPU">
- O [APP_NAME] não consegue reconhecer a placa de vÃdeo do seu computador.
-Isto acontece quando novos hardwares que ainda não foram testados no [APP_NAME]. O [APP_NAME] provavelmente vai funcionar com sua placa de vÃdeo, mas talvez seja necessário checar as configurações de vÃdeo.
+ A placa de vÃdeo do seu sistema não é reconhecida pelo [APP_NAME].
+Isto acontece quando novos hardwares que ainda não foram testados no [APP_NAME]. Talvez isso não cause problemas, mas pode ser preciso checar as configurações de vÃdeo.
( Eu > Preferências > VÃdeo)
<form name="form">
<ignore name="ignore" text="Minha placa de vÃdeo não foi reconhecida."/>
@@ -605,6 +623,10 @@ Por favor tente novamente mais tarde.
<notification name="LandmarkCreated">
Você adicionou "[LANDMARK_NAME]" a sua pasta [FOLDER_NAME].
</notification>
+ <notification name="LandmarkAlreadyExists">
+ Você já tem um marco deste lugar.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="CannotCreateLandmarkNotOwner">
Você não pode criar um ponto de referência porque o proprietário do terreno não permite. Tente novamente a alguns metros de distância.
</notification>
@@ -652,7 +674,7 @@ Pesquisava por: [FINALQUERY]
Os termos de sua pesquisa eram muito curtos então nenhuma pesquisa foi feita.
</notification>
<notification name="CouldNotTeleportReason">
- Não é possÃvel teletransportar-se.
+ O teletransporte falhou.
[REASON]
</notification>
<notification name="invalid_tport">
@@ -701,7 +723,8 @@ Nenhum lote selecionado.
Não é possÃvel exigir a posse do terreno porque a seleção alcançou múltiplas regiões. Por favor, selecione uma área menor e tente novamente.
</notification>
<notification name="ForceOwnerAuctionWarning">
- Este lote está oferecido em leilão. Exigir a posse do terreno irá cancelar o leilão e possivelmente deixará alguns residentes infelizes, se os lances já começaram. Exigir posse?
+ Este lote vai a leilão. Forçar a mudança do dono cancela o leilão, podendo deixar residentes que já deram lances insatisfeitos.
+Deseja forçar mudança de dono?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Retomar"/>
</notification>
<notification name="CannotContentifyNothingSelected">
@@ -749,14 +772,6 @@ Selecionados vários lotes.
Tente selecionar um único lote.
</notification>
- <notification name="ParcelCanPlayMedia">
- Há mÃdia em stream disponÃvel aqui.
-O streaming requer uma conexão rápida.
-
-Executar as mÃdias em stream detectadas?
-(Esta opção pode ser modificada sob Preferências > Privacidade.)
- <usetemplate name="okcancelbuttons" notext="Desabilitar" yestext="Exibir MÃdia"/>
- </notification>
<notification name="CannotDeedLandWaitingForServer">
Impossibilitado de passar a propriedade da terra:
Esperando pelo servidor informar de quem é a propriedade.
@@ -878,9 +893,8 @@ Unir a terra?
Em geral, essa é uma falha técnica temporária. Personalize e volte a salvar o item novamente dentro de alguns minutos.
</notification>
<notification name="YouHaveBeenLoggedOut">
- Você saiu do [SECOND_LIFE]:
+ Ah não! O [SECOND_LIFE] teve de fechar.
[MESSAGE]
-Ainda é possÃvel ler suas MIs e o bate-papo. Para isso, clique 'Ver MIs e bate-papo'. Ou clique em 'Sair' para sair do [APP_NAME] completamente.
<usetemplate name="okcancelbuttons" notext="Sair" yestext="Exibir IM & bate-papo"/>
</notification>
<notification name="OnlyOfficerCanBuyLand">
@@ -1031,6 +1045,7 @@ Transferir propriedade destes [AREA] m² de terreno para o grupo '[GROUP_NA
</notification>
<notification name="ErrorMessage">
[ERROR_MESSAGE]
+ <usetemplate name="okbutton" yestext="OK"/>
</notification>
<notification name="AvatarMovedDesired">
Esse destino não está disponÃvel no momento.
@@ -1304,11 +1319,14 @@ O bate-papo e MIs não serão exibidos. MIs enviadas para você receberão sua
<usetemplate ignoretext="Passar meu status para o modo ocupado" name="okignore" yestext="OK"/>
</notification>
<notification name="JoinedTooManyGroupsMember">
- Você atingiu o limite máximo de grupos. Saia de outro grupo para poder entrar nesse ou recuse o convite.
-[NAME] está te convidando para ser membro do grupo.
-[INVITE]
+ Você atingiu o limite máximo de grupos. Saia de outro grupo para poder entrar nesse ou recuse o convite.
+[NAME] está te convidando para entrar em um grupo.
<usetemplate name="okcancelbuttons" notext="Recusar" yestext="Entrar"/>
</notification>
+ <notification name="JoinedTooManyGroups">
+ Você atingiu o limite máximo de grupos. Sai de um grupo para entrar ou criar outro.
+ <usetemplate name="okbutton" yestext="OK"/>
+ </notification>
<notification name="KickUser">
Expulsar este usuário com qual mensagem?
<form name="form">
@@ -1370,7 +1388,7 @@ O bate-papo e MIs não serão exibidos. MIs enviadas para você receberão sua
</form>
</notification>
<notification name="TeleportFromLandmark">
- Você tem certeza que quer se teletransportar?
+ Tem certeza de quer ser teletransportado para <nolink>[LOCATION]</nolink>?
<usetemplate ignoretext="Confirmar se eu quero ser teletransportado para marcos" name="okcancelignore" notext="Cancelar" yestext="Teletransportar"/>
</notification>
<notification name="TeleportToPick">
@@ -1573,8 +1591,10 @@ Publicar este classificado agora por L$ [AMOUNT]?
</form>
</notification>
<notification label="Modificar a maturidade da Região" name="RegionMaturityChange">
- A classificação de maturidade para esta região foi atualizada.
-Pode levar algum tempo para que a mudança seja refletida no mapa.
+ O conteúdo desta região foi reclassificado.
+Talvez leve algum tempo para a mudança ser refletida no mapa.
+
+Para ir a regiões de conteúdo Adulto, é preciso ter uma conta verificada, seja comprovando a idade ou com dados de pagamento.
</notification>
<notification label="Discordância de Versão de Voz" name="VoiceVersionMismatch">
Esta versão do [APP_NAME] não é compatÃvel com o recurso 'Bate-papo de voz' desta região. Para o bate-papo de voz funcionar, atualize o [APP_NAME].
@@ -1694,7 +1714,7 @@ Mover para o inventário o(s) item(s)?
<notification name="HelpReportAbuseEmailLL">
Use esta ferramenta para denunciar infrações dos [http://secondlife.com/corporate/tos.php Termos do Serviço] e das [http://secondlife.com/corporate/cs.php Normas da Comunidade].
-Todas as denúncias de abuso são investigadas e resolvidas. Para saber o que foi feito, consulte o [http://secondlife.com/support/incidentreport.php relatório de ocorrências].
+Todas as denúncias de abuso são investigadas e resolvidas.
</notification>
<notification name="HelpReportAbuseSelectCategory">
Por favor, selecione uma categoria para a reportagem deste abuso.
@@ -1929,8 +1949,7 @@ Inclua um link para facilitar o acesso para visitantes. Teste o link na barra de
O gesto [NAME] não está no banco de dados.
</notification>
<notification name="UnableToLoadGesture">
- ImpossÃvel de carregar o gesto [NAME].
-Por favor, tente novamente.
+ Falhar ao carregar o gesto [NAME].
</notification>
<notification name="LandmarkMissing">
O landmark foi perdido na base de dados
@@ -2020,8 +2039,8 @@ Basta clicar em qualquer marco e depois clicar em 'Teletransportar' na
(Também é possÃvel clicar duas vezes no marco, ou clicar no marco com o botão direito e selecionar 'Teletransportar'.)
</notification>
<notification name="TeleportToPerson">
- Para entrar em contato com residentes como ''[NAME]', abra o painel 'Pessoas' Ã direita da tela.
-Selecione o residente da lista e clique em 'MI' na parte de baixo do painel.
+ Para entrar em contato com residentes como ''[NAME]', abra o painel 'Pessoas' Ã direita da tela.
+Selecione o residente da lista e clique em 'MI' na parte de baixo do painel.
(Também é possÃvel clicar duas vezes no nome, ou clicar no nome com o botão direito e selecionar 'MI'.)
</notification>
<notification name="CantSelectLandFromMultipleRegions">
@@ -2091,7 +2110,7 @@ Instale o plugin novamente ou contate o fabricante se o problema persistir.
Os objetos no lote selecionado de terra que pertence a [FIRST] [LAST], voltaram ao seu inventário.
</notification>
<notification name="OtherObjectsReturned2">
- Os objetos no lote de terra selecionado que pertence ao residente '[NAME]', voltaram aos seus donos.
+ Os objetos no lote selecionado, do residente [NAME], foram devolidos ao proprietãrio.
</notification>
<notification name="GroupObjectsReturned">
Os objetos no lote selecionado de terreno compartilhado pelo grupo [GROUPNAME], voltaram para os inventários de seus donos.
@@ -2103,7 +2122,7 @@ Objetos não transferÃveis dados ao grupo foram deletados.
</notification>
<notification name="ServerObjectMessage">
Mensagem de [NAME]:
-[MSG]
+<nolink>[MSG]</nolink>
</notification>
<notification name="NotSafe">
A opção 'danos' desta região está ativada.
@@ -2233,9 +2252,9 @@ Por favor, tente novamente em alguns instantes.
[NAME_SLURL] lhe deu [OBJECTTYPE]:
[ITEM_SLURL]
<form name="form">
- <button name="Keep" text="Mantenha"/>
<button name="Show" text="Mostrar"/>
<button name="Discard" text="Descarte"/>
+ <button name="Mute" text="Bloquear"/>
</form>
</notification>
<notification name="GodMessage">
@@ -2260,6 +2279,9 @@ Por favor, tente novamente em alguns instantes.
<button name="Cancel" text="Cancelar"/>
</form>
</notification>
+ <notification name="TeleportOfferSent">
+ Oferta de teletransporte enviada para [TO_NAME]
+ </notification>
<notification name="GotoURL">
[MESSAGE]
[URL]
@@ -2297,9 +2319,15 @@ Por favor, tente novamente em alguns instantes.
<notification name="FriendshipDeclined">
[NAME] recusou seu convite de amizade
</notification>
+ <notification name="FriendshipAcceptedByMe">
+ Oferta de amizada aceita.
+ </notification>
+ <notification name="FriendshipDeclinedByMe">
+ Oferta de amizada aceita.
+ </notification>
<notification name="OfferCallingCard">
- [FIRST] [LAST] está oferecendo seu cartão de visita.
-Isto adicionará uma anotação em seu inventário, de modo que você possa mandar rapidamente uma IM para este residente.
+ [FIRST] [LAST] estão te oferecendo um cartão de visita.
+Ele colocará um item de inventário, para você possa contatá-lo facilmente.
<form name="form">
<button name="Accept" text="Aceitar"/>
<button name="Decline" text="Recusar"/>
@@ -2379,14 +2407,6 @@ Deixar?
<button name="Block" text="Bloquear"/>
</form>
</notification>
- <notification name="FirstBalanceIncrease">
- Você acaba de ganhar L$[AMOUNT].
-Seu saldo em L$ está no canto direito superior.
- </notification>
- <notification name="FirstBalanceDecrease">
- Você acaba de pagar L$[AMOUNT].
-Seu saldo em L$ está no canto direito superior.
- </notification>
<notification name="BuyLindenDollarSuccess">
Obrigado e volte sempre!
@@ -2394,58 +2414,17 @@ Seu saldo L$ será atualizado findo o processamento da transação. Se o proces
Para checar o status do pagamento, consulte seu Histórico de transações no [http://secondlife.com/account/ Painel]
</notification>
- <notification name="FirstSit">
- Você está sentado(a).
-Use as teclas de seta (ou AWSD) para olhar à sua volta.
-Clique o botão 'Ficar de pé' para ficar de pé.
- </notification>
- <notification name="FirstMap">
- Clique a arraste o mapa para olhar à sua volta.
-Clique duas vezes para se teletransportar.
-Use os controles à direita para achar coisas e exibir outros planos de fundo.
- </notification>
- <notification name="FirstBuild">
- Você abriu as Ferramentas de construção. Todos os objetos à sua volta foram criados com essas ferrametnas.
- </notification>
- <notification name="FirstTeleport">
- Você só pode se teletransportar para certas áreas nesta região. A seta aponta o seu destino especÃfico. Clique na seta para ignorá-la.
- </notification>
<notification name="FirstOverrideKeys">
Suas chaves do movimento estão sendo seguras agora por um objeto.
Tente as teclas de setas ou AWSD para ver o que elas fazem.
Alguns objetos (como armas) requerem que você passe para mouselook para usá-los.
Pressione 'M' para fazer isto.
- </notification>
- <notification name="FirstAppearance">
- Você está editando sua aparência.
-Use as teclas de seta para olhar à sua volta.
-Quando terminar, clique em 'Salvar tudo'.
- </notification>
- <notification name="FirstInventory">
- Este é seu inventário, onde ficam todos os seus pertences.
-
-* Para vestir uma peça, arraste-a para o seu corpo.
-* Para fazer rez de um objeto, arraste-o para o chão.
-* Para ler uma anotação, clique duas vezes nela.
</notification>
<notification name="FirstSandbox">
Este é um sandbox, uma área onde residentes podem aprender a construir.
Qualquer objeto deixado aqui será apagado quando você sair. Não se esqueça de clicar duas vezes e selecionar 'Pegar' para levar seu projeto para o seu inventário.
</notification>
- <notification name="FirstFlexible">
- Este objeto é flexÃvel. Flexis devem ser phantom, não fÃsicos.
- </notification>
- <notification name="FirstDebugMenus">
- Você abriu o menu Avançado.
-
-Para alternar este menu,
- Windows Ctrl+Alt+D
- Mac: ⌥⌘D
- </notification>
- <notification name="FirstSculptedPrim">
- Você está editando um prim esculpido. Prims esculpidos requerem uma textura especial para definir o formato.
- </notification>
<notification name="MaxListSelectMessage">
Você pode selecionar até [MAX_SELECT] itens desta lista.
</notification>
@@ -2552,6 +2531,10 @@ Para sua segurança, os SLurls serão bloqueados por alguns instantes.
<button name="respondbutton" text="Responder"/>
</form>
</notification>
+ <notification name="ConfirmCloseAll">
+ Tem certeza de que quer fechar todas as MIs?
+ <usetemplate name="okcancelignore" notext="Cancelar" yestext="OK"/>
+ </notification>
<notification name="AttachmentSaved">
Anexo salvo.
</notification>
diff --git a/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml
index aa8fd0b2d23e672345519b1dddedd65de9beb5e0..bd50d4953d89da041fc8f3e6591e2fa68d1730fb 100644
--- a/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_im_control_panel">
- <panel name="panel_call_buttons">
- <button label="Ligar" name="call_btn"/>
- <button label="Desligar" name="end_call_btn"/>
- <button label="Controles de voz" name="voice_ctrls_btn"/>
- </panel>
+ <layout_stack name="vertical_stack">
+ <layout_panel name="call_btn_panel">
+ <button label="Ligar" name="call_btn"/>
+ </layout_panel>
+ <layout_panel name="end_call_btn_panel">
+ <button label="Desligar" name="end_call_btn"/>
+ </layout_panel>
+ <layout_panel name="voice_ctrls_btn_panel">
+ <button label="Controles de voz" name="voice_ctrls_btn"/>
+ </layout_panel>
+ </layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
index ecaf062e41244e6dcfc725a05240b25463c84f22..06d8823a74e6ddd34a100c55f9eba9bc545d92a1 100644
--- a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
@@ -22,4 +22,5 @@
[COUNT]anos
</string>
<text name="avatar_name" value="Desconhecido"/>
+ <button name="profile_btn" tool_tip="Ver perfil"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_bottomtray.xml b/indra/newview/skins/default/xui/pt/panel_bottomtray.xml
index 2a66620800c0a264959e6c4d59334fbe156be0d6..092135bd4237bd87b00b3c8391f49b488c54d32a 100644
--- a/indra/newview/skins/default/xui/pt/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/pt/panel_bottomtray.xml
@@ -7,8 +7,13 @@
Mostra/oculta os controles de voz
</string>
<layout_stack name="toolbar_stack">
+ <layout_panel name="speak_panel">
+ <talk_button name="talk">
+ <speak_button label="Falar" label_selected="Falar" name="speak_btn"/>
+ </talk_button>
+ </layout_panel>
<layout_panel name="gesture_panel">
- <gesture_combo_box label="Gesto" name="Gesture" tool_tip="Mostra/oculta os gestos"/>
+ <gesture_combo_list label="Gesto" name="Gesture" tool_tip="Mostra/oculta os gestos"/>
</layout_panel>
<layout_panel name="movement_panel">
<button label="Movimentar" name="movement_btn" tool_tip="Mostra/oculta os controles de movimento"/>
@@ -19,5 +24,15 @@
<layout_panel name="snapshot_panel">
<button label="" name="snapshots" tool_tip="Tirar foto"/>
</layout_panel>
+ <layout_panel name="im_well_panel">
+ <chiclet_im_well name="im_well">
+ <button name="Unread IM messages" tool_tip="Conversas"/>
+ </chiclet_im_well>
+ </layout_panel>
+ <layout_panel name="notification_well_panel">
+ <chiclet_notification name="notification_well">
+ <button name="Unread" tool_tip="Notificações"/>
+ </chiclet_notification>
+ </layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml
new file mode 100644
index 0000000000000000000000000000000000000000..78d982609999c144fc9d5ef0f5b946c2ca41cc19
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="bottom_tray_lite">
+ <layout_stack name="toolbar_stack_lite">
+ <layout_panel name="gesture_panel">
+ <gesture_combo_list label="Gesto" name="Gesture" tool_tip="Mostra/oculta os gestos"/>
+ </layout_panel>
+ </layout_stack>
+</panel>
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 6f48a361827eca5fb820b32001e1abaf2b30bd5c..8441cd99139567ebd1edc9a327f32a8fb949b808 100644
--- a/indra/newview/skins/default/xui/pt/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/pt/panel_classified_info.xml
@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_classified_info">
+ <panel.string name="l$_price">
+ L$ [PRICE]
+ </panel.string>
<text name="title" value="Dados do anúncio"/>
<scroll_container name="profile_scroll">
<panel name="scroll_content_panel">
- <text name="classified_name" value="[nome]"/>
- <text name="classified_location" value="[carregando...]"/>
- <text name="content_type" value="[content type]"/>
- <text name="category" value="[category]"/>
+ <text_editor name="classified_name" value="[nome]"/>
+ <text_editor name="classified_location" value="[carregando...]"/>
+ <text_editor name="content_type" value="[content type]"/>
+ <text_editor name="category" value="[category]"/>
<check_box label="Renovar automaticamente todas as semanas" name="auto_renew"/>
- <text name="price_for_listing" tool_tip="Preço do anúncio.">
- L$ [PRICE]
- </text>
- <text name="classified_desc" value="[descrição]"/>
+ <text_editor name="price_for_listing" tool_tip="Preço do anúncio."/>
+ <text_editor name="classified_desc" value="[descrição]"/>
</panel>
</scroll_container>
<panel name="buttons">
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
index d7e7d30a73641a35ae0b0dc2b654ef6294a7b6f3..c9e5513424402272f1dea886c34873db0f6f394c 100644
--- a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
@@ -34,9 +34,12 @@
</text>
<check_box label="Mostrar nos resultados de busca" name="show_in_search_checkbox"/>
<text name="title_acc_status_text" value="Minha conta:"/>
+ <text_editor name="acc_status_text" value="Residente. Dados de pagamento: não constam"/>
<text name="my_account_link" value="[[URL] Abrir meu painel]"/>
- <text name="acc_status_text" value="Residente. Dados de pagamento: não constam"/>
<text name="title_partner_text" value="Parceiro(a):"/>
+ <panel name="partner_data_panel">
+ <name_box initial_value="(pesquisando)" name="partner_text"/>
+ </panel>
<text name="partner_edit_link" value="[[URL] Editar]"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_friends.xml b/indra/newview/skins/default/xui/pt/panel_friends.xml
index 1bf79868251846696255ca06501cac0ade76831d..34073f9ce1c9589227d213e5fb5463130b5cc352 100644
--- a/indra/newview/skins/default/xui/pt/panel_friends.xml
+++ b/indra/newview/skins/default/xui/pt/panel_friends.xml
@@ -16,5 +16,5 @@
<button label="Teletransportar" name="offer_teleport_btn" tool_tip="Oferecer a este amigo o teletransporte para sua localização atual" width="86"/>
<button label="Pagar" name="pay_btn" tool_tip="Dar Linden dólares (L$) a este amigo" width="86"/>
<button label="Tirar" name="remove_btn" tool_tip="Remover esta pessoa de sua lista de amigos" width="86"/>
- <button label="Adicionar" name="add_btn" tool_tip="Oferecer amizade a um residente" width="86"/>
+ <button label="Adicionar" name="add_btn" tool_tip="Oferecer amizade para um residente" width="86"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml
index 9dc53d54eb763447e01284017a2f7a198cd39d5f..502dae8d670e14961e1aaba8434cc3f336ca0591 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml
@@ -1,9 +1,17 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_im_control_panel">
- <button label="Perfil do grupo" name="group_info_btn"/>
- <panel name="panel_call_buttons">
- <button label="Ligar para o grupo" name="call_btn"/>
- <button label="Desligar" name="end_call_btn"/>
- <button label="Abrir controles de voz" name="voice_ctrls_btn"/>
- </panel>
+ <layout_stack name="vertical_stack">
+ <layout_panel name="group_info_btn_panel">
+ <button label="Perfil do grupo" name="group_info_btn"/>
+ </layout_panel>
+ <layout_panel name="call_btn_panel">
+ <button label="Ligar para o grupo" name="call_btn"/>
+ </layout_panel>
+ <layout_panel name="end_call_btn_panel">
+ <button label="Desligar" name="end_call_btn"/>
+ </layout_panel>
+ <layout_panel name="voice_ctrls_btn_panel">
+ <button label="Abrir controles de voz" name="voice_ctrls_btn"/>
+ </layout_panel>
+ </layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_general.xml b/indra/newview/skins/default/xui/pt/panel_group_general.xml
index 6ff4f82ba7cbe4d00a0cdf4b1f44fa366b6ba504..85488f43af33935067603fdb750e5d6d011b7f73 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_general.xml
@@ -11,13 +11,28 @@ Para obter mais ajuda, passe o mouse sobre as opções.
<panel.string name="incomplete_member_data_str">
Recuperando dados do membro
</panel.string>
+ <panel name="group_info_top">
+ <texture_picker label="" name="insignia" tool_tip="Selecionar imagem"/>
+ <text name="prepend_founded_by">
+ Fundador:
+ </text>
+ <name_box initial_value="(pesquisando)" name="founder_name"/>
+ <text name="join_cost_text">
+ Grátis
+ </text>
+ <button label="ENTRAR AGORA!" name="btn_join"/>
+ </panel>
<text_editor name="charter">
Declaração do grupo
</text_editor>
<name_list name="visible_members">
<name_list.columns label="Membro" name="name"/>
<name_list.columns label="TÃtulo" name="title"/>
+ <name_list.columns label="Status" name="status"/>
</name_list>
+ <text name="my_group_settngs_label">
+ Eu
+ </text>
<text name="active_title_label">
Meu cargo
</text>
@@ -25,8 +40,11 @@ Para obter mais ajuda, passe o mouse sobre as opções.
<check_box label="Receber avisos do grupo" name="receive_notices" tool_tip="Define o seu recebimento de avisos deste grupo. Desmarque esta opção se o grupo envia spam."/>
<check_box label="Mostrar no meu perfil" name="list_groups_in_profile" tool_tip="Define se você deseja incluir este grupo no seu perfil."/>
<panel name="preferences_container">
- <check_box label="Adesão aberta" name="open_enrollement" tool_tip="Controla a entrada de novos membros, com ou sem convite."/>
- <check_box label="Taxa de associação" name="check_enrollment_fee" tool_tip="Controla a cobrança de uma taxa de associação ao grupo."/>
+ <text name="group_settngs_label">
+ Grupo
+ </text>
+ <check_box label="Qualquer um pode entrar" name="open_enrollement" tool_tip="Controla a entrada de novos membros, com ou sem convite."/>
+ <check_box label="Taxa de inscrição" name="check_enrollment_fee" tool_tip="Controla a cobrança de uma taxa de associação ao grupo."/>
<spinner label="L$" left_delta="120" name="spin_enrollment_fee" tool_tip="Se a opção 'Taxa de associação' estiver marcada, novos membros precisam pagar o valor definido para entrar no grupo." width="60"/>
<combo_box name="group_mature_check" tool_tip="Define se a informação do seu grupo é considerada mature." width="170">
<combo_box.item label="Conteúdo PG" name="pg"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml
index c547e4c64637ce99ad4a1f19f2b28f0cf782f378..29d757346cccee4b7f65e5bd718837f38629ae77 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Sobre o grupo" name="GroupInfo">
+<panel label="Perfil do grupo" name="GroupInfo">
<panel.string name="default_needs_apply_text">
- As mudanças feitas nesta guia ainda não foram salvas
+ Algumas modificações não foram salvas
</panel.string>
<panel.string name="want_apply_text">
Deseja salvar essas mudanças?
@@ -12,25 +12,24 @@
<panel.string name="group_join_free">
Grátis
</panel.string>
- <text name="group_name" value="Carregando..."/>
- <line_editor label="Digite o nome do grupo aqui" name="group_name_editor"/>
- <texture_picker label="" name="insignia" tool_tip="Selecionar imagem"/>
- <text name="prepend_founded_by">
- Fundador:
- </text>
- <name_box initial_value="(pesquisando)" name="founder_name"/>
- <text name="join_cost_text">
- Grátis
- </text>
- <button label="ENTRAR AGORA!" name="btn_join"/>
- <accordion name="groups_accordion">
- <accordion_tab name="group_general_tab" title="Público geral"/>
- <accordion_tab name="group_roles_tab" title="Cargos"/>
- <accordion_tab name="group_notices_tab" title="Avisos"/>
- <accordion_tab name="group_land_tab" title="Terrenos/Bens"/>
- </accordion>
- <panel name="button_row">
- <button label="Crie" label_selected="Novo grupo" name="btn_create"/>
- <button label="Salvar" label_selected="Salvar" name="btn_apply"/>
+ <panel name="group_info_top">
+ <text name="group_name" value="Carregando..."/>
+ <line_editor label="Digite o nome do grupo novo aqui" name="group_name_editor"/>
</panel>
+ <layout_stack name="layout">
+ <layout_panel name="group_accordions">
+ <accordion name="groups_accordion">
+ <accordion_tab name="group_general_tab" title="Geral"/>
+ <accordion_tab name="group_roles_tab" title="Cargos"/>
+ <accordion_tab name="group_notices_tab" title="Avisos"/>
+ <accordion_tab name="group_land_tab" title="Terrenos/Bens"/>
+ </accordion>
+ </layout_panel>
+ <layout_panel name="button_row">
+ <button label="Bate-papo" name="btn_chat"/>
+ <button label="Ligar para o grupo" name="btn_call" tool_tip="Ligar para este grupo"/>
+ <button label="Salvar" label_selected="Salvar" name="btn_apply"/>
+ <button label="Criar grupo" name="btn_create" tool_tip="Criar um grupo novo"/>
+ </layout_panel>
+ </layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_invite.xml b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
index 4ed1b950a4c2b9c5b30f1808c90ce665e72b7be6..c7def0ed96f5a0041d41350d7d8b768adf32272f 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
@@ -7,12 +7,10 @@
(carregando...)
</panel.string>
<panel.string name="already_in_group">
- Alguns avatares já estão nesse grupo e portanto não foram convidados.
+ Alguns dos residentes selecionados já estão no grupo, portanto não receberam convite.
</panel.string>
<text name="help_text" width="214">
- Voce pode selecionar vários residentes
-para convidar ao seu grupo. Clique
-'Abrir Seletor de Residente' para iniciar.
+ Selecione um ou mais residentes para convidar. Clique em 'Abrir seletor de residentes' para começar.
</text>
<button label="Abrir Seletor de Residente" name="add_button" tool_tip=""/>
<name_list name="invitee_list" tool_tip="Pressione Ctrl enquanto clica nos nomes dos residentes"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
index aa7c7de75f656ff9bd2a55114549c02b21aab1a2..6f21b78b10786b366a1fe28f4d42be38ea80368d 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
@@ -1,64 +1,62 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Terra & L$" name="land_money_tab">
- <string name="help_text">
+ <panel.string name="help_text">
Será exibido um aviso até o Total de terrenos usados for igual ou inferior à contribuição total.
- </string>
- <button label="?" name="help_button"/>
- <string name="cant_view_group_land_text">
+ </panel.string>
+ <panel.string name="cant_view_group_land_text">
Você não está autorizado a acessar terrenos de grupos
- </string>
- <string name="cant_view_group_accounting_text">
+ </panel.string>
+ <panel.string name="cant_view_group_accounting_text">
Você não está autorizado a acessar os dados de contabilidade do grupo.
- </string>
- <string name="loading_txt">
+ </panel.string>
+ <panel.string name="loading_txt">
Carregando...
- </string>
- <text name="group_land_heading" width="250">
- Terra percentente ao grupo
- </text>
- <scroll_list name="group_parcel_list">
- <column label="Lote" name="name"/>
- <column label="Região" name="location"/>
- <column label="Tipo" name="type"/>
- <column label="Ãrea" name="area"/>
- </scroll_list>
- <button label="Mapa" label_selected="Mapa" left="282" name="map_button" width="130"/>
- <text name="total_contributed_land_label">
- Total contribuÃdo:
- </text>
- <text name="total_contributed_land_value">
- [AREA] m²
- </text>
- <text name="total_land_in_use_label">
- Total em uso:
- </text>
- <text name="total_land_in_use_value">
- [AREA] m²
- </text>
- <text name="land_available_label">
- DisponÃveis:
- </text>
- <text name="land_available_value">
- [AREA] m²
- </text>
- <text name="your_contribution_label">
- Sua contribuição:
- </text>
- <string name="land_contrib_error">
+ </panel.string>
+ <panel.string name="land_contrib_error">
Não foi possÃvel definir sua contribuição
- </string>
- <text name="your_contribution_units">
- m²
- </text>
- <text name="your_contribution_max_value">
- ([AMOUNT] max)
- </text>
- <text name="group_over_limit_text">
- O terreno em uso requer mais créditos
- </text>
- <text name="group_money_heading">
- Grupo L$
- </text>
+ </panel.string>
+ <panel name="layout_panel_landmoney">
+ <scroll_list name="group_parcel_list">
+ <scroll_list.columns label="Lote" name="name"/>
+ <scroll_list.columns label="Região" name="location"/>
+ <scroll_list.columns label="Tipo" name="type"/>
+ <scroll_list.columns label="Ãrea:" name="area"/>
+ </scroll_list>
+ <text name="total_contributed_land_label">
+ Total contribuÃdo:
+ </text>
+ <text name="total_contributed_land_value">
+ [AREA] m²
+ </text>
+ <button label="Mapa" label_selected="Mapa" name="map_button"/>
+ <text name="total_land_in_use_label">
+ Total em uso:
+ </text>
+ <text name="total_land_in_use_value">
+ [AREA] m²
+ </text>
+ <text name="land_available_label">
+ DisponÃveis:
+ </text>
+ <text name="land_available_value">
+ [AREA] m²
+ </text>
+ <text name="your_contribution_label">
+ Sua contribuição:
+ </text>
+ <text name="your_contribution_units">
+ m²
+ </text>
+ <text name="your_contribution_max_value">
+ ([AMOUNT] max)
+ </text>
+ <text name="group_over_limit_text">
+ O terreno em uso requer mais créditos
+ </text>
+ <text name="group_money_heading">
+ L$ do grupo
+ </text>
+ </panel>
<tab_container name="group_money_tab_container">
<panel label="PLANEJAMENTO" name="group_money_planning_tab">
<text_editor name="group_money_planning_text">
diff --git a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
index c9fd7cdfe3f6889a035a3a9e67f117c7c5f1515a..19c34d2f103c14f1c39ed1123f2fb0494eab97fe 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="group_list_item">
<text name="group_name" value="Desconhecido"/>
+ <button name="profile_btn" tool_tip="Ver perfil"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_notices.xml b/indra/newview/skins/default/xui/pt/panel_group_notices.xml
index 66252a0473696dad934be5f18a52291f21245534..2abc8bc7c8690a3a8a97f63ca47e9edb58a93100 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_notices.xml
@@ -39,7 +39,7 @@ Cada grupo pode enviar no máximo 200 avisos/dia
<text name="string">
Arrastar e soltar o item aqui para anexá-lo:
</text>
- <button label="Tirar" label_selected="Remover o anexo" name="remove_attachment"/>
+ <button label="Tirar" label_selected="Remover o anexo" name="remove_attachment" tool_tip="Remover anexo da notificação."/>
<button label="Enviar" label_selected="Enviar" name="send_notice"/>
<group_drop_target name="drop_target" tool_tip="Arrastar um item do inventário para a caixa para enviá-lo com o aviso. É preciso ter autorização de cópia e transferência do item para anexá-lo ao aviso."/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_roles.xml b/indra/newview/skins/default/xui/pt/panel_group_roles.xml
index cf9e9f2b8dcd56bf5d650e31ef6352fff3fa618d..9c3792ec433403ef2c493e98457381e36697de35 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_roles.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Membros e Funções" name="roles_tab">
<panel.string name="default_needs_apply_text">
- As mudanças feitas nesta guia ainda não foram salvas
+ Algumas modificações não foram salvas
</panel.string>
<panel.string name="want_apply_text">
Deseja salvar essas mudanças?
@@ -52,7 +52,7 @@ Há uma grande variedade de habilidades.
</tab_container>
<panel name="members_footer">
<text name="static">
- Membros atribuÃdos
+ Cargos desempenhados
</text>
<text name="static2">
Habilidades permitidas
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 f7102f2fb2461430dbb14fc0ba67f0c2a4cc1b38..11e1ba0039dded15de87f4eb19c61f250251bfb4 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
@@ -1,13 +1,29 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_im_control_panel">
- <text name="avatar_name" value="Desconhecido"/>
- <button label="Perfil" name="view_profile_btn"/>
- <button label="Adicionar amigo" name="add_friend_btn"/>
- <button label="Teletransportar" name="teleport_btn"/>
- <button label="Compartilhar" name="share_btn"/>
- <panel name="panel_call_buttons">
- <button label="Ligar" name="call_btn"/>
- <button label="Desligar" name="end_call_btn"/>
- <button label="Controles de voz" name="voice_ctrls_btn"/>
- </panel>
+ <layout_stack name="button_stack">
+ <layout_panel name="view_profile_btn_panel">
+ <button label="Perfil" name="view_profile_btn"/>
+ </layout_panel>
+ <layout_panel name="add_friend_btn_panel">
+ <button label="Adicionar amigo" name="add_friend_btn"/>
+ </layout_panel>
+ <layout_panel name="teleport_btn_panel">
+ <button label="Teletransportar" name="teleport_btn" tool_tip="Oferecer teletransporte"/>
+ </layout_panel>
+ <layout_panel name="share_btn_panel">
+ <button label="Compartilhar" name="share_btn"/>
+ </layout_panel>
+ <layout_panel name="share_btn_panel">
+ <button label="Pagar" name="pay_btn"/>
+ </layout_panel>
+ <layout_panel name="call_btn_panel">
+ <button label="Ligar" name="call_btn"/>
+ </layout_panel>
+ <layout_panel name="end_call_btn_panel">
+ <button label="Desligar" name="end_call_btn"/>
+ </layout_panel>
+ <layout_panel name="voice_ctrls_btn_panel">
+ <button label="Controles de voz" name="voice_ctrls_btn"/>
+ </layout_panel>
+ </layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_landmark_info.xml b/indra/newview/skins/default/xui/pt/panel_landmark_info.xml
index 97e7f51beb9f09c7ea316e70c9f0d520203099eb..6196c06d09dd0510d86fd571d28cb8a0cba1effa 100644
--- a/indra/newview/skins/default/xui/pt/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/pt/panel_landmark_info.xml
@@ -18,6 +18,7 @@
<string name="acquired_date">
[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
</string>
+ <button name="back_btn" tool_tip="Atrás"/>
<text name="title" value="Perfil do Lugar"/>
<scroll_container name="place_scroll">
<panel name="scrolling_panel">
diff --git a/indra/newview/skins/default/xui/pt/panel_landmarks.xml b/indra/newview/skins/default/xui/pt/panel_landmarks.xml
index 693905e04cb19ec9c7ea3e06058b2331d6f659de..3f357bcefe168295651c636077627c927e48c92f 100644
--- a/indra/newview/skins/default/xui/pt/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/pt/panel_landmarks.xml
@@ -2,7 +2,7 @@
<panel name="Landmarks">
<accordion name="landmarks_accordion">
<accordion_tab name="tab_favorites" title="Barra 'Destaques'"/>
- <accordion_tab name="tab_landmarks" title="Marcos"/>
+ <accordion_tab name="tab_landmarks" title="Meus marcos"/>
<accordion_tab name="tab_inventory" title="Meu inventário"/>
<accordion_tab name="tab_library" title="Biblioteca"/>
</accordion>
diff --git a/indra/newview/skins/default/xui/pt/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml
index 3540a338ea8c5bec8473f77adf2c3d2239748967..415451b49fd0d99aca5de5fbe21a93925fee3248 100644
--- a/indra/newview/skins/default/xui/pt/panel_login.xml
+++ b/indra/newview/skins/default/xui/pt/panel_login.xml
@@ -13,7 +13,7 @@
</text>
<line_editor label="Nome" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/>
<line_editor label="Sobrenome" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/>
- <check_box label="Lembrar" name="remember_check"/>
+ <check_box label="Lembrar senha" name="remember_check"/>
<text name="start_location_text">
Começar em:
</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
index 1bc080886de5c7c31e329ff3732f45da84f4077d..f64b9f319f0dbaf98f115c40246123a21055b007 100644
--- a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
@@ -32,7 +32,7 @@
<menu label="Crie" name="Create">
<menu_item_call label="Nova pasta" name="New Folder"/>
<menu_item_call label="Novo script" name="New Script"/>
- <menu_item_call label="Nova nota" name="New Note"/>
+ <menu_item_call label="Nova anotação" name="New Note"/>
<menu_item_call label="Novo gesto" name="New Gesture"/>
<menu label="Novas roupas" name="New Clothes">
<menu_item_call label="Nova camisa" name="New Shirt"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_me.xml b/indra/newview/skins/default/xui/pt/panel_me.xml
index c3fda2e8863224ace471925a8f8cc70dafa06cf6..412f75ca78e7477b013b5effbab7eddfbe47fb98 100644
--- a/indra/newview/skins/default/xui/pt/panel_me.xml
+++ b/indra/newview/skins/default/xui/pt/panel_me.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Meu perfil" name="panel_me">
<tab_container name="tabs">
- <panel label="PERFIL" name="panel_profile"/>
- <panel label="DESTAQUES" name="panel_picks"/>
+ <panel label="MEU PERFIL" name="panel_profile"/>
+ <panel label="MEUS DESTAQUES" name="panel_picks"/>
</tab_container>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml
index adc93cc2f095b54837bfb0b2e00b952a85c117b1..646969946c2a523f99b8efc994886cc4c1c294f9 100644
--- a/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Segurança" name="Media Settings Security">
- <check_box initial_value="false" label="Acesso restrito a URLs especificados (pelo prefixo)" name="whitelist_enable"/>
+ <check_box initial_value="false" label="Acesso permitido a URLs com padrão especÃfico" name="whitelist_enable"/>
<text name="home_url_fails_some_items_in_whitelist">
URLs com falha de acesso na página inicial são indicados com um:
</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_my_profile.xml b/indra/newview/skins/default/xui/pt/panel_my_profile.xml
index 8fd30873a7a1631af5d1d679705b003bf7e5b3a4..b1ca318addb3c3efc2bdd3ae9bc46725db356994 100644
--- a/indra/newview/skins/default/xui/pt/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/pt/panel_my_profile.xml
@@ -1,37 +1,35 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Perfil" name="panel_profile">
<string name="no_partner_text" value="Nenhum"/>
+ <string name="no_group_text" value="Nenhum"/>
<string name="RegisterDateFormat">
[REG_DATE] ([AGE])
</string>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="second_life_image_panel">
- <icon label="" name="2nd_life_edit_icon" tool_tip="Clique no botão Editar para trocar a imagem"/>
- </panel>
- <panel name="first_life_image_panel">
- <icon label="" name="real_world_edit_icon" tool_tip="Clique no botão Editar para trocar a imagem"/>
- <text name="title_rw_descr_text" value="Mundo real:"/>
- </panel>
- <text name="me_homepage_text">
- Página web:
- </text>
- <text name="title_member_text" value="Membro desde:"/>
- <text name="title_acc_status_text" value="Conta:"/>
- <text name="acc_status_text" value="Residente. Dados de pagamento: não constam"/>
- <text name="title_partner_text" value="Parceiro(a):"/>
- <text name="title_groups_text" value="Grupos:"/>
- </panel>
- </scroll_container>
- <panel name="profile_buttons_panel">
- <button label="Adicionar amigo" name="add_friend"/>
- <button label="MI" name="im"/>
- <button label="Ligar" name="call"/>
- <button label="Mapa" name="show_on_map_btn"/>
- <button label="Teletransportar" name="teleport"/>
- </panel>
- <panel name="profile_me_buttons_panel">
- <button label="Editar perfil" name="edit_profile_btn" tool_tip="Editar dados pessoais"/>
- <button label="Editar aparência" name="edit_appearance_btn" tool_tip="Criar/editar aparência: corpo, roupa, etc."/>
- </panel>
+ <layout_stack name="layout">
+ <layout_panel name="profile_stack">
+ <scroll_container name="profile_scroll">
+ <panel name="scroll_content_panel">
+ <panel name="second_life_image_panel">
+ <icon label="" name="2nd_life_edit_icon" tool_tip="Clique no botão Editar para trocar a imagem"/>
+ <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
+ </panel>
+ <panel name="first_life_image_panel">
+ <icon label="" name="real_world_edit_icon" tool_tip="Clique no botão Editar para trocar a imagem"/>
+ <text name="title_rw_descr_text" value="Mundo real:"/>
+ </panel>
+ <text name="title_member_text" value="Residente desde:"/>
+ <text name="title_acc_status_text" value="Conta:"/>
+ <text name="title_partner_text" value="Parceiro(a):"/>
+ <panel name="partner_data_panel">
+ <name_box initial_value="(pesquisando)" name="partner_text"/>
+ </panel>
+ <text name="title_groups_text" value="Grupos:"/>
+ </panel>
+ </scroll_container>
+ </layout_panel>
+ <layout_panel name="profile_me_buttons_panel">
+ <button label="Editar perfil" name="edit_profile_btn" tool_tip="Editar dados pessoais"/>
+ <button label="Editar aparência" name="edit_appearance_btn" tool_tip="Criar/editar aparência: fÃsico, roupas, etc."/>
+ </layout_panel>
+ </layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml b/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml
index 49e1d916c76b43d302f1f7e5f5343c007febd0d6..511c4426bbb23a4ad592a40cbea3e462436c1b23 100644
--- a/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml
@@ -1,15 +1,18 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="navigation_bar">
<panel name="navigation_panel">
- <button name="back_btn" tool_tip="Voltar para região anterior"/>
- <button name="forward_btn" tool_tip="Avançar uma região"/>
+ <pull_button name="back_btn" tool_tip="Voltar para região anterior"/>
+ <pull_button name="forward_btn" tool_tip="Avançar uma região"/>
<button name="home_btn" tool_tip="Teletransportar para minha casa"/>
<location_input label="Onde" name="location_combo"/>
<search_combo_box label="Busca" name="search_combo_box" tool_tip="Busca">
<combo_editor label="Buscar no [SECOND_LIFE]" name="search_combo_editor"/>
</search_combo_box>
</panel>
- <favorites_bar name="favorite">
+ <favorites_bar name="favorite" tool_tip="Arraste marcos para cá para acessar seus lugares preferidos do Second Life!">
+ <label name="favorites_bar_label" tool_tip="Arraste marcos para cá para acessar seus lugares preferidos do Second Life!">
+ Barra Destaques
+ </label>
<chevron_button name=">>" tool_tip="Mostrar mais favoritos"/>
</favorites_bar>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_media.xml b/indra/newview/skins/default/xui/pt/panel_nearby_media.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a81d3e19f88dcdf8b98a9261c6ec775017694059
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_nearby_media.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="nearby_media">
+ <string name="empty_item_text">
+ <vazio>
+ </string>
+ <string name="parcel_media_name">
+ MÃdia em stream deste lote
+ </string>
+ <string name="parcel_audio_name">
+ Ãudio em stream do lote
+ </string>
+ <string name="playing_suffix">
+ (em execução)
+ </string>
+ <panel name="minimized_controls">
+ <button label="Parar tudo" name="all_nearby_media_disable_btn" tool_tip="Desligar mÃdias por perto"/>
+ <button label="Executar tudo" name="all_nearby_media_enable_btn" tool_tip="Ligar mÃdias por perto"/>
+ <button name="open_prefs_btn" tool_tip="Preferências de mÃdia"/>
+ <button label="Mais >>" label_selected="Menos <<" name="more_less_btn" tool_tip="Controles avançados"/>
+ </panel>
+ <panel name="nearby_media_panel">
+ <combo_box name="show_combo">
+ <combo_box.item label="Tudo" name="All"/>
+ <combo_box.item label="Neste lote" name="WithinParcel"/>
+ <combo_box.item label="Fora deste lote" name="OutsideParcel"/>
+ </combo_box>
+ <scroll_list name="media_list">
+ <scroll_list.columns label="Proximidade" name="media_proximity"/>
+ <scroll_list.columns label="VisÃveis" name="media_visibility"/>
+ <scroll_list.columns label="Classe" name="media_class"/>
+ <scroll_list.columns label="Nome" name="media_name"/>
+ <scroll_list.columns label="Depurar" name="media_debug"/>
+ </scroll_list>
+ <panel>
+ <layout_stack name="media_controls">
+ <layout_panel name="stop">
+ <button name="stop_btn" tool_tip="Para mÃdia selecionada"/>
+ </layout_panel>
+ <layout_panel name="play">
+ <button name="play_btn" tool_tip="Tocar mÃdia selecionada"/>
+ </layout_panel>
+ <layout_panel name="pause">
+ <button name="pause_btn" tool_tip="Pausar mÃdia selecionada"/>
+ </layout_panel>
+ <layout_panel name="volume_slider_ctrl">
+ <slider_bar initial_value="0.5" name="volume_slider" tool_tip="Volume da mÃdia selecionada"/>
+ </layout_panel>
+ <layout_panel name="mute">
+ <button name="mute_btn" tool_tip="Silenciar mÃdia selecionada"/>
+ </layout_panel>
+ <layout_panel name="zoom">
+ <button name="zoom_btn" tool_tip="Enfocar mÃdia"/>
+ </layout_panel>
+ <layout_panel name="unzoom">
+ <button name="unzoom_btn" tool_tip="Desenfocar mÃdia selecionada"/>
+ </layout_panel>
+ </layout_stack>
+ </panel>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_notes.xml b/indra/newview/skins/default/xui/pt/panel_notes.xml
index a5b2542e779d90fe6be60ba3e691ab028597c053..9aa842d9a5c5624b3c1032c833ed63c9f666078a 100644
--- a/indra/newview/skins/default/xui/pt/panel_notes.xml
+++ b/indra/newview/skins/default/xui/pt/panel_notes.xml
@@ -13,7 +13,7 @@
</scroll_container>
</panel>
<panel name="notes_buttons_panel">
- <button label="Adicionar" name="add_friend" tool_tip="Oferecer amizade ao residente"/>
+ <button label="Adicionar amigo" name="add_friend" tool_tip="Oferecer amizade ao residente"/>
<button label="MI" name="im" tool_tip="Abrir sessão de mensagem instantânea"/>
<button label="Ligar" name="call" tool_tip="Ligar para este residente"/>
<button label="Mapa" name="show_on_map_btn" tool_tip="Exibir o residente no mapa"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_online_status.xml b/indra/newview/skins/default/xui/pt/panel_online_status.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fdc489f375ec6eabd344b633f4fb6eb00c3ccef3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_online_status.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="friend_online_status" name="friend_online_status"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml b/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fdc489f375ec6eabd344b633f4fb6eb00c3ccef3
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="friend_online_status" name="friend_online_status"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml
index 98a9be29c88d592501480944709b2a4d8c537e93..8d648a98fab7572e821864d829fbc056b1b60d89 100644
--- a/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="Outfits">
- <accordion name="outfits_accordion">
- <accordion_tab name="tab_cof" title="Vestimenta atual"/>
- <accordion_tab name="tab_outfits" title="Minhas vestimentas"/>
- </accordion>
+<panel label="Coisas" name="Outfits">
+ <tab_container name="appearance_tabs">
+ <inventory_panel label="MEUS LOOKS" name="outfitslist_tab"/>
+ <inventory_panel label="EM USO" name="cof_tab"/>
+ </tab_container>
+ <panel name="bottom_panel">
+ <button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/>
+ <dnd_button name="trash_btn" tool_tip="Remover item selecionado"/>
+ <button label="Salvar este look" name="make_outfit_btn" tool_tip="Salvar aparência como um look"/>
+ <button label="Vestir" name="wear_btn" tool_tip="Vestir look selecionado"/>
+ <button label="M" name="look_edit_btn"/>
+ </panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml
index 5ef6edf9ec5e54fb7b0a62df2a6b53294a0c1450..736b8f1fdd78fc296c3048ccbd8f2b998a42aaef 100644
--- a/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml
@@ -4,6 +4,6 @@
<menu_item_call label="Adicionar ao look atual" name="add"/>
<menu_item_call label="Tirar do look atual" name="remove"/>
<menu_item_call label="Renomear" name="rename"/>
- <menu_item_call label="Tirar" name="remove_link"/>
- <menu_item_call label="Excluir" name="delete"/>
+ <menu_item_call label="Remover link" name="remove_link"/>
+ <menu_item_call label="Excluir visual" name="delete"/>
</menu>
diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml
index 9d71c37c55a489004f92ccb954dc8ebeadf7cda8..50617887577a5f422c34be59988345ecd490368b 100644
--- a/indra/newview/skins/default/xui/pt/panel_people.xml
+++ b/indra/newview/skins/default/xui/pt/panel_people.xml
@@ -5,7 +5,6 @@
<string name="no_one_near" value="Ninguém por perto"/>
<string name="no_friends_online" value="Nenhum amigo online"/>
<string name="no_friends" value="Nenhum amigo"/>
- <string name="no_groups" value="Nenhum grupo"/>
<string name="people_filter_label" value="Filtro de pessoas"/>
<string name="groups_filter_label" value="Filtro de grupos"/>
<filter_editor label="Filtro" name="filter_input"/>
@@ -16,18 +15,22 @@
<button name="add_friend_btn" tool_tip="Adicionar o residente selecionado para sua lista de amigos"/>
</panel>
</panel>
- <panel label="AMIGOS" name="friends_panel">
+ <panel label="MEUS AMIGOS" name="friends_panel">
<accordion name="friends_accordion">
<accordion_tab name="tab_online" title="Online"/>
<accordion_tab name="tab_all" title="Todos"/>
</accordion>
<panel label="bottom_panel" name="bottom_panel">
<button name="friends_viewsort_btn" tool_tip="Opções"/>
- <button name="add_btn" tool_tip="Oferecer amizade para o residente"/>
+ <button name="add_btn" tool_tip="Oferecer amizade para um residente"/>
<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 conhecer mais gente, use [secondlife:///app/worldmap o Mapa].
+ </text>
</panel>
- <panel label="GRUPOS" name="groups_panel">
+ <panel label="MEUS GRUPOS" name="groups_panel">
<panel label="bottom_panel" name="bottom_panel">
<button name="groups_viewsort_btn" tool_tip="Opções"/>
<button name="plus_btn" tool_tip="Ingressar em um grupo/Criar novo grupo"/>
@@ -44,10 +47,11 @@
<panel name="button_bar">
<button label="Perfil" name="view_profile_btn" tool_tip="Exibir fotografia, grupos e outras informações dos residentes"/>
<button label="MI" name="im_btn" tool_tip="Abrir sessão de mensagem instantânea"/>
- <button label="Chamada" name="call_btn" tool_tip="Chamar este residente"/>
+ <button label="Chamada" name="call_btn" tool_tip="Ligar para este residente"/>
<button label="Compartilhar" name="share_btn"/>
<button label="Teletransporte" name="teleport_btn" tool_tip="Oferecer teletransporte"/>
<button label="Perfil do grupo" name="group_info_btn" tool_tip="Exibir informação de grupo"/>
<button label="Bate- papo de grupo" name="chat_btn" tool_tip="abrir sessão de bate- papo"/>
+ <button label="Ligar para o grupo" name="group_call_btn" tool_tip="Ligar para este grupo"/>
</panel>
</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 210991f9844e776d1eec411375c04affefe063dd..453c56d2807b24024e31e643454f0ddb8d34cf3a 100644
--- a/indra/newview/skins/default/xui/pt/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/pt/panel_place_profile.xml
@@ -6,7 +6,7 @@
<string name="available" value="disponÃvel"/>
<string name="allocated" value="alocados"/>
<string name="title_place" value="Perfil da região"/>
- <string name="title_teleport_history" value="Localização do histórico de teletransportes"/>
+ <string name="title_teleport_history" value="Histórico de teletransportes"/>
<string name="not_available" value="(N\A)"/>
<string name="unknown" value="(Desconhecido)"/>
<string name="public" value="(público)"/>
@@ -41,6 +41,7 @@
<string name="acquired_date">
[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
</string>
+ <button name="back_btn" tool_tip="Atrás"/>
<text name="title" value="Perfil da região"/>
<scroll_container name="place_scroll">
<panel name="scrolling_panel">
diff --git a/indra/newview/skins/default/xui/pt/panel_places.xml b/indra/newview/skins/default/xui/pt/panel_places.xml
index 5c0f3cd11d9d0a8c42e89ceb14414b7bba36d62c..d9045e1a3706b59030314434247d6d69106a5f43 100644
--- a/indra/newview/skins/default/xui/pt/panel_places.xml
+++ b/indra/newview/skins/default/xui/pt/panel_places.xml
@@ -2,13 +2,14 @@
<panel label="Lugares" name="places panel">
<string name="landmarks_tab_title" value="MEUS MARCOS"/>
<string name="teleport_history_tab_title" value="HISTÓRICO DE TELETRANSPORTES"/>
- <filter_editor label="Filtrar lugares" name="Filter"/>
+ <filter_editor label="Filtrar meus lugares" name="Filter"/>
<panel name="button_panel">
- <button label="Teletransportar" name="teleport_btn"/>
+ <button label="Teletransportar" name="teleport_btn" tool_tip="Teletransportar para a área selecionada"/>
<button label="Mapa" name="map_btn"/>
- <button label="Editar" name="edit_btn"/>
- <button label="Fechar" name="close_btn"/>
- <button label="Cancelar" name="cancel_btn"/>
+ <button label="Editar" name="edit_btn" tool_tip="Editar dados do marco"/>
+ <button label="▼" name="overflow_btn" tool_tip="Mostrar opções adicionais"/>
<button label="Salvar" name="save_btn"/>
+ <button label="Cancelar" name="cancel_btn"/>
+ <button label="Fechar" name="close_btn"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
index 431f3ca8e12102884f9a40ab4b75e2337346cbf5..7ed64404e63aff241c5e18e0f3bf2b0edb6e0eea 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
@@ -1,27 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<panel name="advanced">
- <panel.string name="resolution_format">
- [RES_X] x [RES_Y]
- </panel.string>
+<panel label="Avançado" name="advanced">
<panel.string name="aspect_ratio_text">
[NUM]:[DEN]
</panel.string>
- <check_box label="Balão de bate-papo" name="bubble_text_chat"/>
- <color_swatch name="background" tool_tip="Escolha a cor do balão de bate-papo"/>
- <slider label="Opacidade" name="bubble_chat_opacity"/>
- <text name="AspectRatioLabel1" tool_tip="largura / altura">
- Relação de aspecto
- </text>
- <combo_box name="aspect_ratio" tool_tip="largura / altura">
- <combo_box.item label="4:3 (CRT Padrão)" name="item1"/>
- <combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/>
- <combo_box.item label="8:5 (tela ampla)" name="item3"/>
- <combo_box.item label="16:9 (tela ampla)" name="item4"/>
- </combo_box>
- <check_box label="Auto-detectar" name="aspect_auto_detect"/>
- <text name="heading1">
- Câmera:
- </text>
<slider label="Ângulo de visão" name="camera_fov"/>
<slider label="Distância" name="camera_offset_scale"/>
<text name="heading2">
@@ -29,20 +10,20 @@
</text>
<check_box label="Construir/Editar" name="edit_camera_movement" tool_tip="Use o posicionamento automático da câmera quando entrar e sair do modo de edição"/>
<check_box label="Aparência" name="appearance_camera_movement" tool_tip="Use o posicionamento automático da câmera quando em modo de edição"/>
- <text name="heading3">
- Avatares:
- </text>
<check_box label="Mostre-me em visão de mouse" name="first_person_avatar_visible"/>
<check_box label="Teclas de seta sempre me movem" name="arrow_keys_move_avatar_check"/>
<check_box label="Dê dois toques e pressione para correr" name="tap_tap_hold_to_run"/>
<check_box label="Mover os lábios do avatar quando estiver falando" name="enable_lip_sync"/>
+ <check_box label="Balão de bate-papo" name="bubble_text_chat"/>
+ <slider label="Opacidade" name="bubble_chat_opacity"/>
+ <color_swatch name="background" tool_tip="Escolha a cor do balão de bate-papo"/>
<check_box label="Mostrar erros de script" name="show_script_errors"/>
<radio_group name="show_location">
- <radio_item label="No bate papo" name="0"/>
- <radio_item label="Em uma janela" name="1"/>
+ <radio_item label="Bate-papo local" name="0"/>
+ <radio_item label="Janelas separadas" name="1"/>
</radio_group>
- <check_box label="Alternar para o modo microfone quando eu pressionar a tecla de falar:" name="push_to_talk_toggle_check" tool_tip="Quando em modo de alternância, pressione e solte o botão UMA vez para ligar e desligar o microfone. Quando em modo de alternância, o microfone só transmite sua enquanto o botão estiver pressionado."/>
+ <check_box label="Tecla liga/desliga da minha voz:" name="push_to_talk_toggle_check" tool_tip="Quando em modo de alternância, pressione e solte o botão UMA vez para ligar e desligar o microfone. Quando em modo de alternância, o microfone só transmite sua enquanto o botão estiver pressionado."/>
<line_editor label="Botao apertar e falar" name="modifier_combo"/>
<button label="Definir chave" name="set_voice_hotkey_button"/>
- <button label="Botão do meio do mouse" name="set_voice_middlemouse_button"/>
+ <button label="Botão do meio do mouse" name="set_voice_middlemouse_button" tool_tip="Redefinir como botão do meio do mouse"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml
index 4cb823d432ba0d9f9faee0840d7262ccf13734bf..2ffe720ccf863256a3572ef029d95f66883c560d 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml
@@ -6,9 +6,9 @@
<check_box label="Quando eu gasto ou recebo L$" name="notify_money_change_checkbox"/>
<check_box label="Quando meus amigos entram e saem" name="friends_online_notify_checkbox"/>
<text name="show_label">
- Sempre mostrar esses alertas:
+ Mostrar sempre:
</text>
<text name="dont_show_label">
- Nunca mostrar esses alertas:
+ Nunca mostrar:
</text>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
index d6d8be7dc76b73a61cf5f63b6e576ff97c1d39cd..d9b18724e2a9009b6ba95fd43c6dd7ec49279d4f 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Chat" name="chat">
<radio_group name="chat_font_size">
- <radio_item label="Pequeno" name="radio"/>
- <radio_item label="Média" name="radio2"/>
- <radio_item label="Grande" name="radio3"/>
+ <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>
<color_swatch label="Você" name="user"/>
<text name="text_box1">
@@ -39,8 +39,8 @@
</text>
<check_box initial_value="true" label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
<check_box label="Envie MIs por email quando eu estiver desconectado" name="send_im_to_email"/>
- <radio_group name="chat_window" tool_tip="Exibir cada bate-papo em uma janela ou em uma única janela com uma aba para cada pessoa (requer reinÃcio)">
- <radio_item label="Janelas diferentes" name="radio"/>
- <radio_item label="Uma janela" name="radio2"/>
+ <radio_group name="chat_window" tool_tip="Exibir cada bate-papo em uma janela separada, ou exibir todos em uma única janela com uma aba para cada pessoa (requer reinÃcio)">
+ <radio_item label="Janelas separadas" name="radio" value="0"/>
+ <radio_item label="Guias" name="radio2" value="1"/>
</radio_group>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
index 17f43943c12e93595cde2a3fcb687993484284f6..7a3e69c988c6b2196c49242d5dfb6ab9790801e1 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
@@ -40,9 +40,9 @@
Mostrar nomes:
</text>
<radio_group name="Name_Tag_Preference">
- <radio_item label="Desligar" name="radio"/>
- <radio_item label="Ligar" name="radio2"/>
- <radio_item label="Brevemente" name="radio3"/>
+ <radio_item label="Desligar" name="radio" value="0"/>
+ <radio_item label="Ligar" name="radio2" value="1"/>
+ <radio_item label="Brevemente" name="radio3" value="2"/>
</radio_group>
<check_box label="Mostrar meu nome" name="show_my_name_checkbox1"/>
<check_box initial_value="true" label="Nomes pequenos" name="small_avatar_names_checkbox"/>
@@ -50,14 +50,17 @@
<text name="effects_color_textbox">
Meus efeitos:
</text>
- <color_swatch label="" name="effect_color_swatch" tool_tip="Clique para abrir o seletor de cores"/>
<text name="title_afk_text">
Entrar no modo ausente em:
</text>
- <spinner label="Tempo para ficar Ausente:" name="afk_timeout_spinner"/>
- <text name="seconds_textbox">
- segundos
- </text>
+ <color_swatch label="" name="effect_color_swatch" tool_tip="Clique para abrir o seletor de cores"/>
+ <combo_box label="Entrar no modo ausente em:" name="afk">
+ <combo_box.item label="2 minutos" name="item0"/>
+ <combo_box.item label="5 minutos" name="item1"/>
+ <combo_box.item label="10 minutos" name="item2"/>
+ <combo_box.item label="30 minutos" name="item3"/>
+ <combo_box.item label="(nunca)" name="item4"/>
+ </combo_box>
<text name="text_box3">
Mensagem do modo ocupado:
</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
index 252415ae2d2e467f48a65cfa36b7bea82b1600e8..121272bf6c08b9c92d890f8786db1b31e41d3a3a 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
@@ -88,8 +88,8 @@ rápido
Detalhes de Iluminação:
</text>
<radio_group name="LightingDetailRadio">
- <radio_item label="Sol e Lua apenas" name="SunMoon"/>
- <radio_item label="Luzes locais nas proximidades" name="LocalLights"/>
+ <radio_item label="Sol e Lua apenas" name="SunMoon" value="0"/>
+ <radio_item label="Luzes locais nas proximidades" name="LocalLights" value="1"/>
</radio_group>
<text name="TerrainDetailText">
Detalhe do Terreno:
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml
index fc83a0e97a8005a28c0b97301808f7d6912da905..0cf2b7a4afe924ceb78093bf9bcc3500cd5a9dee 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml
@@ -3,7 +3,7 @@
<panel.string name="log_in_to_change">
autentique-se para mudar
</panel.string>
- <button label="Limpar histórico" name="clear_cache"/>
+ <button label="Limpar histórico" name="clear_cache" tool_tip="Apagar imagem do login, última localização, histórico de teletransporte, cache de texturas e web"/>
<text name="cache_size_label_l">
(Locações, imagens, web, histórico de busca)
</text>
@@ -11,17 +11,16 @@
<check_box label="Apenas amigos e grupos podem me chamar ou enviar MI" name="voice_call_friends_only_check"/>
<check_box label="Desligar o microfone quando terminar chamadas" name="auto_disengage_mic_check"/>
<check_box label="Aceitar cookies" name="cookies_enabled"/>
- <check_box label="Permitir toque automático da mÃdia" name="autoplay_enabled"/>
<text name="Logs:">
Logs:
</text>
<check_box label="Salvar logs de bate- papo das proximidades no meu computador" name="log_nearby_chat"/>
<check_box label="Salvar logs de MI no meu computador" name="log_instant_messages"/>
<check_box label="Adicionar timestamp" name="show_timestamps_check_im"/>
- <line_editor left="278" name="log_path_string" right="-20"/>
<text name="log_path_desc">
- Localização dos logs
+ Localização dos logs:
</text>
+ <line_editor left="278" name="log_path_string" right="-20"/>
<button label="Navegar" label_selected="Navegar" name="log_path_button" width="120"/>
<button label="Lista dos bloqueados" name="block_list"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
index 002b3fa8a72f03ee2b6d38567bd3ed088e242a7d..f220bb156f8d8266aee07013b7b1193d21549f63 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Entrada e câmera" name="Input panel">
+<panel label="Configurações" name="Input panel">
<button bottom_delta="-40" label="Outros dispositivos" name="joystick_setup_button" width="165"/>
<text name="Mouselook:">
Visão subjetiva:
@@ -18,29 +18,29 @@
kbps
</text>
<check_box label="Personalizar porta" name="connection_port_enabled"/>
- <spinner label="Número da porta:" name="web_proxy_port"/>
+ <spinner label="Número da porta:" name="connection_port"/>
<text name="cache_size_label_l">
Tamanho do cache
</text>
<text name="text_box5">
MB
</text>
- <button label="Navegar" label_selected="Navegar" name="set_cache"/>
- <button label="Redefinir" label_selected="Definir" name="reset_cache"/>
<text name="Cache location">
- Localização do cache
+ Localização do cache:
</text>
+ <button label="Navegar" label_selected="Navegar" name="set_cache"/>
+ <button label="Redefinir" label_selected="Redefinir" name="reset_cache"/>
<text name="Web:">
Web:
</text>
<radio_group name="use_external_browser">
- <radio_item label="Usar navegador incluso" name="internal" tool_tip="Use este navegador para consultar a ajuda, abrir links da web, etc. As janelas abrem dentro do [APP_NAME]."/>
- <radio_item label="Usar meu navegador (IE, Firefox)" name="external" tool_tip="Use o navegador incluso para consultar a ajuda, abrir links da web, etc. Uso em tela inteira não recomendado."/>
+ <radio_item label="Usar navegador incluso" name="internal" tool_tip="Use este navegador para consultar a ajuda, abrir links da web, etc. As janelas abrem dentro do [APP_NAME]." value="0"/>
+ <radio_item label="Usar meu navegador (IE, Firefox, Safari)" name="external" tool_tip="Use o navegador incluso para consultar a ajuda, abrir links da web, etc. Uso em tela inteira não recomendado." value="1"/>
</radio_group>
- <check_box initial_value="false" label="Proxy web" name="web_proxy_enabled"/>
- <line_editor name="web_proxy_editor" tool_tip="O nome ou endereço IP do proxy da sua preferência"/>
- <button label="Navegar" label_selected="Navegar" name="set_proxy"/>
+ <check_box initial_value="false" label="Ativar web proxy" name="web_proxy_enabled"/>
<text name="Proxy location">
- Localização do proxy
+ Localização do proxy:
</text>
+ <line_editor name="web_proxy_editor" tool_tip="O nome ou endereço IP do proxy da sua preferência"/>
+ <spinner label="Número da porta:" name="web_proxy_port"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
index 37855672c916eeeef45ced31e942d2a04ffacc26..5dbd3d49041fee3bfa113098a62b31a7353f9883 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
@@ -2,13 +2,20 @@
<panel label="Sons" name="Preference Media panel">
<slider label="Volume principal" name="System Volume"/>
<check_box initial_value="true" label="Silenciar ao minimizar" name="mute_when_minimized"/>
- <slider label="Ambiente" name="Wind Volume"/>
<slider label="Botões" name="UI Volume"/>
- <slider label="MÃdia" name="Media Volume"/>
+ <slider label="Ambiente" name="Wind Volume"/>
<slider label="Efeitos sonoros" name="SFX Volume"/>
<slider label="Streaming de música" name="Music Volume"/>
- <check_box label="Voz" name="enable_voice_check"/>
- <slider label="Voz" name="Voice Volume"/>
+ <check_box label="Ativado" name="music_enabled"/>
+ <slider label="MÃdia" name="Media Volume"/>
+ <check_box label="Ativado" name="enable_media"/>
+ <slider label="Bate-papo de voz" name="Voice Volume"/>
+ <check_box label="Ativado" name="enable_voice_check"/>
+ <check_box label="Autorizar auto-play de mÃdias" name="media_auto_play_btn" tool_tip="Marque esta opção para auto-executar mÃdias, se elas quiserem" value="verdadeiro"/>
+ <check_box label="Tocar mÃdia anexada em outros avatares" name="media_show_on_others_btn" tool_tip="Desmarque esta opção para ocultar mÃdias anexadas em avatares por perto" value="verdadeiro"/>
+ <text name="voice_chat_settings">
+ Configuração de bate-papo de voz
+ </text>
<text name="Listen from">
Ouvir a partir de:
</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml
index d8013c974fff968e700bf049c5ffba5387ec8454..a1254b4da073c9caa0de2112b29af103647bec07 100644
--- a/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml
@@ -1,6 +1,47 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="MediaControls">
+ <string name="min_width">
+ 300
+ </string>
+ <string name="min_height">
+ 75
+ </string>
+ <string name="zoom_medium_padding">
+ 1.1
+ </string>
+ <string name="top_world_view_avoid_zone">
+ 50
+ </string>
+ <layout_stack name="progress_indicator_area">
+ <panel name="media_progress_indicator">
+ <progress_bar name="media_progress_bar" tool_tip="Carregando mÃdia"/>
+ </panel>
+ </layout_stack>
<layout_stack name="media_controls">
+ <layout_panel name="back">
+ <button name="back_btn" tool_tip="Navegar para trás"/>
+ </layout_panel>
+ <layout_panel name="fwd">
+ <button name="fwd_btn" tool_tip="Navegar para frente"/>
+ </layout_panel>
+ <layout_panel name="home">
+ <button name="home_btn" tool_tip="Página web:"/>
+ </layout_panel>
+ <layout_panel name="media_stop">
+ <button name="media_stop_btn" tool_tip="Parar mÃdia"/>
+ </layout_panel>
+ <layout_panel name="reload">
+ <button name="reload_btn" tool_tip="Recarregar"/>
+ </layout_panel>
+ <layout_panel name="stop">
+ <button name="stop_btn" tool_tip="Parar de carregar"/>
+ </layout_panel>
+ <layout_panel name="play">
+ <button name="play_btn" tool_tip="Tocar mÃdia"/>
+ </layout_panel>
+ <layout_panel name="pause">
+ <button name="pause_btn" tool_tip="Pausar mÃdia"/>
+ </layout_panel>
<layout_panel name="media_address">
<line_editor name="media_address_url" tool_tip="URL da mÃdia"/>
<layout_stack name="media_address_url_icons">
@@ -15,14 +56,24 @@
<layout_panel name="media_play_position">
<slider_bar initial_value="0.5" name="media_play_slider" tool_tip="Andamento do vÃdeo"/>
</layout_panel>
+ <layout_panel name="skip_back">
+ <button name="skip_back_btn" tool_tip="Passo para trás"/>
+ </layout_panel>
+ <layout_panel name="skip_forward">
+ <button name="skip_forward_btn" tool_tip="Passo para frente"/>
+ </layout_panel>
<layout_panel name="media_volume">
<button name="media_mute_button" tool_tip="Silenciar esta mÃdia"/>
<slider name="volume_slider" tool_tip="Volume"/>
</layout_panel>
- </layout_stack>
- <layout_stack>
- <panel name="media_progress_indicator">
- <progress_bar name="media_progress_bar" tool_tip="Carregando mÃdia"/>
- </panel>
+ <layout_panel name="zoom_frame">
+ <button name="zoom_frame_btn" tool_tip="Enfocar mÃdia"/>
+ </layout_panel>
+ <layout_panel name="close">
+ <button name="close_btn" tool_tip="Menos zoom"/>
+ </layout_panel>
+ <layout_panel name="new_window">
+ <button name="new_window_btn" tool_tip="Abrir URL em navegador"/>
+ </layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_profile.xml b/indra/newview/skins/default/xui/pt/panel_profile.xml
index a9a5116d3c009741d8c998b38f887652f5099f16..805e3aaebd993562f549b565706debc62343ba12 100644
--- a/indra/newview/skins/default/xui/pt/panel_profile.xml
+++ b/indra/newview/skins/default/xui/pt/panel_profile.xml
@@ -12,37 +12,41 @@
</string>
<string name="my_account_link_url" value="http://secondlife.com/my/account/index.php?lang=pt-BR"/>
<string name="no_partner_text" value="Ninguém"/>
+ <string name="no_group_text" value="Nenhum"/>
<string name="RegisterDateFormat">
[REG_DATE] ([AGE])
</string>
- <scroll_container name="profile_scroll">
- <panel name="scroll_content_panel">
- <panel name="second_life_image_panel">
- <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
- </panel>
- <panel name="first_life_image_panel">
- <text name="title_rw_descr_text" value="Mundo real:"/>
- </panel>
- <text name="me_homepage_text">
- Homepage:
- </text>
- <text name="title_member_text" value="Membro desde:"/>
- <text name="title_acc_status_text" value="Status da conta:"/>
- <text name="acc_status_text" value="Residente. Nenhuma info de pagamento no arquivo."/>
- <text name="title_partner_text" value="Parceiro:"/>
- <text name="title_groups_text" value="Grupos:"/>
- </panel>
- </scroll_container>
- <panel name="profile_buttons_panel">
- <button label="Adicionar amigo" name="add_friend" tool_tip="Oferecer amizade para o residente"/>
- <button label="MI" name="im" tool_tip="Abrir sessão de Mensagem instantânea"/>
- <button label="Chamada" name="call" tool_tip="Chamar este residente"/>
- <button label="Mapa" name="show_on_map_btn" tool_tip="exibir o residente no mapa"/>
- <button label="Teletransporte" name="teleport" tool_tip="Oferecer teletransporte"/>
- <button label="▼" name="overflow_btn" tool_tip="Pagar dinheiro ou compartilhar inventário com o residente"/>
- </panel>
- <panel name="profile_me_buttons_panel">
- <button label="Editar perfil" name="edit_profile_btn"/>
- <button label="Editar aparência" name="edit_appearance_btn"/>
- </panel>
+ <layout_stack name="layout">
+ <layout_panel name="profile_stack">
+ <scroll_container name="profile_scroll">
+ <panel name="profile_scroll_panel">
+ <panel name="second_life_image_panel">
+ <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
+ </panel>
+ <panel name="first_life_image_panel">
+ <text name="title_rw_descr_text" value="Mundo real:"/>
+ </panel>
+ <text name="title_member_text" value="Residente desde:"/>
+ <text name="title_acc_status_text" value="Conta:"/>
+ <text name="title_partner_text" value="Parceiro(a):"/>
+ <panel name="partner_data_panel">
+ <name_box initial_value="(pesquisando)" name="partner_text"/>
+ </panel>
+ <text name="title_groups_text" value="Grupos:"/>
+ </panel>
+ </scroll_container>
+ </layout_panel>
+ <layout_panel name="profile_buttons_panel">
+ <button label="Adicionar amigo" name="add_friend" tool_tip="Oferecer amizade ao residente"/>
+ <button label="MI" name="im" tool_tip="Abrir sessão de mensagem instantânea"/>
+ <button label="Ligar" name="call" tool_tip="Ligar para este residente"/>
+ <button label="Mapa" name="show_on_map_btn" tool_tip="Exibir o residente no mapa"/>
+ <button label="Teletransportar" name="teleport" tool_tip="Oferecer teletransporte"/>
+ <button label="▼" name="overflow_btn" tool_tip="Pagar ou compartilhar inventário com o residente"/>
+ </layout_panel>
+ <layout_panel name="profile_me_buttons_panel">
+ <button label="Editar perfil" name="edit_profile_btn" tool_tip="Editar dados pessoais"/>
+ <button label="Editar aparência" name="edit_appearance_btn" tool_tip="Criar/editar aparência: fÃsico, roupas, etc."/>
+ </layout_panel>
+ </layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
index 122cae940ce222af675ffc20983005c0b209066b..65ac89baf82cb8e971b8826e2e07781fe4680475 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
@@ -31,7 +31,7 @@
da propriedade.
</text>
<text bottom_delta="-36" name="covenant_instructions">
- Arrastar e soltar um notecard para alterar o Covenant para esta propriedade.
+ Arrastar e soltar uma anotação para alterar o contrato em vigor nesta propriedade.
</text>
<text bottom_delta="-36" name="region_section_lbl">
Região
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 c893472de1c060046ba92186a6fc07f146604043..0f173ab21acf4713600eb144dacb2c150d81fb04 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Propriedade" name="Estate">
<text name="estate_help_text">
- Mudanças nas definições nesta guia irão afetar
-todas as regiões desta propriedade.
+ Mudar as opções desta guia afeta todas as regiões desta propriedade.
</text>
<text name="estate_text">
Propriedade:
@@ -26,7 +25,7 @@ todas as regiões desta propriedade.
<text name="Only Allow">
Restringir acesso a contas confirmardas por:
</text>
- <check_box label="Dados de pagamento fornecidos" name="limit_payment" tool_tip="Banir residentes sem identificação"/>
+ <check_box label="Dados de pagamento fornecidos" name="limit_payment" tool_tip="Banir residentes sem identificação."/>
<check_box label="Verificação de idade" name="limit_age_verified" tool_tip="Banir residentes que não comprovaram a idade. Consulte o [SUPPORT_SITE] para saber mais."/>
<check_box label="Permitir conversa de voz" name="voice_chat_check"/>
<button label="?" name="voice_chat_help"/>
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
new file mode 100644
index 0000000000000000000000000000000000000000..89fcb05658fef4019b6183c44ed89aa5d8f6dab4
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_region_general_layout.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Região" name="General">
+ <text name="region_text_lbl">
+ Região:
+ </text>
+ <text name="region_text">
+ (Desconhecido)
+ </text>
+ <text name="version_channel_text_lbl">
+ Versão:
+ </text>
+ <text name="version_channel_text">
+ (Desconhecido)
+ </text>
+ <text name="region_type_lbl">
+ Tipo:
+ </text>
+ <text name="region_type">
+ (Desconhecido)
+ </text>
+ <check_box label="Bloquear terraplanagem" name="block_terraform_check"/>
+ <check_box label="Bloquear voos" name="block_fly_check"/>
+ <check_box label="Permitir danos" name="allow_damage_check"/>
+ <check_box label="Limitar empurrões" name="restrict_pushobject"/>
+ <check_box label="Permitir revenda de terrenos" name="allow_land_resell_check"/>
+ <check_box label="Permitir junção e divisão de terrenos" name="allow_parcel_changes_check"/>
+ <check_box label="Não mostrar nos resultados de pesquisa" name="block_parcel_search_check" tool_tip="Mostrar esta região e lotes nos resultados de pesquisa"/>
+ <spinner label="Limite do agente" name="agent_limit_spin"/>
+ <spinner label="Bônus do objeto" name="object_bonus_spin"/>
+ <text label="NÃvel de maturidade" name="access_text">
+ Classificação:
+ </text>
+ <combo_box label="Moderado" name="access_combo">
+ <combo_box.item label="Público adulto" name="Adult"/>
+ <combo_box.item label="Moderado" name="Mature"/>
+ <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 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"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml
new file mode 100644
index 0000000000000000000000000000000000000000..daf87c4dc61366c0c9b406b4e102b48328a6a383
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="MEU AVATAR" name="script_limits_my_avatar_panel">
+ <text name="script_memory">
+ Uso de scripts
+ </text>
+ <text name="loading_text">
+ Carregando...
+ </text>
+ <scroll_list name="scripts_list">
+ <scroll_list.columns label="Tamanho (kb)" name="size"/>
+ <scroll_list.columns label="URLs" name="urls"/>
+ <scroll_list.columns label="Nome do objeto" name="name"/>
+ <scroll_list.columns label="Localização" name="location"/>
+ </scroll_list>
+ <button label="Atualizar lista" name="refresh_list_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml
new file mode 100644
index 0000000000000000000000000000000000000000..94274b2cfef52296844fe2e033bf9cdfdcfdcb0a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="MEMÓRIA DA REGIÃO" name="script_limits_region_memory_panel">
+ <text name="script_memory">
+ Memória de scripts no lote
+ </text>
+ <text name="loading_text">
+ Carregando...
+ </text>
+ <scroll_list name="scripts_list">
+ <scroll_list.columns label="Tamanho (kb)" name="size"/>
+ <scroll_list.columns label="URLs" name="urls"/>
+ <scroll_list.columns label="Nome do objeto" name="name"/>
+ <scroll_list.columns label="Dono do objeto" name="owner"/>
+ <scroll_list.columns label="Lote" name="parcel"/>
+ <scroll_list.columns label="Localização" name="location"/>
+ </scroll_list>
+ <button label="Atualizar lista" name="refresh_list_btn"/>
+ <button label="Destaque" name="highlight_btn"/>
+ <button label="Devolver" name="return_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_side_tray.xml b/indra/newview/skins/default/xui/pt/panel_side_tray.xml
index 7892fc9e0c51bd354774546e2798b0d70987b406..09ac074b5ab807084a43c3ae7d8882e33857e79c 100644
--- a/indra/newview/skins/default/xui/pt/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/pt/panel_side_tray.xml
@@ -2,25 +2,28 @@
<!-- Side tray cannot show background because it is always
partially on screen to hold tab buttons. -->
<side_tray name="sidebar">
+ <sidetray_tab description="Exibir ou não barra lateral" name="sidebar_openclose" tab_title="Exibir ou não barra lateral"/>
<sidetray_tab description="Casa." name="sidebar_home" tab_title="Home">
<panel label="casa" name="panel_home"/>
</sidetray_tab>
+ <sidetray_tab description="Editar seu perfil público e destaques ." name="sidebar_me" tab_title="My Profile">
+ <panel_container name="panel_container">
+ <panel label="Eu" name="panel_me"/>
+ </panel_container>
+ </sidetray_tab>
<sidetray_tab description="Encontre seus amigos, contatos e pessoas nas proximidades." name="sidebar_people" tab_title="People">
<panel_container name="panel_container">
- <panel label="Info de grupo" name="panel_group_info_sidetray"/>
+ <panel label="Perfil do grupo" name="panel_group_info_sidetray"/>
<panel label="Residentes& Objetos bloqueados" name="panel_block_list_sidetray"/>
</panel_container>
</sidetray_tab>
<sidetray_tab description="Encontre lugares para ir e lugares que você ja visitou." label="Lugares" name="sidebar_places" tab_title="Places">
<panel label="Lugares" name="panel_places"/>
</sidetray_tab>
- <sidetray_tab description="Editar seu perfil público e destaques ." name="sidebar_me" tab_title="My Profile">
- <panel label="Eu" name="panel_me"/>
+ <sidetray_tab description="Busca no seu inventário." name="sidebar_inventory" tab_title="My Inventory">
+ <panel label="Editar inventário" name="sidepanel_inventory"/>
</sidetray_tab>
<sidetray_tab description="Muda sua aparência e visual atual." name="sidebar_appearance" tab_title="My Appearance">
<panel label="Editar aparência" name="sidepanel_appearance"/>
</sidetray_tab>
- <sidetray_tab description="Busca no seu inventário." name="sidebar_inventory" tab_title="My Inventory">
- <panel label="Editar inventário" name="sidepanel_inventory"/>
- </sidetray_tab>
</side_tray>
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 948591526309a7c5f639c307a75434d41939c335..a320d9d56d842639ed43180aeb9e3442287d265e 100644
--- a/indra/newview/skins/default/xui/pt/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
@@ -21,9 +21,11 @@
<panel.string name="buycurrencylabel">
L$ [AMT]
</panel.string>
- <button label="" label_selected="" name="buycurrency" tool_tip="Meu saldo: Comprar mais L$"/>
+ <button label="" label_selected="" name="buycurrency" tool_tip="Meu saldo"/>
+ <button label="Comprar L$" name="buyL" tool_tip="Comprar mais L$"/>
<text name="TimeText" tool_tip="Hora atual (PacÃfico)">
- 12:00 AM
+ 24:00 AM PST
</text>
+ <button name="media_toggle_btn" tool_tip="Tocar/Pausar todas mÃdias (música, vÃdeo, páginas web)"/>
<button name="volume_btn" tool_tip="Volume geral"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_teleport_history.xml b/indra/newview/skins/default/xui/pt/panel_teleport_history.xml
index 9dc5aed91e6cd993a711a34fc613cef468ac332f..ba83fee7ba3267d43e08c6694dd6f3ad8dbc2e9d 100644
--- a/indra/newview/skins/default/xui/pt/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/pt/panel_teleport_history.xml
@@ -4,6 +4,7 @@
<accordion_tab name="today" title="Hoje"/>
<accordion_tab name="yesterday" title="Ontem"/>
<accordion_tab name="2_days_ago" title="2 dias atrás"/>
+ 5
<accordion_tab name="3_days_ago" title="3 dias atrás"/>
<accordion_tab name="4_days_ago" title="4 dias atrás"/>
<accordion_tab name="5_days_ago" title="5 dias atrás"/>
@@ -11,4 +12,7 @@
<accordion_tab name="1_month_and_older" title="1 mês e mais velhos"/>
<accordion_tab name="6_months_and_older" title="6 meses e mais velhos"/>
</accordion>
+ <panel name="bottom_panel">
+ <button name="gear_btn" tool_tip="Mostrar opções adicionais"/>
+ </panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml
new file mode 100644
index 0000000000000000000000000000000000000000..65f80fddd2b7cf8a1e1a8b3c22868a7824ceb5cb
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="teleport_history_item">
+ <button name="profile_btn" tool_tip="Mostrar dados do item"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml
index 73ec6fb068a67f25000d8b538eeeb0910b48409c..b8bbb4051af477733d79327ee9146aeb3faa9a67 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="Looks" name="appearance panel">
<string name="No Outfit" value="Nenhum"/>
- <filter_editor label="Filtrar looks" name="Filter"/>
- <panel name="bottom_panel">
- <button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/>
- <button name="newlook_btn" tool_tip="Novo look"/>
- <dnd_button name="trash_btn" tool_tip="Remover item selecionado"/>
- <button label="Vestir" name="wear_btn"/>
+ <panel name="panel_currentlook">
+ <text name="currentlook_title">
+ (não salvo)
+ </text>
</panel>
+ <filter_editor label="Filtrar looks" name="Filter"/>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml
index 556c631bf7ffb0bbda63c843e4e4f70fa0e585c0..4fc50bac6715763241f04c2d6774e27a3adff340 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="item properties" title="Propriedaded do item de inventário">
+<panel name="item properties" title="Perfil do objeto">
<panel.string name="unknown">
(desconhecido)
</panel.string>
@@ -15,7 +15,8 @@
<panel.string name="acquiredDate">
[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
</panel.string>
- <text name="title" value="Propriedade do item"/>
+ <text name="title" value="Perfil do objeto"/>
+ <text name="where" value="(Inventário)"/>
<panel label="">
<text name="LabelItemNameTitle">
Nome:
@@ -37,34 +38,36 @@
<text name="LabelAcquiredDate">
Quarta 24 de Maio 12:50:46 2006
</text>
- <text name="OwnerLabel">
- Você:
- </text>
- <check_box label="Editar" name="CheckOwnerModify"/>
- <check_box label="Copiar" name="CheckOwnerCopy"/>
- <check_box label="Revender" name="CheckOwnerTransfer"/>
- <text name="AnyoneLabel">
- Qualquer um:
- </text>
- <check_box label="Copiar" name="CheckEveryoneCopy"/>
- <text name="GroupLabel">
- Grupo:
- </text>
- <check_box label="Compartilhar" name="CheckShareWithGroup"/>
- <text name="NextOwnerLabel">
- Próximo proprietário:
- </text>
- <check_box label="Editar" name="CheckNextOwnerModify"/>
- <check_box label="Copiar" name="CheckNextOwnerCopy"/>
- <check_box label="Revender" name="CheckNextOwnerTransfer"/>
+ <panel name="perms_inv">
+ <text name="perm_modify">
+ Você pode:
+ </text>
+ <check_box label="Modificar" name="CheckOwnerModify"/>
+ <check_box label="Copiar" name="CheckOwnerCopy"/>
+ <check_box label="Transferir" name="CheckOwnerTransfer"/>
+ <text name="AnyoneLabel">
+ Todos:
+ </text>
+ <check_box label="Copiar" name="CheckEveryoneCopy"/>
+ <text name="GroupLabel">
+ Grupo:
+ </text>
+ <check_box label="Compartilhar" name="CheckShareWithGroup" tool_tip="Permitir que todos os membros do grupo tenham o seu nÃvel de modificação para este objeto. Faça uma doação para ativar restrições de função."/>
+ <text name="NextOwnerLabel">
+ Próximo proprietário:
+ </text>
+ <check_box label="Modificar" name="CheckNextOwnerModify"/>
+ <check_box label="Copiar" name="CheckNextOwnerCopy"/>
+ <check_box label="Transferir" name="CheckNextOwnerTransfer" tool_tip="O próximo dono poderá revender ou dar este objeto"/>
+ </panel>
<check_box label="À venda" name="CheckPurchase"/>
<combo_box name="combobox sale copy">
<combo_box.item label="Copiar" name="Copy"/>
<combo_box.item label="Original" name="Original"/>
</combo_box>
- <spinner label="Preço:" name="Edit Cost"/>
- <text name="CurrencySymbol">
- L$
- </text>
+ <spinner label="Preço: L$" name="Edit Cost"/>
+ </panel>
+ <panel name="button_panel">
+ <button label="Cancelar" name="cancel_btn"/>
</panel>
</panel>
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 7c626d7805fcb40e04a6e50a788d6ac6ecefd4e2..7981cd106f0cc132701c43dec091adb0899f18ba 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="object properties" title="Propriedades do objeto">
+<panel name="object properties" title="Perfil do objeto">
<panel.string name="text deed continued">
Doar
</panel.string>
@@ -36,26 +36,30 @@
<panel.string name="Sale Mixed">
Venda mista
</panel.string>
- <panel name="properties_panel" label="">
+ <text name="title" value="Perfil do objeto"/>
+ <text name="where" value="(inworld)"/>
+ <panel label="">
<text name="Name:">
Nome:
</text>
<text name="Description:">
Descrição:
</text>
- <text name="Creator:">
+ <text name="CreatorNameLabel">
Criador:
</text>
+ <text name="Creator Name">
+ Erica Linden
+ </text>
<text name="Owner:">
Proprietário:
</text>
- <text name="Group:">
+ <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."/>
- <check_box label="Compartilhar" name="checkbox share with group" tool_tip="Permitir que todos os membros do grupo tenhas suas permissões de modificação para este objeto. Faça uma doação para ativar restrições de função."/>
<text name="label click action">
Clique para:
</text>
@@ -66,14 +70,6 @@
<combo_box.item label="Pagar por objeto" name="Payobject"/>
<combo_box.item label="Abrir" name="Open"/>
</combo_box>
- <check_box label="À venda" name="checkbox for sale"/>
- <combo_box name="sale type">
- <combo_box.item label="Copiar" name="Copy"/>
- <combo_box.item label="Conteúdo" name="Contents"/>
- <combo_box.item label="Original" name="Original"/>
- </combo_box>
- <spinner label="Preço: L$" name="Edit Cost"/>
- <check_box label="Mostrar nos resultados de busca" name="search_check" tool_tip="Incluir o objeto nos resultados de busca"/>
<panel name="perms_inv">
<text name="perm_modify">
Você pode modificar este objeto
@@ -81,39 +77,49 @@
<text name="Anyone can:">
Todos:
</text>
- <check_box label="Movimentar" name="checkbox allow everyone move"/>
<check_box label="Copiar" name="checkbox allow everyone copy"/>
- <text name="Next owner can:">
+ <check_box label="Movimentar" name="checkbox allow everyone move"/>
+ <text name="GroupLabel">
+ Grupo:
+ </text>
+ <check_box label="Compartilhar" name="checkbox share with group" tool_tip="Permitir que todos os membros do grupo tenham o seu nÃvel de modificação para este objeto. Faça uma doação para ativar restrições de função."/>
+ <text name="NextOwnerLabel">
Próximo proprietário:
</text>
<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="O próximo dono poderá revender ou dar este objeto"/>
- <text name="B:">
- B:
- </text>
- <text name="O:">
- O:
- </text>
- <text name="G:">
- G:
- </text>
- <text name="E:">
- E:
- </text>
- <text name="N:">
- N:
- </text>
- <text name="F:">
- F:
- </text>
</panel>
+ <check_box label="À venda" name="checkbox for sale"/>
+ <combo_box name="sale type">
+ <combo_box.item label="Copiar" name="Copy"/>
+ <combo_box.item label="Conteúdo" name="Contents"/>
+ <combo_box.item label="Original" name="Original"/>
+ </combo_box>
+ <spinner label="Preço: L$" name="Edit Cost"/>
+ <check_box label="Mostrar nos resultados de busca" name="search_check" tool_tip="Incluir o objeto nos resultados de busca"/>
+ <text name="B:">
+ B:
+ </text>
+ <text name="O:">
+ O:
+ </text>
+ <text name="G:">
+ G:
+ </text>
+ <text name="E:">
+ E:
+ </text>
+ <text name="N:">
+ N:
+ </text>
+ <text name="F:">
+ F:
+ </text>
</panel>
<panel name="button_panel">
<button label="Abrir" name="open_btn"/>
<button label="Pagar" name="pay_btn"/>
<button label="Comprar" name="buy_btn"/>
- <button label="Cancelar" name="cancel_btn"/>
- <button label="Salvar" name="save_btn"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 0e2a8a88f14262ec4ad1b58f2efc716965ff427a..195345abc0846e1bfb54ae923273fa054eb310a7 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<!-- This file contains strings that used to be hardcoded in the source.
It is only for those strings which do not belong in a floater.
- For example, the strings used in avatar chat bubbles, and strings
+ For example, the strings used in avatar chat bubbles, and strings
that are returned from one component and may appear in many places-->
<strings>
+ <string name="CAPITALIZED_APP_NAME">
+ SECOND LIFE
+ </string>
<string name="SUPPORT_SITE">
Portal de Apoio do Second Life
</string>
@@ -185,9 +188,6 @@
<string name="BUTTON_DOCK">
conectar-se à barra
</string>
- <string name="BUTTON_UNDOCK">
- desconectar-se da barra
- </string>
<string name="BUTTON_HELP">
Mostrar ajuda
</string>
@@ -212,9 +212,6 @@
<string name="AvatarNameWaiting">
(aguardando)
</string>
- <string name="AvatarNameHippos">
- (hippos)
- </string>
<string name="GroupNameNone">
(nenhum)
</string>
@@ -575,6 +572,9 @@
<string name="hang_up">
Desconectado da conversa de Voz no mundo
</string>
+ <string name="reconnect_nearby">
+ Agora você será reconectado ao bate-papo local.
+ </string>
<string name="ScriptQuestionCautionChatGranted">
'[OBJECTNAME]', um objeto de '[OWNERNAME]', localizado em [REGIONNAME] a [REGIONPOS], obteve permissão para: [PERMISSIONS].
</string>
@@ -767,9 +767,6 @@
<string name="TeleportOffer">
Oferta de teletransporte
</string>
- <string name="StartUpNotification">
- [%d] nova notificação chegou enquanto você estava fora...
- </string>
<string name="StartUpNotifications">
[%d] Novas notificações chegaram enquanto você estava fora...
</string>
@@ -807,7 +804,10 @@
Pressione ESC para retornar para visão do mundo
</string>
<string name="InventoryNoMatchingItems">
- Nenhum item correspondente encontrado no inventário.
+ Nenhum item correspondente foi encontrado no inventário. Tente fazer uma [secondlife:///app/search/groups "Busca"].
+ </string>
+ <string name="FavoritesNoMatchingItems">
+ Arraste um marco para adicioná-lo aos seus favoritos.
</string>
<string name="InventoryNoTexture">
Você não possui uma cópia desta textura no seu inventário
@@ -1268,11 +1268,164 @@
todas as propriedades que você gerencia para [OWNER]
</string>
<string name="RegionInfoAllowedResidents">
- Residentes permitidos : ([ALLOWEDAGENTS], max [MAXACCESS])
+ Residentes autorizados: ([ALLOWEDAGENTS], max [MAXACCESS])
</string>
<string name="RegionInfoAllowedGroups">
Grupos permitidos: ([ALLOWEDGROUPS], max [MAXACCESS])
</string>
+ <string name="ScriptLimitsParcelScriptMemory">
+ Memória de scripts no lote
+ </string>
+ <string name="ScriptLimitsParcelsOwned">
+ Lotes listados: [PARCELS]
+ </string>
+ <string name="ScriptLimitsMemoryUsed">
+ Memória usada: [COUNT] kb de [MAX] kb; [AVAILABLE] kb disponÃveis
+ </string>
+ <string name="ScriptLimitsMemoryUsedSimple">
+ Memória usada: [COUNT] kb
+ </string>
+ <string name="ScriptLimitsParcelScriptURLs">
+ URL dos scripts do lote
+ </string>
+ <string name="ScriptLimitsURLsUsed">
+ URLs usados: [COUNT] de [MAX]; [AVAILABLE] disponÃveis
+ </string>
+ <string name="ScriptLimitsURLsUsedSimple">
+ URLs usados: [COUNT]
+ </string>
+ <string name="ScriptLimitsRequestError">
+ Erro ao solicitar dados
+ </string>
+ <string name="ScriptLimitsRequestNoParcelSelected">
+ Nenhum lote foi selecionado
+ </string>
+ <string name="ScriptLimitsRequestWrongRegion">
+ Erro: dados de script só disponÃveis na região da posição atual
+ </string>
+ <string name="ScriptLimitsRequestWaiting">
+ Obtendo dados...
+ </string>
+ <string name="ScriptLimitsRequestDontOwnParcel">
+ Você não está autorizado a examinar este lote.
+ </string>
+ <string name="SITTING_ON">
+ Sentado em
+ </string>
+ <string name="ATTACH_CHEST">
+ Peito
+ </string>
+ <string name="ATTACH_HEAD">
+ Cabeça
+ </string>
+ <string name="ATTACH_LSHOULDER">
+ Ombro esquerdo
+ </string>
+ <string name="ATTACH_RSHOULDER">
+ Ombro direito
+ </string>
+ <string name="ATTACH_LHAND">
+ Mão esquerda
+ </string>
+ <string name="ATTACH_RHAND">
+ Mão direita
+ </string>
+ <string name="ATTACH_LFOOT">
+ Pé esquerdo
+ </string>
+ <string name="ATTACH_RFOOT">
+ Pé direito
+ </string>
+ <string name="ATTACH_BACK">
+ Atrás
+ </string>
+ <string name="ATTACH_PELVIS">
+ Pélvis
+ </string>
+ <string name="ATTACH_MOUTH">
+ Boca
+ </string>
+ <string name="ATTACH_CHIN">
+ Queixo
+ </string>
+ <string name="ATTACH_LEAR">
+ Orelha esquerda
+ </string>
+ <string name="ATTACH_REAR">
+ Orelha direita
+ </string>
+ <string name="ATTACH_LEYE">
+ Olho esquerdo
+ </string>
+ <string name="ATTACH_REYE">
+ Olho direito
+ </string>
+ <string name="ATTACH_NOSE">
+ Nariz
+ </string>
+ <string name="ATTACH_RUARM">
+ Braço direito
+ </string>
+ <string name="ATTACH_RLARM">
+ Antebraço direito
+ </string>
+ <string name="ATTACH_LUARM">
+ Braço esquerdo
+ </string>
+ <string name="ATTACH_LLARM">
+ Antebraço esquerdo
+ </string>
+ <string name="ATTACH_RHIP">
+ Quadril direito
+ </string>
+ <string name="ATTACH_RULEG">
+ Coxa direita
+ </string>
+ <string name="ATTACH_RLLEG">
+ Perna direita
+ </string>
+ <string name="ATTACH_LHIP">
+ Quadril esquerdo
+ </string>
+ <string name="ATTACH_LULEG">
+ Coxa esquerda
+ </string>
+ <string name="ATTACH_LLLEG">
+ Perna esquerda
+ </string>
+ <string name="ATTACH_BELLY">
+ Barriga
+ </string>
+ <string name="ATTACH_RPEC">
+ Peitorais D
+ </string>
+ <string name="ATTACH_LPEC">
+ Peitorais E
+ </string>
+ <string name="ATTACH_HUD_CENTER_2">
+ HUD Central 2
+ </string>
+ <string name="ATTACH_HUD_TOP_RIGHT">
+ HUD superior direito
+ </string>
+ <string name="ATTACH_HUD_TOP_CENTER">
+ HUD centro superior
+ </string>
+ <string name="ATTACH_HUD_TOP_LEFT">
+ HUD superior esquerdo
+ </string>
+ <string name="ATTACH_HUD_CENTER_1">
+ HUD Central 1
+ </string>
+ <string name="ATTACH_HUD_BOTTOM_LEFT">
+ HUD esquerda inferior
+ </string>
+ <string name="ATTACH_HUD_BOTTOM">
+ HUD inferior
+ </string>
+ <string name="ATTACH_HUD_BOTTOM_RIGHT">
+ HUD direito inferior
+ </string>
<string name="CursorPos">
Linha [LINE], Coluna [COLUMN]
</string>
@@ -1317,6 +1470,15 @@
<string name="ClassifiedUpdateAfterPublish">
(vai atualizar depois de publicado)
</string>
+ <string name="NoPicksClassifiedsText">
+ Você não criou nenhum Destaque ou Anúncio. Clique no botão "+" para criar um Destaque ou Anúncio.
+ </string>
+ <string name="NoAvatarPicksClassifiedsText">
+ O usuário não tem nenhum destaque ou anúncio
+ </string>
+ <string name="PicksClassifiedsLoadingText">
+ Carregando...
+ </string>
<string name="MultiPreviewTitle">
Preview
</string>
@@ -1393,6 +1555,9 @@
Extensão de arquivo desconhecida [.%s]
Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
</string>
+ <string name="MuteObject2">
+ Bloquear
+ </string>
<string name="AddLandmarkNavBarMenu">
Adicionar Landmark...
</string>
@@ -1664,39 +1829,15 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Attached Earlobes">
Lóbulos da orelha anexados
</string>
- <string name="Back Bangs">
- Franja traseira
- </string>
- <string name="Back Bangs Down">
- franja traseira longa
- </string>
- <string name="Back Bangs Up">
- franja traseira arrepiada
- </string>
<string name="Back Fringe">
corte traseiro
</string>
- <string name="Back Hair">
- cabelo traseiro
- </string>
- <string name="Back Hair Down">
- cabelo de trás longo
- </string>
- <string name="Back Hair Up">
- cabelo de trás arrepiado
- </string>
<string name="Baggy">
folgado
</string>
<string name="Bangs">
Franja
</string>
- <string name="Bangs Down">
- franja longa
- </string>
- <string name="Bangs Up">
- franja arrepiada
- </string>
<string name="Beady Eyes">
Olhos malévolos
</string>
@@ -1709,9 +1850,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Big Butt">
Traseiro Grande
</string>
- <string name="Big Eyeball">
- Globo ocular grande
- </string>
<string name="Big Hair Back">
Cabelo volumoso: Trás
</string>
@@ -1886,9 +2024,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Corner Down">
Canto para baixo
</string>
- <string name="Corner Normal">
- Canto normal
- </string>
<string name="Corner Up">
Canto para cima
</string>
@@ -1898,9 +2033,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Crooked Nose">
Nariz torto
</string>
- <string name="Cropped Hair">
- Cabelo curto rente
- </string>
<string name="Cuff Flare">
bainha larga
</string>
@@ -1919,15 +2051,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Default Heels">
Salto Padrão
</string>
- <string name="Default Toe">
- Dedo do pé padrão
- </string>
<string name="Dense">
Densidade
</string>
- <string name="Dense hair">
- Cabelo Denso
- </string>
<string name="Double Chin">
Queixo duplo
</string>
@@ -1973,9 +2099,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Eye Spacing">
Espaçamento dos olhos
</string>
- <string name="Eyeball Size">
- Tamanho do globo ocular
- </string>
<string name="Eyebrow Arc">
Arco da sobrancelha
</string>
@@ -2000,36 +2123,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Eyeliner Color">
Cor do delineador
</string>
- <string name="Eyes Back">
- Eyes Back
- </string>
<string name="Eyes Bugged">
Olhos esbugalhados
</string>
- <string name="Eyes Forward">
- Eyes Forward
- </string>
- <string name="Eyes Long Head">
- Eyes Long Head
- </string>
- <string name="Eyes Shear Left Up">
- Ponta esquerda dos olhos para cima
- </string>
- <string name="Eyes Shear Right Up">
- Ponta direita dos olhos para cima
- </string>
- <string name="Eyes Short Head">
- Eyes Short Head
- </string>
- <string name="Eyes Spread">
- Extensão dos Olhos
- </string>
- <string name="Eyes Sunken">
- Olhos afundados
- </string>
- <string name="Eyes Together">
- Olhos juntos
- </string>
<string name="Face Shear">
Face raspada
</string>
@@ -2039,30 +2135,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Far Set Eyes">
Distância entre os olhos
</string>
- <string name="Fat">
- Gordo
- </string>
- <string name="Fat Head">
- Cabeça gorda
- </string>
<string name="Fat Lips">
Lábios carnudos
</string>
- <string name="Fat Lower">
- Inferior carnudo
- </string>
- <string name="Fat Lower Lip">
- Lábio superior carnudo
- </string>
- <string name="Fat Torso">
- Tronco corpulento
- </string>
- <string name="Fat Upper">
- Superior carnudo
- </string>
- <string name="Fat Upper Lip">
- lábio superior carnudo
- </string>
<string name="Female">
Feminino
</string>
@@ -2099,24 +2174,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Freckles">
Sardas
</string>
- <string name="Front Bangs Down">
- Franja da frente longa
- </string>
- <string name="Front Bangs Up">
- Franja da frene arrepiada
- </string>
<string name="Front Fringe">
Franja
</string>
- <string name="Front Hair">
- Cabelo da frente
- </string>
- <string name="Front Hair Down">
- Cabelo da frente baixo
- </string>
- <string name="Front Hair Up">
- cabelo da frente arrepiado
- </string>
<string name="Full Back">
Trás cheia
</string>
@@ -2390,9 +2450,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Long arms">
Braços longos
</string>
- <string name="Longcuffs">
- Punho longo
- </string>
<string name="Loose Pants">
Pantalonas
</string>
@@ -2555,9 +2612,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="No Eyeshadow">
Sem Sombra dos olhos
</string>
- <string name="No Heels">
- Sem salto
- </string>
<string name="No Lipgloss">
Sem brilho labial
</string>
@@ -2615,9 +2669,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Nostril Width">
Largura das narinas
</string>
- <string name="Old">
- Velho
- </string>
<string name="Opaque">
Opaco
</string>
@@ -2717,9 +2768,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Pointy Heels">
Salto agulha
</string>
- <string name="Pointy Toe">
- Dedo dos pés pontudo
- </string>
<string name="Ponytail">
Rabo de cavalo
</string>
@@ -2744,15 +2792,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Red Hair">
Cabelo ruivo
</string>
- <string name="Red Skin">
- Pele vermelha
- </string>
<string name="Regular">
Normal
</string>
- <string name="Regular Muscles">
- Músculos normais
- </string>
<string name="Right Part">
Parte direita
</string>
@@ -2762,9 +2804,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Round">
Arredondado
</string>
- <string name="Round Forehead">
- Testa arredonda
- </string>
<string name="Ruddiness">
Rubor
</string>
@@ -2777,24 +2816,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Saddle Bags">
Saddle Bags
</string>
- <string name="Saddlebags">
- Saddlebags
- </string>
- <string name="Scrawny">
- Magricela
- </string>
<string name="Scrawny Leg">
Pernas magricelas
</string>
<string name="Separate">
Separar
</string>
- <string name="Shading">
- Sombreamento
- </string>
- <string name="Shadow hair">
- Sombra do cabelo
- </string>
<string name="Shallow">
raso
</string>
@@ -2807,15 +2834,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Shear Front">
Frente rente
</string>
- <string name="Shear Left">
- Rente esquerda
- </string>
<string name="Shear Left Up">
Esquerda rente para cima
</string>
- <string name="Shear Right">
- Direita rente
- </string>
<string name="Shear Right Up">
Trás rente para cima
</string>
@@ -2876,15 +2897,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Shoulders">
Ombros
</string>
- <string name="Side Bangs">
- Franja lateral
- </string>
- <string name="Side Bangs Down">
- Franja lateral longa
- </string>
- <string name="Side Bangs Up">
- Franja lateral arrepiada
- </string>
<string name="Side Fringe">
pontas laterais
</string>
@@ -2900,9 +2912,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Sides Hair Up">
Cabelo lateral superior
</string>
- <string name="Skinny">
- Magro
- </string>
<string name="Skinny Neck">
Pescoço fino
</string>
@@ -2951,9 +2960,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Socks Length">
Comprimento das meias
</string>
- <string name="Some">
- Alguns
- </string>
<string name="Soulpatch">
Cavanhaque
</string>
@@ -2972,9 +2978,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Squash Head">
Cabeça de Pera
</string>
- <string name="Squash/Stretch Head">
- Cabeça esticada/forma de pera
- </string>
<string name="Stretch Head">
Cabeça esticada
</string>
@@ -2993,18 +2996,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Sweep Forward">
Pentear para frente
</string>
- <string name="Swept Back">
- Pentear para trás
- </string>
- <string name="Swept Back Hair">
- Cabelo penteado para trás
- </string>
- <string name="Swept Forward">
- Penteado para frente
- </string>
- <string name="Swept Forward Hair">
- Cabelo penteado para frente
- </string>
<string name="Tall">
Alto
</string>
@@ -3023,9 +3014,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Thick Toe">
Dedo grosso
</string>
- <string name="Thickness">
- Espessura
- </string>
<string name="Thin">
Fino
</string>
@@ -3056,12 +3044,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Tight Sleeves">
Tight Sleeves
</string>
- <string name="Tilt Left">
- Inclinado à esquerda
- </string>
- <string name="Tilt Right">
- Inclinado à direita
- </string>
<string name="Toe Shape">
Formato dos dedos
</string>
@@ -3203,6 +3185,21 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="IM_moderator_label">
(Moderador)
</string>
+ <string name="started_call">
+ Iniciou uma ligação de voz
+ </string>
+ <string name="joined_call">
+ Entrou na ligação
+ </string>
+ <string name="ringing-im">
+ Entrando em ligação de voz...
+ </string>
+ <string name="connected-im">
+ Conectado. Para sair, clique em Desligar
+ </string>
+ <string name="hang_up-im">
+ Saiu da ligação de voz
+ </string>
<string name="only_user_message">
Você é o único usuário desta sessão.
</string>
@@ -3212,6 +3209,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="invite_message">
Clique no botão [BUTTON NAME] para aceitar/ conectar a este bate-papo em voz.
</string>
+ <string name="muted_message">
+ Você bloqueou este residente. Se quiser retirar o bloqueio, basta enviar uma mensagem.
+ </string>
+ <string name="generic">
+ Erro de solicitação, tente novamente mais tarde.
+ </string>
<string name="generic_request_error">
Erro na requisição, por favor, tente novamente.
</string>
@@ -3230,19 +3233,37 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="not_a_mod_error">
Você não é um moderador de sessão.
</string>
+ <string name="muted">
+ Bate-papo de texto desativado por um moderador.
+ </string>
<string name="muted_error">
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].
</string>
+ <string name="message">
+ Não foi possÃvel enviar sua mensagem para o bate-papo com [RECIPIENT].
+ </string>
<string name="message_session_event">
Não foi possÃvel enviar sua mensagem na sessão de bate- papo com [RECIPIENT].
</string>
+ <string name="mute">
+ Erro durante a moderação.
+ </string>
+ <string name="removed">
+ Você foi tirado do grupo.
+ </string>
<string name="removed_from_group">
Você foi removido do grupo.
</string>
<string name="close_on_no_ability">
Você não possui mais a habilidade de estar na sessão de bate-papo.
</string>
+ <string name="unread_chat_single">
+ [SOURCES] disse alguma coisa
+ </string>
+ <string name="unread_chat_multiple">
+ [SOURCES] disseram alguma coisa
+ </string>
</strings>
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp
index 0ff53f3e00b0a5602697a469e54db6aede109543..6b275bbcad7963eaf4fce8acf5bf01e4673ce327 100644
--- a/indra/test_apps/llplugintest/llmediaplugintest.cpp
+++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp
@@ -66,11 +66,11 @@ static void gluiCallbackWrapper( int control_id );
static bool isTexture( GLuint texture )
{
bool result = false;
-
+
// glIsTexture will sometimes return false for real textures... do this instead.
if(texture != 0)
result = true;
-
+
return result;
}
@@ -95,24 +95,24 @@ mediaPanel::~mediaPanel()
glDeleteTextures( 1, &mPickTextureHandle );
mPickTextureHandle = 0;
}
-
+
if ( isTexture( mMediaTextureHandle ) )
{
std::cerr << "remMediaPanel: deleting media texture " << mMediaTextureHandle << std::endl;
glDeleteTextures( 1, &mMediaTextureHandle );
mMediaTextureHandle = 0;
}
-
+
if(mPickTexturePixels)
{
delete mPickTexturePixels;
}
-
+
if(mMediaSource)
{
delete mMediaSource;
}
-
+
}
////////////////////////////////////////////////////////////////////////////////
@@ -128,6 +128,7 @@ LLMediaPluginTest::LLMediaPluginTest( int app_window, int window_width, int wind
mCurMouseY( 0 ),
mFuzzyMedia( true ),
mSelectedPanel( 0 ),
+ mDistanceCameraToSelectedGeometry( 0.0f ),
mMediaBrowserControlEnableCookies( 0 ),
mMediaBrowserControlBackButton( 0 ),
mMediaBrowserControlForwardButton( 0 ),
@@ -151,7 +152,7 @@ LLMediaPluginTest::LLMediaPluginTest( int app_window, int window_width, int wind
//mBookmarks.push_back( std::pair< std::string, std::string >( "description", "url" ) );
// read bookmarks from file.
- // note: uses command in ./CmakeLists.txt which copies bookmmarks file from source directory
+ // note: uses command in ./CmakeLists.txt which copies bookmmarks file from source directory
// to app directory (WITHOUT build configuration dir) (this is cwd in Windows within MSVC)
// For example, test_apps\llplugintest and not test_apps\llplugintest\Release
// This may need to be changed for Mac/Linux builds.
@@ -193,7 +194,7 @@ LLMediaPluginTest::LLMediaPluginTest( int app_window, int window_width, int wind
// initialize linden lab APR module
ll_init_apr();
- // Set up llerror logging
+ // Set up llerror logging
{
LLError::initForApplication(".");
LLError::setDefaultLevel(LLError::LEVEL_INFO);
@@ -273,7 +274,7 @@ void LLMediaPluginTest::reshape( int width, int height )
void LLMediaPluginTest::bindTexture(GLuint texture, GLint row_length, GLint alignment)
{
glEnable( GL_TEXTURE_2D );
-
+
glBindTexture( GL_TEXTURE_2D, texture );
glPixelStorei( GL_UNPACK_ROW_LENGTH, row_length );
glPixelStorei( GL_UNPACK_ALIGNMENT, alignment );
@@ -285,27 +286,57 @@ bool LLMediaPluginTest::checkGLError(const char *name)
{
bool result = false;
GLenum error = glGetError();
-
+
if(error != GL_NO_ERROR)
{
// For some reason, glGenTextures is returning GL_INVALID_VALUE...
std::cout << name << " ERROR 0x" << std::hex << error << std::dec << std::endl;
result = true;
}
-
+
return result;
}
////////////////////////////////////////////////////////////////////////////////
//
-void LLMediaPluginTest::drawGeometry( int panel )
+GLfloat LLMediaPluginTest::distanceToCamera( GLfloat point_x, GLfloat point_y, GLfloat point_z )
+{
+ GLdouble camera_pos_x = 0.0f;
+ GLdouble camera_pos_y = 0.0f;
+ GLdouble camera_pos_z = 0.0f;
+
+ GLdouble modelMatrix[16];
+ GLdouble projMatrix[16];
+ int viewport[4];
+
+ glGetDoublev(GL_MODELVIEW_MATRIX, modelMatrix);
+ glGetDoublev(GL_PROJECTION_MATRIX, projMatrix);
+ glGetIntegerv(GL_VIEWPORT, viewport);
+
+ gluUnProject(
+ (viewport[2]-viewport[0])/2 , (viewport[3]-viewport[1])/2,
+ 0.0,
+ modelMatrix, projMatrix, viewport,
+ &camera_pos_x, &camera_pos_y, &camera_pos_z );
+
+ GLfloat distance =
+ sqrt( ( camera_pos_x - point_x ) * ( camera_pos_x - point_x ) +
+ ( camera_pos_y - point_y ) * ( camera_pos_y - point_y ) +
+ ( camera_pos_z - point_z ) * ( camera_pos_z - point_z ) );
+
+ return distance;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLMediaPluginTest::drawGeometry( int panel, bool selected )
{
// texture coordinates for each panel
GLfloat non_opengl_texture_coords[ 8 ] = { 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f };
GLfloat opengl_texture_coords[ 8 ] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f };
-
+
GLfloat *texture_coords = mMediaPanels[ panel ]->mAppTextureCoordsOpenGL?opengl_texture_coords:non_opengl_texture_coords;
-
+
// base coordinates for each panel
GLfloat base_vertex_pos[ 8 ] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f };
@@ -316,31 +347,35 @@ void LLMediaPluginTest::drawGeometry( int panel )
const int panel_x = ( panel / num_rows );
const int panel_y = ( panel % num_rows );
- const float spacing = 0.1f;
+ // default spacing is small - make it larger if checkbox set - for testing positional audio
+ float spacing = 0.1f;
+ if ( mLargePanelSpacing )
+ spacing = 2.0f;
+
const GLfloat offset_x = num_cols * ( 1.0 + spacing ) / 2;
const GLfloat offset_y = num_rows * ( 1.0 + spacing ) / 2;
-
+
// Adjust for media aspect ratios
- {
+ {
float aspect = 1.0f;
if(mMediaPanels[ panel ]->mMediaHeight != 0)
{
aspect = (float)mMediaPanels[ panel ]->mMediaWidth / (float)mMediaPanels[ panel ]->mMediaHeight;
}
-
+
if(aspect > 1.0f)
{
// media is wider than it is high -- adjust the top and bottom in
for( int corner = 0; corner < 4; ++corner )
{
float temp = base_vertex_pos[corner * 2 + 1];
-
+
if(temp < 0.5f)
temp += 0.5 - (0.5f / aspect);
else
temp -= 0.5 - (0.5f / aspect);
-
+
base_vertex_pos[corner * 2 + 1] = temp;
}
}
@@ -350,7 +385,7 @@ void LLMediaPluginTest::drawGeometry( int panel )
for( int corner = 0; corner < 4; ++corner )
{
float temp = base_vertex_pos[corner * 2];
-
+
if(temp < 0.5f)
temp += 0.5f - (0.5f * aspect);
else
@@ -371,6 +406,15 @@ void LLMediaPluginTest::drawGeometry( int panel )
glVertex3f( x, y, 0.0f );
};
glEnd();
+
+ // calculate distance to this panel if it's selected
+ if ( selected )
+ {
+ GLfloat point_x = base_vertex_pos[ 0 ] + panel_x * ( 1.0 + spacing ) - offset_x + spacing / 2.0f;
+ GLfloat point_y = base_vertex_pos[ 0 + 1 ] + panel_y * ( 1.0 + spacing ) - offset_y + spacing / 2.0f;
+ GLfloat point_z = 0.0f;
+ mDistanceCameraToSelectedGeometry = distanceToCamera( point_x, point_y, point_z );
+ };
}
//////////////////////////////////////////////////////////////////////////////
@@ -403,7 +447,7 @@ void LLMediaPluginTest::draw( int draw_type )
if ( draw_type == DrawTypePickTexture )
{
// only bother with pick if we have something to render
- // Actually, we need to pick even if we're not ready to render.
+ // Actually, we need to pick even if we're not ready to render.
// Otherwise you can't select and remove a panel which has gone bad.
//if ( mMediaPanels[ panel ]->mReadyToRender )
{
@@ -420,7 +464,7 @@ void LLMediaPluginTest::draw( int draw_type )
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
// draw geometry using pick texture
- drawGeometry( panel );
+ drawGeometry( panel, false );
glMatrixMode( GL_TEXTURE );
glPopMatrix();
@@ -431,13 +475,13 @@ void LLMediaPluginTest::draw( int draw_type )
{
bool texture_valid = false;
bool plugin_exited = false;
-
+
if(mMediaPanels[ panel ]->mMediaSource)
{
texture_valid = mMediaPanels[ panel ]->mMediaSource->textureValid();
plugin_exited = mMediaPanels[ panel ]->mMediaSource->isPluginExited();
}
-
+
// save texture matrix (changes for each panel)
glMatrixMode( GL_TEXTURE );
glPushMatrix();
@@ -465,14 +509,14 @@ void LLMediaPluginTest::draw( int draw_type )
mMediaPanels[ panel ]->mTextureScaleY,
1.0f );
};
-
+
float intensity = plugin_exited?0.25f:1.0f;
-
+
// highlight the selected panel
if ( mSelectedPanel && ( mMediaPanels[ panel ]->mId == mSelectedPanel->mId ) )
{
startPanelHighlight( intensity, intensity, 0.0f, 5.0f );
- drawGeometry( panel );
+ drawGeometry( panel, true );
endPanelHighlight();
}
else
@@ -481,21 +525,21 @@ void LLMediaPluginTest::draw( int draw_type )
if ( !mMediaPanels[ panel ]->mReadyToRender )
{
startPanelHighlight( intensity, 0.0f, 0.0f, 2.0f );
- drawGeometry( panel );
+ drawGeometry( panel, false );
endPanelHighlight();
}
else
- // just display a border around the media
+ // just display a border around the media
{
startPanelHighlight( 0.0f, intensity, 0.0f, 2.0f );
- drawGeometry( panel );
+ drawGeometry( panel, false );
endPanelHighlight();
};
-
+
if ( mMediaPanels[ panel ]->mReadyToRender && texture_valid )
{
// draw visual geometry
- drawGeometry( panel );
+ drawGeometry( panel, false );
}
// restore texture matrix (changes for each panel)
@@ -551,7 +595,7 @@ void LLMediaPluginTest::idle()
// GLUI requires this
if ( glutGetWindow() != mAppWindow )
glutSetWindow( mAppWindow );
-
+
// random creation/destruction of panels enabled?
const time_t panel_timeout_time = 5;
if ( mRandomPanelCount )
@@ -704,7 +748,7 @@ void LLMediaPluginTest::idle()
for( int panel_index = 0; panel_index < (int)mMediaPanels.size(); ++panel_index )
{
mediaPanel *panel = mMediaPanels[ panel_index ];
-
+
// call plugins idle function so it can potentially update itself
panel->mMediaSource->idle();
@@ -717,7 +761,7 @@ void LLMediaPluginTest::idle()
//std::cout << "texture invalid, skipping update..." << std::endl;
}
else
- if ( panel &&
+ if ( panel &&
( panel->mMediaWidth != panel->mMediaSource->getWidth() ||
panel->mMediaHeight != panel->mMediaSource->getHeight() ) )
{
@@ -733,7 +777,7 @@ void LLMediaPluginTest::idle()
int y_offset = dirty_rect.mBottom;
int width = dirty_rect.mRight - dirty_rect.mLeft;
int height = dirty_rect.mTop - dirty_rect.mBottom;
-
+
if((dirty_rect.mRight <= panel->mTextureWidth) && (dirty_rect.mTop <= panel->mTextureHeight))
{
// Offset the pixels pointer properly
@@ -752,23 +796,23 @@ void LLMediaPluginTest::idle()
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
};
-
+
checkGLError("glTexParameteri");
-
+
if(panel->mMediaSource->getTextureFormatSwapBytes())
{
glPixelStorei(GL_UNPACK_SWAP_BYTES, 1);
checkGLError("glPixelStorei");
}
-
+
// draw portion that changes into texture
- glTexSubImage2D( GL_TEXTURE_2D, 0,
- x_offset,
+ glTexSubImage2D( GL_TEXTURE_2D, 0,
+ x_offset,
y_offset,
- width,
+ width,
height,
- panel->mMediaSource->getTextureFormatPrimary(),
- panel->mMediaSource->getTextureFormatType(),
+ panel->mMediaSource->getTextureFormatPrimary(),
+ panel->mMediaSource->getTextureFormatType(),
pixels );
if(checkGLError("glTexSubImage2D"))
@@ -788,9 +832,9 @@ void LLMediaPluginTest::idle()
glPixelStorei(GL_UNPACK_SWAP_BYTES, 0);
checkGLError("glPixelStorei");
}
-
+
panel->mMediaSource->resetDirty();
-
+
panel->mReadyToRender = true;
}
else
@@ -811,8 +855,8 @@ void LLMediaPluginTest::idle()
////////////////////////////////////////////////////////////////////////////////
//
-void LLMediaPluginTest::windowPosToTexturePos( int window_x, int window_y,
- int& media_x, int& media_y,
+void LLMediaPluginTest::windowPosToTexturePos( int window_x, int window_y,
+ int& media_x, int& media_y,
int& id )
{
if ( ! mSelectedPanel )
@@ -828,7 +872,7 @@ void LLMediaPluginTest::windowPosToTexturePos( int window_x, int window_y,
// OpenGL app == coordinate system this way
// NOTE: unrelated to settings in plugin - this
// is just for this app
- mCurMouseY = mWindowHeight - window_y;
+ mCurMouseY = mWindowHeight - window_y;
// extract x (0..1023, y (0..1023) and id (0..15) from RGB components
unsigned long pixel_read_color_bits = ( mPixelReadColor[ 0 ] << 16 ) | ( mPixelReadColor[ 1 ] << 8 ) | mPixelReadColor[ 2 ];
@@ -880,14 +924,14 @@ void LLMediaPluginTest::selectPanel( mediaPanel* panel )
mSelectedPanel->mMediaSource->setVolume( 0.0f );
mSelectedPanel->mMediaSource->setPriority( LLPluginClassMedia::PRIORITY_LOW );
};
-
+
mSelectedPanel = panel;
if( mSelectedPanel && mSelectedPanel->mMediaSource )
{
mSelectedPanel->mMediaSource->setVolume( (float)mMediaTimeControlVolume / 100.0f );
mSelectedPanel->mMediaSource->setPriority( LLPluginClassMedia::PRIORITY_NORMAL );
-
+
if(!mSelectedPanel->mStartUrl.empty())
{
mUrlEdit->set_text(const_cast<char*>(mSelectedPanel->mStartUrl.c_str()) );
@@ -900,7 +944,7 @@ void LLMediaPluginTest::selectPanel( mediaPanel* panel )
mediaPanel* LLMediaPluginTest::findMediaPanel( LLPluginClassMedia* source )
{
mediaPanel *result = NULL;
-
+
for( int panel = 0; panel < (int)mMediaPanels.size(); ++panel )
{
if ( mMediaPanels[ panel ]->mMediaSource == source )
@@ -908,7 +952,7 @@ mediaPanel* LLMediaPluginTest::findMediaPanel( LLPluginClassMedia* source )
result = mMediaPanels[ panel ];
}
}
-
+
return result;
}
@@ -1066,7 +1110,7 @@ void LLMediaPluginTest::gluiCallback( int control_id )
{
if ( mSelectedPanel )
{
- // get value from spinner
+ // get value from spinner
float seconds_to_seek = mMediaTimeControlSeekSeconds;
mSelectedPanel->mMediaSource->seek( seconds_to_seek );
mSelectedPanel->mMediaSource->start();
@@ -1194,7 +1238,7 @@ void LLMediaPluginTest::mouseButton( int button, int state, int x, int y )
windowPosToTexturePos( x, y, media_x, media_y, id );
// only select a panel if we're on a panel
- // (HACK: strictly speaking this rules out clicking on
+ // (HACK: strictly speaking this rules out clicking on
// the origin of a panel but that's very unlikely)
if ( media_x > 0 && media_y > 0 )
{
@@ -1327,18 +1371,18 @@ void LLMediaPluginTest::makeChrome()
mGluiMediaTimeControlWindow->add_column( false );
mIdMediaTimeControlVolume = start_id++;
GLUI_Spinner* spinner = mGluiMediaTimeControlWindow->add_spinner( "Volume", 2, &mMediaTimeControlVolume, mIdMediaTimeControlVolume, gluiCallbackWrapper);
- spinner->set_float_limits( 0, 100 );
+ spinner->set_float_limits( 0, 100 );
mGluiMediaTimeControlWindow->add_column( true );
mIdMediaTimeControlSeekSeconds = start_id++;
spinner = mGluiMediaTimeControlWindow->add_spinner( "", 2, &mMediaTimeControlSeekSeconds, mIdMediaTimeControlSeekSeconds, gluiCallbackWrapper);
- spinner->set_float_limits( 0, 200 );
+ spinner->set_float_limits( 0, 200 );
spinner->set_w( 32 );
spinner->set_speed( 0.025f );
mGluiMediaTimeControlWindow->add_column( false );
mIdMediaTimeControlSeek = start_id++;
mGluiMediaTimeControlWindow->add_button( "SEEK", mIdMediaTimeControlSeek, gluiCallbackWrapper );
mGluiMediaTimeControlWindow->add_column( false );
-
+
// top window - media controls for "browser" media types (e.g. web browser)
mGluiMediaBrowserControlWindow = GLUI_Master.create_glui_subwindow( mAppWindow, GLUI_SUBWINDOW_TOP );
@@ -1385,6 +1429,13 @@ void LLMediaPluginTest::makeChrome()
mDisableTimeout = 0;
glui_window_misc_control->add_checkbox( "Disable plugin timeout", &mDisableTimeout, mIdDisableTimeout, gluiCallbackWrapper );
glui_window_misc_control->set_main_gfx_window( mAppWindow );
+ glui_window_misc_control->add_column( true );
+
+ mIdLargePanelSpacing = start_id++;
+ mLargePanelSpacing = 0;
+ glui_window_misc_control->add_checkbox( "Large Panel Spacing", &mLargePanelSpacing, mIdLargePanelSpacing, gluiCallbackWrapper );
+ glui_window_misc_control->set_main_gfx_window( mAppWindow );
+ glui_window_misc_control->add_column( true );
// bottom window - status
mBottomGLUIWindow = GLUI_Master.create_glui_subwindow( mAppWindow, GLUI_SUBWINDOW_BOTTOM );
@@ -1449,7 +1500,7 @@ void LLMediaPluginTest::makePickTexture( int id, GLuint* texture_handle, unsigne
//
std::string LLMediaPluginTest::mimeTypeFromUrl( std::string& url )
{
- // default to web
+ // default to web
std::string mime_type = "text/html";
// we may need a more advanced MIME type accessor later :-)
@@ -1479,7 +1530,7 @@ std::string LLMediaPluginTest::pluginNameFromMimeType( std::string& mime_type )
else
if ( mime_type == "text/html" )
plugin_name = "media_plugin_webkit.dylib";
-
+
#elif LL_WINDOWS
std::string plugin_name( "media_plugin_null.dll" );
@@ -1523,7 +1574,7 @@ void LLMediaPluginTest::addMediaPanel( std::string url )
// tell the plugin what size we asked for
media_source->setSize( media_width, media_height );
- // Use the launcher start and initialize the plugin
+ // Use the launcher start and initialize the plugin
#if LL_DARWIN || LL_LINUX
std::string launcher_name( "SLPlugin" );
#elif LL_WINDOWS
@@ -1580,7 +1631,7 @@ void LLMediaPluginTest::addMediaPanel( std::string url )
// id wasn't found so we can use it
if ( ! id_exists )
{
- panel->mId = nid;
+ panel->mId = nid;
break;
};
};
@@ -1592,7 +1643,7 @@ void LLMediaPluginTest::addMediaPanel( std::string url )
}
else
{
- // now we have the ID we can use it to make the
+ // now we have the ID we can use it to make the
// pick texture (id is baked into texture pixels)
makePickTexture( panel->mId, &panel->mPickTextureHandle, &panel->mPickTexturePixels );
@@ -1615,17 +1666,17 @@ void LLMediaPluginTest::addMediaPanel( std::string url )
void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel )
{
// checkGLError("LLMediaPluginTest::updateMediaPanel");
-
- if ( ! panel )
+
+ if ( ! panel )
return;
-
+
if(!panel->mMediaSource || !panel->mMediaSource->textureValid())
{
panel->mReadyToRender = false;
return;
}
-
- // take a reference copy of the plugin values since they
+
+ // take a reference copy of the plugin values since they
// might change during this lifetime of this function
int plugin_media_width = panel->mMediaSource->getWidth();
int plugin_media_height = panel->mMediaSource->getHeight();
@@ -1633,18 +1684,18 @@ void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel )
int plugin_texture_height = panel->mMediaSource->getBitsHeight();
// If the texture isn't created or the media or texture dimensions changed AND
- // the sizes are valid then we need to delete the old media texture (if necessary)
+ // the sizes are valid then we need to delete the old media texture (if necessary)
// then make a new one.
if ((panel->mMediaTextureHandle == 0 ||
panel->mMediaWidth != plugin_media_width ||
- panel->mMediaHeight != plugin_media_height ||
+ panel->mMediaHeight != plugin_media_height ||
panel->mTextureWidth != plugin_texture_width ||
panel->mTextureHeight != plugin_texture_height) &&
- ( plugin_media_width > 0 && plugin_media_height > 0 &&
+ ( plugin_media_width > 0 && plugin_media_height > 0 &&
plugin_texture_width > 0 && plugin_texture_height > 0 ) )
{
- std::cout << "Valid media size (" << plugin_media_width << " x " << plugin_media_height
- << ") and texture size (" << plugin_texture_width << " x " << plugin_texture_height
+ std::cout << "Valid media size (" << plugin_media_width << " x " << plugin_media_height
+ << ") and texture size (" << plugin_texture_width << " x " << plugin_texture_height
<< ") for panel with ID=" << panel->mId << " - making texture" << std::endl;
// delete old GL texture
@@ -1654,13 +1705,13 @@ void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel )
glDeleteTextures( 1, &panel->mMediaTextureHandle );
panel->mMediaTextureHandle = 0;
}
-
+
std::cerr << "before: pick texture is " << panel->mPickTextureHandle << ", media texture is " << panel->mMediaTextureHandle << std::endl;
-
+
// make a GL texture based on the dimensions the plugin told us
GLuint new_texture = 0;
glGenTextures( 1, &new_texture );
-
+
checkGLError("glGenTextures");
std::cout << "glGenTextures returned " << new_texture << std::endl;
@@ -1679,7 +1730,7 @@ void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel )
std::cerr << "after: pick texture is " << panel->mPickTextureHandle << ", media texture is " << panel->mMediaTextureHandle << std::endl;
};
-
+
// update our record of the media and texture dimensions
// NOTE: do this after we we check for sizes changes
panel->mMediaWidth = plugin_media_width;
@@ -1699,7 +1750,7 @@ void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel )
panel->mAppTextureCoordsOpenGL = panel->mMediaSource->getTextureCoordsOpenGL();
// Check to see if we have enough to render this panel.
- // If we do, set a flag that the display functions use so
+ // If we do, set a flag that the display functions use so
// they only render a panel with media if it's ready.
if ( panel->mMediaWidth < 0 ||
panel->mMediaHeight < 0 ||
@@ -1716,26 +1767,26 @@ void LLMediaPluginTest::updateMediaPanel( mediaPanel* panel )
void LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string url )
{
// no media panels so we can't change anything - have to add
- if ( mMediaPanels.size() == 0 )
+ if ( mMediaPanels.size() == 0 )
return;
// sanity check
- if ( ! panel )
+ if ( ! panel )
return;
-
+
int index;
for(index = 0; index < (int)mMediaPanels.size(); index++)
{
if(mMediaPanels[index] == panel)
break;
}
-
+
if(index >= (int)mMediaPanels.size())
{
// panel isn't in mMediaPanels
return;
}
-
+
std::cout << "Replacing media panel with index " << panel->mId << std::endl;
int panel_id = panel->mId;
@@ -1760,7 +1811,7 @@ void LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string url )
// tell the plugin what size we asked for
media_source->setSize( media_width, media_height );
- // Use the launcher start and initialize the plugin
+ // Use the launcher start and initialize the plugin
#if LL_DARWIN || LL_LINUX
std::string launcher_name( "SLPlugin" );
#elif LL_WINDOWS
@@ -1799,12 +1850,12 @@ void LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string url )
panel->mAppTextureCoordsOpenGL = false; // really need an 'undefined' state here too
panel->mReadyToRender = false;
- panel->mId = panel_id;
-
+ panel->mId = panel_id;
+
// Replace the entry in the panels array
mMediaPanels[index] = panel;
- // now we have the ID we can use it to make the
+ // now we have the ID we can use it to make the
// pick texture (id is baked into texture pixels)
makePickTexture( panel->mId, &panel->mPickTextureHandle, &panel->mPickTexturePixels );
@@ -1820,7 +1871,7 @@ void LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string url )
//
void LLMediaPluginTest::getRandomMediaSize( int& width, int& height, std::string mime_type )
{
- // Make a new media source with a random size which we'll either
+ // Make a new media source with a random size which we'll either
// directly or the media plugin will tell us what it wants later.
// Use a random size so we can test support for weird media sizes.
// (Almost everything else will get filled in later once the
@@ -1829,8 +1880,8 @@ void LLMediaPluginTest::getRandomMediaSize( int& width, int& height, std::string
width = ( ( rand() % 170 ) + 30 ) * 4;
height = ( ( rand() % 170 ) + 30 ) * 4;
- // adjust this random size if it's a browser so we get
- // a more useful size for testing..
+ // adjust this random size if it's a browser so we get
+ // a more useful size for testing..
if ( mime_type == "text/html" || mime_type == "example/example" )
{
width = ( ( rand() % 100 ) + 100 ) * 4;
@@ -1843,11 +1894,11 @@ void LLMediaPluginTest::getRandomMediaSize( int& width, int& height, std::string
void LLMediaPluginTest::remMediaPanel( mediaPanel* panel )
{
// always leave one panel
- if ( mMediaPanels.size() == 1 )
+ if ( mMediaPanels.size() == 1 )
return;
// sanity check - don't think this can happen but see above for a case where it might...
- if ( ! panel )
+ if ( ! panel )
return;
std::cout << "Removing media panel with index " << panel->mId << " - total panels = " << mMediaPanels.size() - 1 << std::endl;
@@ -1855,7 +1906,7 @@ void LLMediaPluginTest::remMediaPanel( mediaPanel* panel )
if(mSelectedPanel == panel)
mSelectedPanel = NULL;
- delete panel;
+ delete panel;
// remove from storage list
for( int i = 0; i < (int)mMediaPanels.size(); ++i )
@@ -1867,7 +1918,7 @@ void LLMediaPluginTest::remMediaPanel( mediaPanel* panel )
};
};
- // select the first panel
+ // select the first panel
selectPanel( mMediaPanels[ 0 ] );
}
@@ -1887,18 +1938,20 @@ void LLMediaPluginTest::updateStatusBar()
static bool cached_supports_browser_media = true;
static bool cached_supports_time_media = false;
static int cached_movie_time = -1;
+ static GLfloat cached_distance = -1.0f;
static std::string cached_plugin_version = "";
- if (
+ if (
cached_id == mSelectedPanel->mId &&
cached_media_width == mSelectedPanel->mMediaWidth &&
cached_media_height == mSelectedPanel->mMediaHeight &&
cached_texture_width == mSelectedPanel->mTextureWidth &&
cached_texture_height == mSelectedPanel->mTextureHeight &&
- cached_supports_browser_media == mSelectedPanel->mMediaSource->pluginSupportsMediaBrowser() &&
+ cached_supports_browser_media == mSelectedPanel->mMediaSource->pluginSupportsMediaBrowser() &&
cached_supports_time_media == mSelectedPanel->mMediaSource->pluginSupportsMediaTime() &&
cached_plugin_version == mSelectedPanel->mMediaSource->getPluginVersion() &&
- cached_movie_time == (int)mSelectedPanel->mMediaSource->getCurrentTime()
+ cached_movie_time == (int)mSelectedPanel->mMediaSource->getCurrentTime() &&
+ cached_distance == mDistanceCameraToSelectedGeometry
)
{
// nothing changed so don't spend time in this shitty function
@@ -1906,7 +1959,7 @@ void LLMediaPluginTest::updateStatusBar()
};
std::ostringstream stream( "" );
-
+
stream.str( "" );
stream.clear();
@@ -1927,7 +1980,15 @@ void LLMediaPluginTest::updateStatusBar()
stream << " x ";
stream << std::setw( 4 ) << std::setfill( '0' );
stream << mSelectedPanel->mTextureHeight;
+
stream << " | ";
+ stream << "Distance: ";
+ stream << std::setw( 6 );
+ stream << std::setprecision( 3 );
+ stream << std::setprecision( 3 );
+ stream << mDistanceCameraToSelectedGeometry;
+ stream << " | ";
+
if ( mSelectedPanel->mMediaSource->pluginSupportsMediaBrowser() )
stream << "BROWSER";
else
@@ -2005,7 +2066,7 @@ void LLMediaPluginTest::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent e
{
// Uncomment this to make things much, much quieter.
// return;
-
+
switch(event)
{
case MEDIA_EVENT_CONTENT_UPDATED:
@@ -2065,11 +2126,11 @@ void LLMediaPluginTest::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent e
case MEDIA_EVENT_CLICK_LINK_HREF:
std::cerr << "Media event: MEDIA_EVENT_CLICK_LINK_HREF, uri is " << self->getClickURL() << std::endl;
break;
-
+
case MEDIA_EVENT_CLICK_LINK_NOFOLLOW:
std::cerr << "Media event: MEDIA_EVENT_CLICK_LINK_NOFOLLOW, uri is " << self->getClickURL() << std::endl;
break;
-
+
case MEDIA_EVENT_PLUGIN_FAILED:
std::cerr << "Media event: MEDIA_EVENT_PLUGIN_FAILED" << std::endl;
break;
@@ -2195,13 +2256,13 @@ int main( int argc, char* argv[] )
glutSetWindow( app_window_handle );
gApplication = new LLMediaPluginTest( app_window_handle, app_window_width, app_window_height );
-
+
// update at approximately 60hz
int update_ms = 1000 / 60;
-
+
GLUI_Master.set_glutTimerFunc( update_ms, glutIdle, update_ms);
glutMainLoop();
-
+
delete gApplication;
}
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.h b/indra/test_apps/llplugintest/llmediaplugintest.h
index c2b2baba95ddad871c9b4a40bd994ac006cea7e6..e7c769934303651d63a97382bed79c6a6ee83f37 100644
--- a/indra/test_apps/llplugintest/llmediaplugintest.h
+++ b/indra/test_apps/llplugintest/llmediaplugintest.h
@@ -89,7 +89,7 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner
void bindTexture(GLuint texture, GLint row_length = 0, GLint alignment = 1);
bool checkGLError(const char *name = "OpenGL");
- void drawGeometry( int panel );
+ void drawGeometry( int panel, bool selected );
void startPanelHighlight( float red, float green, float blue, float line_width );
void endPanelHighlight();
enum { DrawTypePickTexture, DrawTypeMediaTexture };
@@ -113,6 +113,9 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner
void dumpPanelInfo();
void updateStatusBar();
+ GLfloat distanceToCamera( GLfloat point_x, GLfloat point_y, GLfloat point_z );
+
+
// Inherited from LLPluginClassMediaOwner
/*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, LLPluginClassMediaOwner::EMediaEvent);
@@ -142,6 +145,8 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner
float mViewPos[ 3 ];
float mViewRotation[ 16 ];
+ float mDistanceCameraToSelectedGeometry;
+
int mIdControlAddPanel;
int mIdControlRemPanel;
@@ -159,6 +164,8 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner
int mRandomBookmarks;
int mIdDisableTimeout;
int mDisableTimeout;
+ int mIdLargePanelSpacing;
+ int mLargePanelSpacing;
int mIdControlCrashPlugin;
int mIdControlHangPlugin;
int mIdControlExitApp;
diff --git a/install.xml b/install.xml
index 17091d65a63c819c76e7e6688ef735c7f453110d..3cd40d8893f857e915d61cb9b6516b890ca4f92d 100644
--- a/install.xml
+++ b/install.xml
@@ -974,9 +974,9 @@ anguage Infrstructure (CLI) international standard</string>
<key>linux</key>
<map>
<key>md5sum</key>
- <string>4c75b2f1e8524c7844ee3ea1cd59a3db</string>
+ <string>4b1913c509ea8bec78523960700d7005</string>
<key>url</key>
- <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100209b.tar.bz2</uri>
+ <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100304.tar.bz2</uri>
</map>
<key>windows</key>
<map>