summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/llui/llradiogroup.cpp8
-rw-r--r--indra/newview/llfloaterpreference.cpp25
-rw-r--r--indra/newview/llfolderviewitem.cpp21
-rw-r--r--indra/newview/llinventorybridge.cpp6
-rw-r--r--indra/newview/llinventorypanel.cpp3
-rw-r--r--indra/newview/llpanellandmarks.cpp10
-rw-r--r--indra/newview/llpanellandmarks.h4
-rw-r--r--indra/newview/llpanelobjectinventory.cpp2
-rw-r--r--indra/newview/llviewermenu.cpp3
-rw-r--r--indra/newview/llviewermessage.cpp2
-rw-r--r--indra/newview/llviewerparcelmedia.cpp49
-rw-r--r--indra/newview/llviewerparcelmediaautoplay.cpp18
-rw-r--r--indra/newview/llviewerstats.cpp6
-rw-r--r--indra/newview/llvoavatarself.cpp2
-rw-r--r--indra/newview/llworld.cpp3
-rw-r--r--indra/newview/llworldmapview.cpp6
-rw-r--r--indra/newview/res-sdl/ll_icon.BMPbin5174 -> 262198 bytes
-rw-r--r--indra/newview/res/ll_icon.pngbin73845 -> 29561 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/SL_Logo.pngbin973 -> 3999 bytes
-rw-r--r--indra/newview/skins/default/xui/de/panel_profile.xml6
-rw-r--r--indra/newview/skins/default/xui/en/floater_preferences.xml4
-rw-r--r--indra/newview/skins/default/xui/en/floater_tools.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_avatar_list_item.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_advanced.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_alerts.xml8
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_general.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_setup.xml10
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml7
-rw-r--r--indra/newview/skins/default/xui/fr/menu_avatar_self.xml4
-rw-r--r--indra/newview/skins/default/xui/fr/menu_inventory_add.xml4
-rw-r--r--indra/newview/skins/default/xui/fr/menu_viewer.xml4
-rw-r--r--indra/newview/skins/default/xui/fr/panel_edit_wearable.xml8
-rw-r--r--indra/newview/skins/default/xui/fr/panel_profile.xml4
-rw-r--r--indra/newview/skins/default/xui/it/strings.xml596
-rw-r--r--indra/newview/skins/default/xui/ja/floater_about_land.xml3
-rw-r--r--indra/newview/skins/default/xui/ja/panel_edit_pick.xml5
-rw-r--r--indra/newview/skins/default/xui/ja/panel_main_inventory.xml30
-rw-r--r--indra/newview/skins/default/xui/ja/panel_nearby_media.xml9
-rw-r--r--indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml3
-rw-r--r--indra/newview/skins/default/xui/ja/panel_preferences_chat.xml6
-rw-r--r--indra/newview/skins/default/xui/ja/strings.xml112
41 files changed, 609 insertions, 396 deletions
diff --git a/indra/llui/llradiogroup.cpp b/indra/llui/llradiogroup.cpp
index 4087b484aa..e27792dc1d 100644
--- a/indra/llui/llradiogroup.cpp
+++ b/indra/llui/llradiogroup.cpp
@@ -106,7 +106,6 @@ LLRadioGroup::LLRadioGroup(const LLRadioGroup::Params& p)
void LLRadioGroup::initFromParams(const Params& p)
{
- LLUICtrl::initFromParams(p);
for (LLInitParam::ParamIterator<ItemParams>::const_iterator it = p.items().begin();
it != p.items().end();
++it)
@@ -124,6 +123,9 @@ void LLRadioGroup::initFromParams(const Params& p)
LLRadioCtrl* item = LLUICtrlFactory::create<LLRadioCtrl>(item_params, this);
mRadioButtons.push_back(item);
}
+
+ // call this *after* setting up mRadioButtons so we can handle setValue() calls
+ LLUICtrl::initFromParams(p);
}
@@ -138,10 +140,6 @@ BOOL LLRadioGroup::postBuild()
{
mRadioButtons[0]->setTabStop(true);
}
- if (mControlVariable)
- {
- setSelectedIndex(mControlVariable->getValue().asInteger());
- }
return TRUE;
}
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 8bffe9bf57..e998d10fcc 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -110,6 +110,9 @@
const F32 MAX_USER_FAR_CLIP = 512.f;
const F32 MIN_USER_FAR_CLIP = 64.f;
+//control value for middle mouse as talk2push button
+const static std::string MIDDLE_MOUSE_CV = "MiddleMouse";
+
class LLVoiceSetKeyDialog : public LLModalDialog
{
public:
@@ -1008,9 +1011,17 @@ void LLFloaterPreference::setKey(KEY key)
void LLFloaterPreference::onClickSetMiddleMouse()
{
- childSetValue("modifier_combo", "MiddleMouse");
+ LLUICtrl* p2t_line_editor = getChild<LLUICtrl>("modifier_combo");
+
// update the control right away since we no longer wait for apply
- getChild<LLUICtrl>("modifier_combo")->onCommit();
+ p2t_line_editor->setControlValue(MIDDLE_MOUSE_CV);
+
+ //push2talk button "middle mouse" control value is in English, need to localize it for presentation
+ LLPanel* advanced_preferences = dynamic_cast<LLPanel*>(p2t_line_editor->getParent());
+ if (advanced_preferences)
+ {
+ p2t_line_editor->setValue(advanced_preferences->getString("middle_mouse"));
+ }
}
/*
void LLFloaterPreference::onClickSkipDialogs()
@@ -1302,6 +1313,16 @@ BOOL LLPanelPreference::postBuild()
getChild<LLCheckBoxCtrl>("voice_call_friends_only_check")->setCommitCallback(boost::bind(&showFriendsOnlyWarning, _1, _2));
}
+ // Panel Advanced
+ if (hasChild("modifier_combo"))
+ {
+ //localizing if push2talk button is set to middle mouse
+ if (MIDDLE_MOUSE_CV == childGetValue("modifier_combo").asString())
+ {
+ childSetValue("modifier_combo", getString("middle_mouse"));
+ }
+ }
+
apply();
return true;
}
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
index d3e3d2b57b..bb4c75d3ac 100644
--- a/indra/newview/llfolderviewitem.cpp
+++ b/indra/newview/llfolderviewitem.cpp
@@ -255,11 +255,30 @@ void LLFolderViewItem::refreshFromListener()
// temporary attempt to display the inventory folder in the user locale.
// mantipov: *NOTE: be sure this code is synchronized with LLFriendCardsManager::findChildFolderUUID
// it uses the same way to find localized string
- if (LLFolderType::lookupIsProtectedType(preferred_type))
+
+ // HACK: EXT - 6028 ([HARD CODED]? Inventory > Library > "Accessories" folder)
+ // Translation of Accessories folder in Library inventory folder
+ bool accessories = false;
+ if(mLabel == std::string("Accessories"))
+ {
+ //To ensure that Accessories folder is in Library we have to check its parent folder.
+ //Due to parent LLFolderViewFloder is not set to this item yet we have to check its parent via Inventory Model
+ LLInventoryCategory* cat = gInventory.getCategory(mListener->getUUID());
+ if(cat)
+ {
+ const LLUUID& parent_folder_id = cat->getParentUUID();
+ accessories = (parent_folder_id == gInventory.getLibraryRootFolderID());
+ }
+ }
+
+ //"Accessories" inventory category has folder type FT_NONE. So, this folder
+ //can not be detected as protected with LLFolderType::lookupIsProtectedType
+ if (accessories || LLFolderType::lookupIsProtectedType(preferred_type))
{
LLTrans::findString(mLabel, "InvFolder " + mLabel);
};
+ setToolTip(mLabel);
setIcon(mListener->getIcon());
time_t creation_date = mListener->getCreationDate();
if (mCreationDate != creation_date)
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index ceeffea1c9..1f918c72ea 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -3808,7 +3808,9 @@ std::string LLGestureBridge::getLabelSuffix() const
{
if( LLGestureManager::instance().isGestureActive(mUUID) )
{
- return LLItemBridge::getLabelSuffix() + " (active)";
+ LLStringUtil::format_map_t args;
+ args["[GESLABEL]"] = LLItemBridge::getLabelSuffix();
+ return LLTrans::getString("ActiveGesture", args);
}
else
{
@@ -4157,7 +4159,7 @@ std::string LLObjectBridge::getLabelSuffix() const
// e.g. "(worn on ...)" / "(attached to ...)"
LLStringUtil::format_map_t args;
- args["[ATTACHMENT_POINT]"] = attachment_point_name.c_str();
+ args["[ATTACHMENT_POINT]"] = LLTrans::getString(attachment_point_name);
return LLItemBridge::getLabelSuffix() + LLTrans::getString("WornOnAttachmentPoint", args);
}
else
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index ec83a1fd6d..d7720b735c 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -293,9 +293,6 @@ void LLInventoryPanel::modelChanged(U32 mask)
bridge->clearDisplayName();
view_item->refresh();
-
- // Set the new tooltip with the new display name.
- view_item->setToolTip(bridge->getDisplayName());
}
}
}
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 879fbba9cd..4842fcac38 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -534,7 +534,7 @@ void LLLandmarksPanel::initLandmarksInventoryPanel()
// subscribe to have auto-rename functionality while creating New Folder
mLandmarksInventoryPanel->setSelectCallback(boost::bind(&LLInventoryPanel::onSelectionChange, mLandmarksInventoryPanel, _1, _2));
- initAccordion("tab_landmarks", mLandmarksInventoryPanel, true);
+ mMyLandmarksAccordionTab = initAccordion("tab_landmarks", mLandmarksInventoryPanel, true);
}
void LLLandmarksPanel::initMyInventoryPanel()
@@ -588,7 +588,7 @@ void LLLandmarksPanel::initLandmarksPanel(LLPlacesInventoryPanel* inventory_list
inventory_list->saveFolderState();
}
-void LLLandmarksPanel::initAccordion(const std::string& accordion_tab_name, LLPlacesInventoryPanel* inventory_list, bool expand_tab)
+LLAccordionCtrlTab* LLLandmarksPanel::initAccordion(const std::string& accordion_tab_name, LLPlacesInventoryPanel* inventory_list, bool expand_tab)
{
LLAccordionCtrlTab* accordion_tab = getChild<LLAccordionCtrlTab>(accordion_tab_name);
@@ -596,6 +596,7 @@ void LLLandmarksPanel::initAccordion(const std::string& accordion_tab_name, LLPl
accordion_tab->setDropDownStateChangedCallback(
boost::bind(&LLLandmarksPanel::onAccordionExpandedCollapsed, this, _2, inventory_list));
accordion_tab->setDisplayChildren(expand_tab);
+ return accordion_tab;
}
void LLLandmarksPanel::onAccordionExpandedCollapsed(const LLSD& param, LLPlacesInventoryPanel* inventory_list)
@@ -776,6 +777,11 @@ void LLLandmarksPanel::onAddAction(const LLSD& userdata) const
//in case My Landmarks tab is completely empty (thus cannot be determined as being selected)
menu_create_inventory_item(mLandmarksInventoryPanel->getRootFolder(), NULL, LLSD("category"),
gInventory.findCategoryUUIDForType(LLFolderType::FT_LANDMARK));
+
+ if (mMyLandmarksAccordionTab)
+ {
+ mMyLandmarksAccordionTab->changeOpenClose(false);
+ }
}
}
}
diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h
index 2b46ba9933..c9217a4b2f 100644
--- a/indra/newview/llpanellandmarks.h
+++ b/indra/newview/llpanellandmarks.h
@@ -112,7 +112,7 @@ private:
void initMyInventoryPanel();
void initLibraryInventoryPanel();
void initLandmarksPanel(LLPlacesInventoryPanel* inventory_list);
- void initAccordion(const std::string& accordion_tab_name, LLPlacesInventoryPanel* inventory_list, bool expand_tab);
+ LLAccordionCtrlTab* initAccordion(const std::string& accordion_tab_name, LLPlacesInventoryPanel* inventory_list, bool expand_tab);
void onAccordionExpandedCollapsed(const LLSD& param, LLPlacesInventoryPanel* inventory_list);
void deselectOtherThan(const LLPlacesInventoryPanel* inventory_list);
@@ -169,6 +169,8 @@ private:
typedef std::vector<LLAccordionCtrlTab*> accordion_tabs_t;
accordion_tabs_t mAccordionTabs;
+
+ LLAccordionCtrlTab* mMyLandmarksAccordionTab;
};
#endif //LL_LLPANELLANDMARKS_H
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 9e92ee337f..7505581904 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -1578,7 +1578,7 @@ void LLPanelObjectInventory::reset()
p.title = "task inventory";
p.task_id = getTaskUUID();
p.parent_panel = this;
- p.tool_tip= p.name;
+ p.tool_tip= LLTrans::getString("PanelContentsTooltip");
mFolders = LLUICtrlFactory::create<LLFolderView>(p);
// this ensures that we never say "searching..." or "no items found"
mFolders->getFilter()->setShowFolderState(LLInventoryFilter::SHOW_ALL_FOLDERS);
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 1d58daba2c..5c40d02f8d 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -86,6 +86,7 @@
#include "lltoolmgr.h"
#include "lltoolpie.h"
#include "lltoolselectland.h"
+#include "lltrans.h"
#include "llviewergenericmessage.h"
#include "llviewerhelp.h"
#include "llviewermenufile.h" // init_menu_file()
@@ -7047,7 +7048,7 @@ LLVOAvatar* find_avatar_from_object( const LLUUID& object_id )
void handle_disconnect_viewer(void *)
{
- LLAppViewer::instance()->forceDisconnect("Testing viewer disconnect");
+ LLAppViewer::instance()->forceDisconnect(LLTrans::getString("TestingDisconnect"));
}
void force_error_breakpoint(void *)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index eed3f25231..bd0012057c 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3080,7 +3080,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
<< x << ":" << y
<< " current pos " << gAgent.getPositionGlobal()
<< LL_ENDL;
- LLAppViewer::instance()->forceDisconnect("You were sent to an invalid region.");
+ LLAppViewer::instance()->forceDisconnect(LLTrans::getString("SentToInvalidRegion"));
return;
}
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp
index 2c5c0a37e8..b967436df6 100644
--- a/indra/newview/llviewerparcelmedia.cpp
+++ b/indra/newview/llviewerparcelmedia.cpp
@@ -210,25 +210,29 @@ void LLViewerParcelMedia::play(LLParcel* parcel)
// A new impl will be created below.
}
}
-
- if(!sMediaImpl)
+
+ // Don't ever try to play if the media type is set to "none/none"
+ if(stricmp(mime_type.c_str(), "none/none") != 0)
{
- LL_DEBUGS("Media") << "new media impl with mime type " << mime_type << ", url " << media_url << LL_ENDL;
-
- // There is no media impl, make a new one
- sMediaImpl = LLViewerMedia::newMediaImpl(
- placeholder_texture_id,
- media_width,
- media_height,
- media_auto_scale,
- media_loop);
- sMediaImpl->setIsParcelMedia(true);
- sMediaImpl->navigateTo(media_url, mime_type, true);
- }
+ if(!sMediaImpl)
+ {
+ LL_DEBUGS("Media") << "new media impl with mime type " << mime_type << ", url " << media_url << LL_ENDL;
+
+ // There is no media impl, make a new one
+ sMediaImpl = LLViewerMedia::newMediaImpl(
+ placeholder_texture_id,
+ media_width,
+ media_height,
+ media_auto_scale,
+ media_loop);
+ sMediaImpl->setIsParcelMedia(true);
+ sMediaImpl->navigateTo(media_url, mime_type, true);
+ }
- //LLFirstUse::useMedia();
+ //LLFirstUse::useMedia();
- LLViewerParcelMediaAutoPlay::playStarted();
+ LLViewerParcelMediaAutoPlay::playStarted();
+ }
}
// static
@@ -312,11 +316,14 @@ std::string LLViewerParcelMedia::getURL()
if(sMediaImpl.notNull())
url = sMediaImpl->getMediaURL();
- if (url.empty())
- url = LLViewerParcelMgr::getInstance()->getAgentParcel()->getMediaCurrentURL();
-
- if (url.empty())
- url = LLViewerParcelMgr::getInstance()->getAgentParcel()->getMediaURL();
+ if(stricmp(LLViewerParcelMgr::getInstance()->getAgentParcel()->getMediaType().c_str(), "none/none") != 0)
+ {
+ if (url.empty())
+ url = LLViewerParcelMgr::getInstance()->getAgentParcel()->getMediaCurrentURL();
+
+ if (url.empty())
+ url = LLViewerParcelMgr::getInstance()->getAgentParcel()->getMediaURL();
+ }
return url;
}
diff --git a/indra/newview/llviewerparcelmediaautoplay.cpp b/indra/newview/llviewerparcelmediaautoplay.cpp
index ad2723b66b..f55d6d89c4 100644
--- a/indra/newview/llviewerparcelmediaautoplay.cpp
+++ b/indra/newview/llviewerparcelmediaautoplay.cpp
@@ -86,6 +86,7 @@ BOOL LLViewerParcelMediaAutoPlay::tick()
LLParcel *this_parcel = NULL;
LLViewerRegion *this_region = NULL;
std::string this_media_url;
+ std::string this_media_type;
LLUUID this_media_texture_id;
S32 this_parcel_id = 0;
LLUUID this_region_id;
@@ -101,7 +102,9 @@ BOOL LLViewerParcelMediaAutoPlay::tick()
if (this_parcel)
{
- this_media_url = std::string(this_parcel->getMediaURL());
+ this_media_url = this_parcel->getMediaURL();
+
+ this_media_type = this_parcel->getMediaType();
this_media_texture_id = this_parcel->getMediaID();
@@ -118,14 +121,15 @@ BOOL LLViewerParcelMediaAutoPlay::tick()
mLastRegionID = this_region_id;
}
- mTimeInParcel += mPeriod; // increase mTimeInParcel by the amount of time between ticks
+ mTimeInParcel += mPeriod; // increase mTimeInParcel by the amount of time between ticks
- if ((!mPlayed) && // if we've never played
- (mTimeInParcel > AUTOPLAY_TIME) && // and if we've been here for so many seconds
- (this_media_url.size() != 0) && // and if the parcel has media
- (LLViewerParcelMedia::sMediaImpl.isNull())) // and if the media is not already playing
+ if ((!mPlayed) && // if we've never played
+ (mTimeInParcel > AUTOPLAY_TIME) && // and if we've been here for so many seconds
+ (!this_media_url.empty()) && // and if the parcel has media
+ (stricmp(this_media_type.c_str(), "none/none") != 0) &&
+ (LLViewerParcelMedia::sMediaImpl.isNull())) // and if the media is not already playing
{
- if (this_media_texture_id.notNull()) // and if the media texture is good
+ if (this_media_texture_id.notNull()) // and if the media texture is good
{
LLViewerMediaTexture *image = LLViewerTextureManager::getMediaTexture(this_media_texture_id, FALSE) ;
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp
index 8059f866ba..41d9f6d067 100644
--- a/indra/newview/llviewerstats.cpp
+++ b/indra/newview/llviewerstats.cpp
@@ -827,7 +827,11 @@ void send_stats()
S32 window_height = gViewerWindow->getWindowHeightRaw();
S32 window_size = (window_width * window_height) / 1024;
misc["string_1"] = llformat("%d", window_size);
- // misc["string_2"] =
+ if (gDebugTimers.find(0) != gDebugTimers.end() && gFrameTimeSeconds > 0)
+ {
+ misc["string_2"] = llformat("Texture Time: %.2f, Total Time: %.2f", gDebugTimers[0].getElapsedTimeF32(), gFrameTimeSeconds);
+ }
+
// misc["int_1"] = LLSD::Integer(gSavedSettings.getU32("RenderQualityPerformance")); // Steve: 1.21
// misc["int_2"] = LLSD::Integer(gFrameStalls); // Steve: 1.21
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 32c24b3ebd..98ca76ed01 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -489,7 +489,7 @@ BOOL LLVOAvatarSelf::buildMenus()
{
LLMenuItemCallGL::Params item_params;
item_params.name = attachment->getName();
- item_params.label = attachment->getName();
+ item_params.label = LLTrans::getString(attachment->getName());
item_params.on_click.function_name = "Object.AttachToAvatar";
item_params.on_click.parameter = attach_index;
item_params.on_enable.function_name = "Object.EnableWear";
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index d7e5b464a6..19f303ab88 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -45,6 +45,7 @@
#include "llhttpnode.h"
#include "llregionhandle.h"
#include "llsurface.h"
+#include "lltrans.h"
#include "llviewercamera.h"
#include "llviewertexture.h"
#include "llviewertexturelist.h"
@@ -258,7 +259,7 @@ void LLWorld::removeRegion(const LLHost &host)
llwarns << "gFrameTimeSeconds " << gFrameTimeSeconds << llendl;
llwarns << "Disabling region " << regionp->getName() << " that agent is in!" << llendl;
- LLAppViewer::instance()->forceDisconnect("You have been disconnected from the region you were in.");
+ LLAppViewer::instance()->forceDisconnect(LLTrans::getString("YouHaveBeenDisconnected"));
return;
}
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index 5edf72d4ae..27757d19e5 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -45,6 +45,7 @@
#include "llagent.h"
#include "llcallingcard.h"
+#include "llcommandhandler.h"
#include "llviewercontrol.h"
#include "llfloatermap.h"
#include "llfloaterworldmap.h"
@@ -1726,7 +1727,10 @@ BOOL LLWorldMapView::handleDoubleClick( S32 x, S32 y, MASK mask )
id.toString(uuid_str);
uuid_str = uuid_str.substr(28);
sscanf(uuid_str.c_str(), "%X", &event_id);
- LLFloaterReg::showInstance("search", LLSD().with("category", "events").with("id", event_id));
+ // Invoke the event details floater if someone is clicking on an event.
+ LLSD params(LLSD::emptyArray());
+ params.append(event_id);
+ LLCommandDispatcher::dispatch("event", params, LLSD(), NULL, true);
break;
}
case MAP_ITEM_LAND_FOR_SALE:
diff --git a/indra/newview/res-sdl/ll_icon.BMP b/indra/newview/res-sdl/ll_icon.BMP
index 4a44aafbfa..6f9366df41 100644
--- a/indra/newview/res-sdl/ll_icon.BMP
+++ b/indra/newview/res-sdl/ll_icon.BMP
Binary files differ
diff --git a/indra/newview/res/ll_icon.png b/indra/newview/res/ll_icon.png
index 414b703111..ae573b3874 100644
--- a/indra/newview/res/ll_icon.png
+++ b/indra/newview/res/ll_icon.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/SL_Logo.png b/indra/newview/skins/default/textures/icons/SL_Logo.png
index c9fbde987a..8342d7cfee 100644
--- a/indra/newview/skins/default/textures/icons/SL_Logo.png
+++ b/indra/newview/skins/default/textures/icons/SL_Logo.png
Binary files differ
diff --git a/indra/newview/skins/default/xui/de/panel_profile.xml b/indra/newview/skins/default/xui/de/panel_profile.xml
index cb598f89f6..cda2788e40 100644
--- a/indra/newview/skins/default/xui/de/panel_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_profile.xml
@@ -41,10 +41,10 @@
</scroll_container>
</layout_panel>
<layout_panel name="profile_buttons_panel">
- <button label="Freund hinzufügen" name="add_friend" tool_tip="Bieten Sie dem Einwohner die Freundschaft an" width="109"/>
- <button label="IM" name="im" tool_tip="Instant Messenger öffnen" width="24"/>
+ <button label="Freund hinzufügen" name="add_friend" tool_tip="Bieten Sie dem Einwohner die Freundschaft an"/>
+ <button label="IM" name="im" tool_tip="Instant Messenger öffnen"/>
<button label="Anrufen" name="call" tool_tip="Diesen Einwohner anrufen"/>
- <button label="Karte" name="show_on_map_btn" tool_tip="Einwohner auf Karte anzeigen" width="36"/>
+ <button label="Karte" name="show_on_map_btn" tool_tip="Einwohner auf Karte anzeigen"/>
<button label="Teleportieren" name="teleport" tool_tip="Teleport anbieten"/>
<button label="▼" name="overflow_btn" tool_tip="Dem Einwohner Geld geben oder Inventar an den Einwohner schicken"/>
</layout_panel>
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index d7a7daf30c..b5a3764e73 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -10,7 +10,7 @@
help_topic="preferences"
single_instance="true"
title="PREFERENCES"
- width="620">
+ width="658">
<button
follows="right|bottom"
height="23"
@@ -48,7 +48,7 @@
tab_width="115"
tab_padding_right="5"
top="21"
- width="620">
+ width="658">
<panel
class="panel_preference"
filename="panel_preferences_general.xml"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 12d169b70a..43a221d0e1 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -705,7 +705,7 @@
left="135"
name="button apply to selection"
tool_tip="Modify selected land"
- width="78">
+ width="82">
<button.commit_callback
function="BuildTool.applyToSelection"/>
</button>
@@ -741,7 +741,7 @@
halign="center"
left="0"
name="Object Info Tabs"
- tab_max_width="54"
+ tab_max_width="100"
tab_min_width="40"
tab_position="top"
tab_height="25"
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index 1e2e74f882..876ff9961b 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -69,7 +69,7 @@
name="last_interaction"
text_color="LtGray_50"
value="0s"
- width="24" />
+ width="35" />
<button
follows="right"
height="16"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 4be4d6b432..c658e0de6f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -13,6 +13,10 @@
name="aspect_ratio_text">
[NUM]:[DEN]
</panel.string>
+ <panel.string
+ name="middle_mouse">
+ Middle Mouse
+ </panel.string>
<icon
follows="left|top"
height="18"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index 188fd3b7bc..516457dd93 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -51,13 +51,13 @@
Always show:
</text>
<scroll_list
- follows="top|left"
+ follows="top|left|right"
height="140"
layout="topleft"
left="10"
multi_select="true"
name="enabled_popups"
- width="475" />
+ width="495" />
<button
enabled_control="FirstSelectedDisabledPopups"
follows="top|left"
@@ -99,11 +99,11 @@
Never show:
</text>
<scroll_list
- follows="top|left"
+ follows="top|left|right"
height="140"
layout="topleft"
left="10"
multi_select="true"
name="disabled_popups"
- width="475" />
+ width="495" />
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index d11aebe943..e667fa9a2b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -365,12 +365,12 @@
use_ellipses="false"
hover="false"
commit_on_focus_lost = "true"
- follows="left|top"
+ follows="left|top|right"
height="60"
layout="topleft"
left="50"
name="busy_response"
- width="440"
+ width="450"
word_wrap="true">
log_in_to_change
</text_editor>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 8723e0a832..15f8b33f5b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -142,14 +142,14 @@
increment="1"
initial_value="13000"
label="Port number:"
- label_width="75"
+ label_width="105"
layout="topleft"
left_delta="160"
max_val="13050"
min_val="13000"
name="connection_port"
- top_delta="-2"
- width="140" />
+ top_delta="3"
+ width="170" />
<text
type="string"
length="1"
@@ -273,7 +273,7 @@
layout="topleft"
left="0"
name="internal"
- value="0"
+ value=""
tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside [APP_NAME]."
top="0"
width="480" />
@@ -283,7 +283,7 @@
layout="topleft"
left_delta="0"
name="external"
- value="1"
+ value="true"
tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen."
top_delta="20"
width="480" />
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 2a46311fce..3a766bb798 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -56,7 +56,9 @@
<string name="SavingSettings">Saving your settings...</string>
<string name="LoggingOut">Logging out...</string>
<string name="ShuttingDown">Shutting down...</string>
-
+ <string name="YouHaveBeenDisconnected">You have been disconnected from the region you were in.</string>
+ <string name="SentToInvalidRegion">You were sent to an invalid region.</string>
+ <string name="TestingDisconnect">Testing viewer disconnect</string>
<!-- Tooltip, lltooltipview.cpp -->
<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
@@ -1850,6 +1852,7 @@ Clears (deletes) the media and all params from the given face.
<string name="LoadingContents">Loading contents...</string>
<string name="NoContents">No contents</string>
<string name="WornOnAttachmentPoint" value=" (worn on [ATTACHMENT_POINT])" />
+ <string name="ActiveGesture" value="[GESLABEL] (active)"/>
<!-- Inventory permissions -->
<string name="PermYes">Yes</string>
<string name="PermNo">No</string>
@@ -1906,6 +1909,7 @@ Clears (deletes) the media and all params from the given face.
<string name="InvFolder favorite">Favorites</string>
<string name="InvFolder Current Outfit">Current Outfit</string>
<string name="InvFolder My Outfits">My Outfits</string>
+ <string name="InvFolder Accessories">Accessories</string>
<!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694-->
<string name="InvFolder Friends">Friends</string>
@@ -2135,6 +2139,7 @@ Clears (deletes) the media and all params from the given face.
<!-- panel contents -->
<string name="PanelContentsNewScript">New Script</string>
+ <string name="PanelContentsTooltip">Content of object</string>
<!-- panel preferences general -->
<string name="BusyModeResponseDefault">The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string>
diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_self.xml b/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
index e370e8d3b8..c8643708da 100644
--- a/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
@@ -10,8 +10,8 @@
<menu_item_call label="Chaussettes" name="Socks"/>
<menu_item_call label="Veste" name="Jacket"/>
<menu_item_call label="Gants" name="Gloves"/>
- <menu_item_call label="Sous-vêtements (homme)" name="Self Undershirt"/>
- <menu_item_call label="Sous-vêtements (femme)" name="Self Underpants"/>
+ <menu_item_call label="Débardeur" name="Self Undershirt"/>
+ <menu_item_call label="Caleçon" name="Self Underpants"/>
<menu_item_call label="Tatouage" name="Self Tattoo"/>
<menu_item_call label="Alpha" name="Self Alpha"/>
<menu_item_call label="Tous les habits" name="All Clothes"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory_add.xml b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml
index 0e5abdad0a..57b0a768c2 100644
--- a/indra/newview/skins/default/xui/fr/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml
@@ -18,8 +18,8 @@
<menu_item_call label="Nouvelle veste" name="New Jacket"/>
<menu_item_call label="Nouvelle jupe" name="New Skirt"/>
<menu_item_call label="Nouveaux gants" name="New Gloves"/>
- <menu_item_call label="Nouveaux sous-vêtements (homme)" name="New Undershirt"/>
- <menu_item_call label="Nouveaux sous-vêtements (femme)" name="New Underpants"/>
+ <menu_item_call label="Nouveau débardeur" name="New Undershirt"/>
+ <menu_item_call label="Nouveau caleçon" name="New Underpants"/>
<menu_item_call label="Nouvel alpha" name="New Alpha"/>
<menu_item_call label="Nouveau tatouage" name="New Tattoo"/>
</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 5925d28565..ff4a40b1ce 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -396,8 +396,8 @@
<menu_item_call label="Chaussettes" name="Socks"/>
<menu_item_call label="Veste" name="Jacket"/>
<menu_item_call label="Gants" name="Gloves"/>
- <menu_item_call label="Sous-vêtements (homme)" name="Menu Undershirt"/>
- <menu_item_call label="Sous-vêtements (femme)" name="Menu Underpants"/>
+ <menu_item_call label="Débardeur" name="Menu Undershirt"/>
+ <menu_item_call label="Caleçon" name="Menu Underpants"/>
<menu_item_call label="Jupe" name="Skirt"/>
<menu_item_call label="Alpha" name="Alpha"/>
<menu_item_call label="Tatouage" name="Tattoo"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml
index 75b6c044f6..1efc9b00a4 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml
@@ -34,10 +34,10 @@
Modification des gants
</string>
<string name="edit_undershirt_title">
- Modification des sous-vêtements (homme)
+ Modification du débardeur
</string>
<string name="edit_underpants_title">
- Modification des sous-vêtements (femme)
+ Modification du caleçon
</string>
<string name="edit_alpha_title">
Modification du masque alpha
@@ -79,10 +79,10 @@
Gants :
</string>
<string name="undershirt_desc_text">
- Sous-vêtements (homme) :
+ Débardeur :
</string>
<string name="underpants_desc_text">
- Sous-vêtements (femme) :
+ Caleçon :
</string>
<string name="alpha_desc_text">
Masque alpha :
diff --git a/indra/newview/skins/default/xui/fr/panel_profile.xml b/indra/newview/skins/default/xui/fr/panel_profile.xml
index 8cb4641937..f801aee312 100644
--- a/indra/newview/skins/default/xui/fr/panel_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_profile.xml
@@ -42,8 +42,8 @@
</layout_panel>
<layout_panel name="profile_buttons_panel">
<button label="Devenir amis" name="add_friend" tool_tip="Proposer à un résident de devenir votre ami"/>
- <button label="IM" name="im" tool_tip="Ouvrir une session IM" width="30"/>
- <button label="Appeler" name="call" tool_tip="Appeler ce résident" width="60"/>
+ <button label="IM" name="im" tool_tip="Ouvrir une session IM"/>
+ <button label="Appeler" name="call" tool_tip="Appeler ce résident"/>
<button label="Carte" name="show_on_map_btn" tool_tip="Afficher le résident sur la carte"/>
<button label="Téléporter" name="teleport" tool_tip="Proposez une téléportation"/>
<button label="▼" name="overflow_btn" tool_tip="Payer ou partager l&apos;inventaire avec le résident"/>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 910e6e0960..28b12f2bdf 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -17,13 +17,13 @@
Ricerca hardware...
</string>
<string name="StartupLoading">
- In Caricamento
+ Caricamento in corso
</string>
<string name="LoginInProgress">
In connessione. [APP_NAME] può sembrare rallentata. Attendi.
</string>
<string name="LoginInProgressNoFrozen">
- Logging in...
+ Accesso in corso...
</string>
<string name="LoginAuthenticating">
In autenticazione
@@ -80,7 +80,7 @@
Errore di rete: Non è stato possibile stabilire un collegamento, controlla la tua connessione.
</string>
<string name="Quit">
- Termina
+ Esci
</string>
<string name="create_account_url">
http://join.secondlife.com/index.php?lang=it-IT
@@ -152,10 +152,10 @@
Clicca per vedere questa inserzione
</string>
<string name="TooltipParcelUrl">
- Clicca per vedere la descrizione della parcel
+ Clicca per vedere la descrizione del lotto
</string>
<string name="TooltipTeleportUrl">
- Clicca per teleportarti a questa destinazione
+ Clicca per effettuare il teleport a questa destinazione
</string>
<string name="TooltipObjectIMUrl">
Clicca per vedere la descrizione dell&apos;oggetto
@@ -166,7 +166,7 @@
<string name="TooltipSLAPP">
Clicca per avviare il comando secondlife://
</string>
- <string name="CurrentURL" value=" URL attuale: [CurrentURL]"/>
+ <string name="CurrentURL" value="URL attuale: [CurrentURL]"/>
<string name="SLurlLabelTeleport">
Teleportati a
</string>
@@ -174,7 +174,7 @@
Mostra la mappa per
</string>
<string name="BUTTON_CLOSE_DARWIN">
- Chiudi (&#8984;W)
+ Chiudi (⌘W)
</string>
<string name="BUTTON_CLOSE_WIN">
Chiudi (Ctrl+W)
@@ -195,10 +195,10 @@
Disàncora
</string>
<string name="BUTTON_HELP">
- Mostra gli aiuti
+ Mostra Aiuto
</string>
<string name="Searching">
- In ricerca...
+ Ricerca in corso...
</string>
<string name="NoneFound">
Nessun risultato.
@@ -267,19 +267,19 @@
biglietto da visita
</string>
<string name="landmark">
- landmark
+ punto di riferimento
</string>
<string name="legacy script">
script (vecchia versione)
</string>
<string name="clothing">
- abito
+ vestiario
</string>
<string name="object">
oggetto
</string>
<string name="note card">
- notecard
+ biglietto
</string>
<string name="folder">
cartella
@@ -309,7 +309,7 @@
immagine targa
</string>
<string name="trash">
- cestino
+ Cestino
</string>
<string name="jpeg image">
immagine jpeg
@@ -546,7 +546,7 @@
Si
</string>
<string name="texture_loading">
- In Caricamento...
+ Caricamento in corso...
</string>
<string name="worldmap_offline">
Offline
@@ -684,25 +684,25 @@
Scegli la cartella
</string>
<string name="AvatarSetNotAway">
- Imposta non assente
+ Imposta come non assente
</string>
<string name="AvatarSetAway">
- Imposta assente
+ Imposta come assente
</string>
<string name="AvatarSetNotBusy">
- Imposta non occupato
+ Imposta come non occupato
</string>
<string name="AvatarSetBusy">
- Imposta occupato
+ Imposta come occupato
</string>
<string name="shape">
- Shape
+ Figura corporea
</string>
<string name="skin">
- Skin
+ Pelle
</string>
<string name="hair">
- Capelli
+ Capigliature
</string>
<string name="eyes">
Occhi
@@ -717,7 +717,7 @@
Scarpe
</string>
<string name="socks">
- Calze
+ Calzini
</string>
<string name="jacket">
Giacca
@@ -729,7 +729,7 @@
Maglietta intima
</string>
<string name="underpants">
- slip
+ Slip
</string>
<string name="skirt">
Gonna
@@ -744,16 +744,16 @@
non valido
</string>
<string name="next">
- Seguente
+ Avanti
</string>
<string name="ok">
OK
</string>
<string name="GroupNotifyGroupNotice">
- Notice di gruppo
+ Avviso di gruppo
</string>
<string name="GroupNotifyGroupNotices">
- Notice di gruppo
+ Avvisi di gruppo
</string>
<string name="GroupNotifySentBy">
Inviato da
@@ -762,7 +762,7 @@
Allegato:
</string>
<string name="GroupNotifyViewPastNotices">
- Visualizza i notice passati o scegli qui di non riceverne.
+ Visualizza gli avvisi precedenti o scegli qui di non riceverne.
</string>
<string name="GroupNotifyOpenAttachment">
Apri l&apos;allegato
@@ -771,7 +771,7 @@
Salva l&apos;allegato
</string>
<string name="TeleportOffer">
- Offerta di Teletrasporto
+ Offerta di Teleport
</string>
<string name="StartUpNotification">
[%d] una nuova notifica è arrivata mentre eri assente...
@@ -819,40 +819,40 @@
Non hai una copia
di questa texture in inventario.
</string>
- <string name="no_transfer" value=" (no transfer)"/>
- <string name="no_modify" value=" (no modify)"/>
- <string name="no_copy" value=" (no copy)"/>
- <string name="worn" value=" (indossato)"/>
- <string name="link" value=" (link)"/>
- <string name="broken_link" value=" (broken_link)"/>
+ <string name="no_transfer" value="(nessun trasferimento)"/>
+ <string name="no_modify" value="(nessuna modifica)"/>
+ <string name="no_copy" value="(nessuna copia)"/>
+ <string name="worn" value="(indossato)"/>
+ <string name="link" value="(link)"/>
+ <string name="broken_link" value="(broken_link)&quot;"/>
<string name="LoadingContents">
- Contenuto in caricamento...
+ Caricamento del contenuto...
</string>
<string name="NoContents">
Nessun contenuto
</string>
- <string name="WornOnAttachmentPoint" value=" (indossato su [ATTACHMENT_POINT])"/>
- <string name="Chat" value=" Chat :"/>
- <string name="Sound" value=" Suono :"/>
- <string name="Wait" value=" --- Attendi :"/>
- <string name="AnimFlagStop" value=" Ferma l&apos;Animazione :"/>
- <string name="AnimFlagStart" value=" Inizia l&apos;Animazione :"/>
- <string name="Wave" value=" Wave"/>
- <string name="HelloAvatar" value=" Ciao, avatar!"/>
- <string name="ViewAllGestures" value=" Visualizza tutte le gesture &gt;&gt;"/>
- <string name="Animations" value=" Animazioni,"/>
- <string name="Calling Cards" value=" Biglietti da visita,"/>
- <string name="Clothing" value=" Vestiti,"/>
- <string name="Gestures" value=" Gesture,"/>
- <string name="Landmarks" value=" Landmark,"/>
- <string name="Notecards" value=" Notecard,"/>
- <string name="Objects" value=" Oggetti,"/>
- <string name="Scripts" value=" Script,"/>
- <string name="Sounds" value=" Suoni,"/>
- <string name="Textures" value=" Texture,"/>
- <string name="Snapshots" value=" Fotografie,"/>
- <string name="No Filters" value="No "/>
- <string name="Since Logoff" value=" - Dalla disconnessione"/>
+ <string name="WornOnAttachmentPoint" value="(indossato su [ATTACHMENT_POINT])"/>
+ <string name="Chat" value="Chat :"/>
+ <string name="Sound" value="Suono :"/>
+ <string name="Wait" value="--- Attendi :"/>
+ <string name="AnimFlagStop" value="Ferma l&apos;animazione :"/>
+ <string name="AnimFlagStart" value="Inizia l&apos;animazione :"/>
+ <string name="Wave" value="Saluta con la mano"/>
+ <string name="HelloAvatar" value="Ciao, avatar!"/>
+ <string name="ViewAllGestures" value="Visualizza tutto &gt;&gt;"/>
+ <string name="Animations" value="Animazioni,"/>
+ <string name="Calling Cards" value="Biglietti da visita,"/>
+ <string name="Clothing" value="Vestiti,"/>
+ <string name="Gestures" value="Gesture,"/>
+ <string name="Landmarks" value="Punti di riferimento,"/>
+ <string name="Notecards" value="Biglietti,"/>
+ <string name="Objects" value="Oggetti,"/>
+ <string name="Scripts" value="Script,"/>
+ <string name="Sounds" value="Suoni,"/>
+ <string name="Textures" value="Texture,"/>
+ <string name="Snapshots" value="Fotografie,"/>
+ <string name="No Filters" value="No"/>
+ <string name="Since Logoff" value="- Dall&apos;uscita"/>
<string name="InvFolder My Inventory">
Il mio inventario
</string>
@@ -869,22 +869,22 @@ di questa texture in inventario.
Suoni
</string>
<string name="InvFolder Calling Cards">
- Biglieti da visita
+ Biglietti da visita
</string>
<string name="InvFolder Landmarks">
- Landmark
+ Punti di riferimento
</string>
<string name="InvFolder Scripts">
Script
</string>
<string name="InvFolder Clothing">
- Vestiti
+ Vestiario
</string>
<string name="InvFolder Objects">
Oggetti
</string>
<string name="InvFolder Notecards">
- Notecard
+ Biglietti
</string>
<string name="InvFolder New Folder">
Nuova cartella
@@ -920,22 +920,22 @@ di questa texture in inventario.
Preferiti
</string>
<string name="InvFolder Current Outfit">
- Outfit attuale
+ Abbigliamento attuale
</string>
<string name="InvFolder My Outfits">
- I miei Outfit
+ Il mio vestiario
</string>
<string name="InvFolder Friends">
Amici
</string>
<string name="InvFolder All">
- Tutti
+ Tutto
</string>
<string name="Buy">
- Compra
+ Acquista
</string>
<string name="BuyforL$">
- Compra per L$
+ Acquista per L$
</string>
<string name="Stone">
Pietra
@@ -962,7 +962,7 @@ di questa texture in inventario.
Luce
</string>
<string name="KBShift">
- Shift
+ Maiusc
</string>
<string name="KBCtrl">
Ctrl
@@ -1112,13 +1112,13 @@ di questa texture in inventario.
[COUNT] giorni
</string>
<string name="GroupMembersA">
- [COUNT] membro
+ [COUNT] iscritto
</string>
<string name="GroupMembersB">
- [COUNT] membri
+ [COUNT] iscritti
</string>
<string name="GroupMembersC">
- [COUNT] membri
+ [COUNT] iscritti
</string>
<string name="AcctTypeResident">
Residente
@@ -1127,10 +1127,10 @@ di questa texture in inventario.
In prova
</string>
<string name="AcctTypeCharterMember">
- Membro onorario
+ Socio onorario
</string>
<string name="AcctTypeEmployee">
- Impiegato Linden Lab
+ Dipendente Linden Lab
</string>
<string name="PaymentInfoUsed">
Informazioni di pagamento usate
@@ -1139,7 +1139,7 @@ di questa texture in inventario.
Informazioni di pagamento registrate
</string>
<string name="NoPaymentInfoOnFile">
- Nessuna informazione di pagamento
+ Nessuna informazione di pagamento disponibile
</string>
<string name="AgeVerified">
Età verificata
@@ -1154,7 +1154,7 @@ di questa texture in inventario.
In alto a destra
</string>
<string name="Top">
- In alto
+ in alto
</string>
<string name="Top Left">
In alto a sinistra
@@ -1196,22 +1196,22 @@ di questa texture in inventario.
ricompila
</string>
<string name="ResetQueueTitle">
- Avanzamento reset
+ Azzera avanzamento
</string>
<string name="ResetQueueStart">
- reset
+ azzera
</string>
<string name="RunQueueTitle">
- Avanzamento attivazione
+ Attiva avanzamento
</string>
<string name="RunQueueStart">
- Attiva
+ attiva
</string>
<string name="NotRunQueueTitle">
- Avanzamento disattivazione
+ Disattiva avanzamento
</string>
<string name="NotRunQueueStart">
- Disattivazione
+ disattiva
</string>
<string name="CompileSuccessful">
Compilazione riuscita!
@@ -1231,18 +1231,18 @@ di questa texture in inventario.
<string name="GroupsNone">
nessuno
</string>
- <string name="Group" value=" (gruppo)"/>
+ <string name="Group" value="(gruppo)"/>
<string name="Unknown">
(Sconosciuto)
</string>
<string name="SummaryForTheWeek" value="Riassunto della settimana, partendo dal"/>
- <string name="NextStipendDay" value="Il prossimo giorno di stipendio è "/>
- <string name="GroupIndividualShare" value=" Gruppo Dividendi individuali"/>
+ <string name="NextStipendDay" value="Il prossimo giorno di stipendio è"/>
+ <string name="GroupIndividualShare" value="Gruppo Dividendi individuali"/>
<string name="Balance">
Saldo
</string>
<string name="Credits">
- Crediti
+ Ringraziamenti
</string>
<string name="Debits">
Debiti
@@ -1257,7 +1257,7 @@ di questa texture in inventario.
Proprietà principale
</string>
<string name="IMMainland">
- mainland
+ continente
</string>
<string name="IMTeen">
teen
@@ -1266,13 +1266,13 @@ di questa texture in inventario.
errore
</string>
<string name="RegionInfoAllEstatesOwnedBy">
- la proprietà posseduta da [OWNER]
+ tutte le proprietà immobiliari di [OWNER]
</string>
<string name="RegionInfoAllEstatesYouOwn">
- Le proprietà che possiedi
+ tutte le tue proprietà immobiliari
</string>
<string name="RegionInfoAllEstatesYouManage">
- Le proprietà di cui sei manager per conto di [OWNER]
+ tutte le proprietà immobiliari che gestisci per conto di [OWNER]
</string>
<string name="RegionInfoAllowedResidents">
Residenti ammessi: ([ALLOWEDAGENTS], massimo [MAXACCESS])
@@ -1287,10 +1287,10 @@ di questa texture in inventario.
[COUNT] trovato/i
</string>
<string name="PanelContentsNewScript">
- Nuovo Script
+ Nuovo script
</string>
<string name="MuteByName">
- (per nome)
+ (in base al nome)
</string>
<string name="MuteAgent">
(residente)
@@ -1302,18 +1302,18 @@ di questa texture in inventario.
(gruppo)
</string>
<string name="RegionNoCovenant">
- Non esiste nessun regolamento per questa proprietà.
+ Non esiste alcun regolamento per questa proprietà.
</string>
<string name="RegionNoCovenantOtherOwner">
- Non esiste nessun regolamento per questa proprietà. Il terreno di questa proprietà è messo in vendita dal proprietario, non dalla Linden Lab. Contatta il proprietario del terreno per i dettagli della vendita.
+ Non esiste alcun regolamento per questa proprietà. Il terreno di questa proprietà è messo in vendita dal proprietario, non dalla Linden Lab. Contatta il proprietario del terreno per i dettagli della vendita.
</string>
<string name="covenant_last_modified">
Ultima modifica:
</string>
- <string name="none_text" value=" (nessuno) "/>
- <string name="never_text" value=" (mai) "/>
+ <string name="none_text" value="(nessuno)"/>
+ <string name="never_text" value="(mai)"/>
<string name="GroupOwned">
- Posseduta da un gruppo
+ Di proprietà di un gruppo
</string>
<string name="Public">
Pubblica
@@ -1328,22 +1328,22 @@ di questa texture in inventario.
Anteprima
</string>
<string name="MultiPropertiesTitle">
- Proprietà
+ Beni immobiliari
</string>
<string name="InvOfferAnObjectNamed">
- Un oggetto chiamato
+ Un oggetto denominato
</string>
<string name="InvOfferOwnedByGroup">
- Posseduto dal gruppo
+ di proprietà del gruppo
</string>
<string name="InvOfferOwnedByUnknownGroup">
- Posseduto da un gruppo sconosciuto
+ di proprietà di un gruppo sconosciuto
</string>
<string name="InvOfferOwnedBy">
- Posseduto da
+ di proprietà di
</string>
<string name="InvOfferOwnedByUnknownUser">
- Posseduto da un&apos;utente sconosciuto
+ di proprietà di un utente sconosciuto
</string>
<string name="InvOfferGaveYou">
Ti ha offerto
@@ -1379,7 +1379,7 @@ di questa texture in inventario.
Saldo
</string>
<string name="GroupMoneyCredits">
- Crediti
+ Ringraziamenti
</string>
<string name="GroupMoneyDebits">
Debiti
@@ -1391,7 +1391,7 @@ di questa texture in inventario.
Oggetti acquisiti
</string>
<string name="Cancel">
- Cancella
+ Annulla
</string>
<string name="UploadingCosts">
Costi di caricamento [%s]
@@ -1401,22 +1401,22 @@ di questa texture in inventario.
Tipi conosciuti .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
</string>
<string name="AddLandmarkNavBarMenu">
- Aggiungi landmark...
+ Aggiungi punto di riferimento...
</string>
<string name="EditLandmarkNavBarMenu">
- Modifica landmark...
+ Modifica punto di riferimento...
</string>
<string name="accel-mac-control">
- &#8963;
+ ⌃
</string>
<string name="accel-mac-command">
- &#8984;
+ ⌘
</string>
<string name="accel-mac-option">
- &#8997;
+ ⌥
</string>
<string name="accel-mac-shift">
- &#8679;
+ ⇧
</string>
<string name="accel-win-control">
Ctrl+
@@ -1428,22 +1428,22 @@ Tipi conosciuti .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
Shift+
</string>
<string name="FileSaved">
- File Salvato
+ File salvato
</string>
<string name="Receiving">
In ricezione
</string>
<string name="AM">
- AM
+ antemeridiane
</string>
<string name="PM">
- PM
+ pomeridiane
</string>
<string name="PST">
- PST
+ Ora Pacifico
</string>
<string name="PDT">
- PDT
+ Ora legale Pacifico
</string>
<string name="Forward">
Avanti
@@ -1455,7 +1455,7 @@ Tipi conosciuti .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
Destra
</string>
<string name="Back">
- Dietro
+ Indietro
</string>
<string name="North">
Nord
@@ -1476,13 +1476,13 @@ Tipi conosciuti .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
Giù
</string>
<string name="Any Category">
- Tutte le categorie
+ Qualsiasi categoria
</string>
<string name="Shopping">
- Shopping
+ Acquisti
</string>
<string name="Land Rental">
- Affitto terreni
+ Affitto terreno
</string>
<string name="Property Rental">
Affitto proprietà
@@ -1494,13 +1494,13 @@ Tipi conosciuti .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
Nuovi prodotti
</string>
<string name="Employment">
- Impiego
+ Lavoro
</string>
<string name="Wanted">
- Richiesti
+ Cercasi
</string>
<string name="Service">
- Servizi
+ Servizio
</string>
<string name="Personal">
Personale
@@ -1539,7 +1539,7 @@ Tipi conosciuti .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
Residenziale
</string>
<string name="Stage">
- Stage
+ Fase
</string>
<string name="Other">
Altro
@@ -1551,10 +1551,10 @@ Tipi conosciuti .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
Tu
</string>
<string name="Multiple Media">
- Media Multipli
+ Più supporti
</string>
<string name="Play Media">
- Media Play/Pausa
+ Riproduci/Pausa supporto
</string>
<string name="MBCmdLineError">
Un errore è stato riscontrato analizzando la linea di comando.
@@ -1562,17 +1562,17 @@ Per informazioni: http://wiki.secondlife.com/wiki/Client_parameters
Errore:
</string>
<string name="MBCmdLineUsg">
- uso linea di comando del programma [APP_NAME] :
+ Uso linea di comando del programma [APP_NAME] :
</string>
<string name="MBUnableToAccessFile">
Il programma [APP_NAME] non è in grado di accedere ad un file necessario.
-Potrebbe darsi che tu abbia copie multiple attivate, o il tuo sistema reputa erroneamente che il file sia già aperto.
+Potrebbe darsi che tu abbia copie multiple attivate o che il tuo sistema reputi erroneamente che il file sia già aperto.
Se il problema persiste, riavvia il computer e riprova.
-Se il problema persiste ancora, dovresti completamente disinstallare l&apos;applicazione [APP_NAME] e reinstallarla.
+Se il problema continua ancora, dovresti completamente disinstallare l&apos;applicazione [APP_NAME] e reinstallarla.
</string>
<string name="MBFatalError">
- Errore fatale
+ Errore critico
</string>
<string name="MBRequiresAltiVec">
Il programma [APP_NAME] richiede un processore con AltiVec (G4 o superiore).
@@ -1591,7 +1591,7 @@ Vuoi mandare un crash report?
</string>
<string name="MBNoDirectX">
Il programmma [APP_NAME] non riesce a trovare una DirectX 9.0b o superiore.
-[APP_NAME] usa le DirectX per determinare hardware e/o i driver non aggiornati che possono causare problemi di stabilità, scarsa performance e interruzioni. Sebbene tu possa avviare il programma [APP_NAME] senza di esse, raccomandiamo caldamente di installare le DirectX 9.0b.
+[APP_NAME] usa DirectX per rilevare hardware e/o i driver non aggiornati che possono causare problemi di stabilità, scarsa performance e interruzioni. Benché tu possa avviare il programma [APP_NAME] senza di esse, consigliamo caldamente l&apos;esecuzione con DirectX 9.0b.
Vuoi continuare?
</string>
@@ -1599,8 +1599,8 @@ Vuoi continuare?
Attenzione
</string>
<string name="MBNoAutoUpdate">
- L&apos;aggiornamento automatico non è stato ancora implementato per Linux.
-Raccomandiamo di scaricare l&apos;utima versione da www.secondlife.com.
+ L&apos;aggiornamento automatico non è stato ancora realizzato per Linux.
+Consigliamo di scaricare l&apos;ultima versione direttamente da www.secondlife.com.
</string>
<string name="MBRegClassFailed">
RegisterClass non riuscito
@@ -1609,8 +1609,8 @@ Raccomandiamo di scaricare l&apos;utima versione da www.secondlife.com.
Errore
</string>
<string name="MBFullScreenErr">
- Impossibile visualizzare a schermo intero a risoluzione [WIDTH] x [HEIGHT].
-Visualizzazione corrente ridotta a finestra.
+ Impossibile visualizzare a schermo intero con risoluzione [WIDTH] x [HEIGHT].
+Visualizzazione corrente in modalità finestra.
</string>
<string name="MBDestroyWinFailed">
Errore di arresto durante il tentativo di chiusura della finestra (DestroyWindow() non riuscito)
@@ -1628,14 +1628,14 @@ Visualizzazione corrente ridotta a finestra.
Impossibile ottenere una descrizione del formato pixel
</string>
<string name="MBTrueColorWindow">
- [APP_NAME] richiede True Color (32-bit) per funzionare.
-Vai alle impostazioni dello schermo del tuo computer e imposta il colore in modalità 32-bit.
+ [APP_NAME] richiede True Color (32 bit) per funzionare.
+Vai alle impostazioni dello schermo del tuo computer e imposta il colore in modalità 32 bit.
</string>
<string name="MBAlpha">
- [APP_NAME] non funziona poichè è impossibile trovare un canale alpha ad 8 Bit. Questo problema normalmente deriva dai driver della scheda video.
+ [APP_NAME] non funziona poichè è impossibile trovare un canale alpha a 8 bit. Questo problema normalmente deriva dai driver della scheda video.
Assicurati di avere installato i driver della scheda video più recenti.
-Assicurati anche che il monitor sia impostato a True Color (32-bit) nel pannello di controllo &gt; Display &gt; Settings.
-Se il messaggio persiste, contatta contatta [SUPPORT_SITE].
+Assicurati anche che il monitor sia impostato a True Color (32 bit) nel Pannello di controllo &gt; Schermo &gt; Impostazioni.
+Se il messaggio persiste, contatta [SUPPORT_SITE].
</string>
<string name="MBPixelFmtSetErr">
Impossibile impostare il formato pixel
@@ -1647,7 +1647,7 @@ Se il messaggio persiste, contatta contatta [SUPPORT_SITE].
Impossibile attivare il GL rendering
</string>
<string name="MBVideoDrvErr">
- [APP_NAME] Non riesce ad avviarsi perchè i driver della tua scheda video non sono stati installati correttamente, non sono aggiornati, o sono per un hardware non supportato. Assicurati di avere i driver della scheda video più recenti e anche se li hai installati, prova a reinstallarli di nuovo.
+ [APP_NAME] Non riesce ad avviarsi perchè i driver della tua scheda video non sono stati installati correttamente, non sono aggiornati, o sono per un hardware non supportato. Assicurati di avere i driver della scheda video più recenti e anche se li hai installati, prova a installarli di nuovo.
Se il messaggio persiste, contatta [SUPPORT_SITE].
</string>
@@ -1673,43 +1673,43 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Lobi attaccati
</string>
<string name="Back Bangs">
- #Back Bangs
+ Frangetta da dietro
</string>
<string name="Back Bangs Down">
- #Back Bangs Down
+ Frangetta da dietro giù
</string>
<string name="Back Bangs Up">
- #Back Bangs Up
+ Frangetta da dietro su
</string>
<string name="Back Fringe">
Frangetta all&apos;indietro
</string>
<string name="Back Hair">
- #Back Hair
+ Capelli da dietro
</string>
<string name="Back Hair Down">
- #Back Hair Down
+ Capelli da dietro giù
</string>
<string name="Back Hair Up">
- #Back Hair Up
+ Capelli da dietro su
</string>
<string name="Baggy">
- Con le borse
+ Larghi
</string>
<string name="Bangs">
Frange
</string>
<string name="Bangs Down">
- #Bangs Down
+ Frangetta giù
</string>
<string name="Bangs Up">
- #Bangs Up
+ Frangetta su
</string>
<string name="Beady Eyes">
Occhi piccoli
</string>
<string name="Belly Size">
- punto vita
+ Punto vita
</string>
<string name="Big">
Grande
@@ -1718,22 +1718,22 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Sedere grande
</string>
<string name="Big Eyeball">
- #Big Eyeball
+ Bulbo oculare grande
</string>
<string name="Big Hair Back">
- Gonfiore dei capelli: dietro
+ Capigliatura grande: Indietro
</string>
<string name="Big Hair Front">
- Gonfiore dei capelli: davanti
+ Capigliatura grande: anteriore
</string>
<string name="Big Hair Top">
- Gonfiore dei capelli: sopra
+ Capigliatura grande: in alto
</string>
<string name="Big Head">
- Grandezza testa
+ Grande testa
</string>
<string name="Big Pectorals">
- Grandezza pettorali
+ Grandi pettorali
</string>
<string name="Big Spikes">
Capelli con punte
@@ -1766,13 +1766,13 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Lentiggini e nei
</string>
<string name="Body Thick">
- Corpo robusto
+ Corpo più robusto
</string>
<string name="Body Thickness">
Robustezza del corpo
</string>
<string name="Body Thin">
- Magrezza del corpo
+ Corpo più magro
</string>
<string name="Bow Legged">
Gambe arcuate
@@ -1781,7 +1781,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Altezza del seno
</string>
<string name="Breast Cleavage">
- Avvicinamento dei seni
+ Décolleté
</string>
<string name="Breast Size">
Grandezza del seno
@@ -1796,7 +1796,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Grandezza delle sopracciglia
</string>
<string name="Bug Eyes">
- Sporgenza degli occhi
+ Occhi sporgenti
</string>
<string name="Bugged Eyes">
Occhi sporgenti
@@ -1817,19 +1817,19 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Grandezza del sedere
</string>
<string name="bustle skirt">
- Arricciatura posteriore
+ Crinolina
</string>
<string name="no bustle">
- Meno arricciatura
+ Nessuna crinolina
</string>
<string name="more bustle">
- Più arricciatura
+ Più crinolina
</string>
<string name="Chaplin">
Baffetti
</string>
<string name="Cheek Bones">
- Mascella
+ Zigomi
</string>
<string name="Chest Size">
Ampiezza del torace
@@ -1838,7 +1838,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Angolo del mento
</string>
<string name="Chin Cleft">
- Fessura inf. del mento
+ Fossetta sul mento
</string>
<string name="Chin Curtains">
Barba sottomento
@@ -1847,16 +1847,16 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Profondità mento
</string>
<string name="Chin Heavy">
- Appuntita verso l&apos;alto
+ Mento forte
</string>
<string name="Chin In">
Mento in dentro
</string>
<string name="Chin Out">
- Mento in fuori
+ Mento sporgente
</string>
<string name="Chin-Neck">
- Grandezza mento-collo
+ Mento-collo
</string>
<string name="Clear">
Trasparente
@@ -1871,46 +1871,46 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Chiusa
</string>
<string name="Closed Back">
- Spacco chiuso dietro
+ Chiuso dietro
</string>
<string name="Closed Front">
- Spacco chiuso davanti
+ Chiuso davanti
</string>
<string name="Closed Left">
- Spacco chiuso sx
+ Chiuso sinistra
</string>
<string name="Closed Right">
- Spacco chiuso dx
+ Chiuso destra
</string>
<string name="Coin Purse">
Meno pronunciati
</string>
<string name="Collar Back">
- Scollatura posteriore
+ Colletto posteriore
</string>
<string name="Collar Front">
- Scollatura anteriore
+ Colletto anteriore
</string>
<string name="Corner Down">
Angolo all&apos;ingiù
</string>
<string name="Corner Normal">
- Angolo Normale
+ Angolo normale
</string>
<string name="Corner Up">
Angolo all&apos;insù
</string>
<string name="Creased">
- Alzato
+ Piega
</string>
<string name="Crooked Nose">
Naso storto
</string>
<string name="Cropped Hair">
- Capelli raccolti
+ Capelli corti
</string>
<string name="Cuff Flare">
- Fondo pantalone
+ Svasato con risvolto
</string>
<string name="Dark">
Scuro
@@ -1922,7 +1922,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Più scuro
</string>
<string name="Deep">
- Più pronunciato
+ Profondo
</string>
<string name="Default Heels">
Tacchi standard
@@ -1931,40 +1931,40 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Punta del piede standard
</string>
<string name="Dense">
- Meno rade
+ Folti
</string>
<string name="Dense hair">
- #Dense Hair
+ Capelli folti
</string>
<string name="Double Chin">
Doppio mento
</string>
<string name="Downturned">
- Naso all&apos;ingiù
+ All&apos;ingiù
</string>
<string name="Duffle Bag">
Più pronunciati
</string>
<string name="Ear Angle">
- Orecchie a sventola
+ Angolo orecchie
</string>
<string name="Ear Size">
Grandezza orecchie
</string>
<string name="Ear Tips">
- Tipo di orecchio
+ Estremità orecchie
</string>
<string name="Egg Head">
Ovalizzazione testa
</string>
<string name="Eye Bags">
- Borse sotto agli occhi
+ Occhiaie
</string>
<string name="Eye Color">
Colore degli occhi
</string>
<string name="Eye Depth">
- Occhi incavati
+ Profondità degli occhi
</string>
<string name="Eye Lightness">
Luminosità degli occhi
@@ -1973,7 +1973,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Apertura degli occhi
</string>
<string name="Eye Pop">
- Differenza apertura occhi
+ Prominenza degli occhi
</string>
<string name="Eye Size">
Grandezza occhi
@@ -1982,7 +1982,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Distanza occhi
</string>
<string name="Eyeball Size">
- #Eyeball Size
+ Grandezza bulbo oculare
</string>
<string name="Eyebrow Arc">
Arco delle sopracciglia
@@ -2009,64 +2009,64 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Colore dell&apos;eyeliner
</string>
<string name="Eyes Back">
- #Eyes Back
+ Occhi indietro
</string>
<string name="Eyes Bugged">
Occhi sporgenti
</string>
<string name="Eyes Forward">
- #Eyes Forward
+ Occhi in avanti
</string>
<string name="Eyes Long Head">
- #Eyes Long Head
+ Occhi testa lunga
</string>
<string name="Eyes Shear Left Up">
- Distorsione occhi in alto a sx
+ Occhio a sinistra verso l&apos;alto
</string>
<string name="Eyes Shear Right Up">
- Distorsione occhi in alto a dx
+ Occhio a destra verso il basso
</string>
<string name="Eyes Short Head">
- #Eyes Short Head
+ Occhi testa corta
</string>
<string name="Eyes Spread">
- #Eyes Spread
+ Spaziatura occhi
</string>
<string name="Eyes Sunken">
- #Eyes Sunken
+ Occhi infossati
</string>
<string name="Eyes Together">
- #Eyes Together
+ Occhi ravvicinati
</string>
<string name="Face Shear">
- Distorsione del viso
+ Taglio del viso
</string>
<string name="Facial Definition">
- Lineamenti del viso
+ Definizione del viso
</string>
<string name="Far Set Eyes">
Occhi distanti
</string>
<string name="Fat">
- #Fat
+ Grasso
</string>
<string name="Fat Head">
- #Fat Head
+ Testa grossa
</string>
<string name="Fat Lips">
Labbra carnose
</string>
<string name="Fat Lower">
- #Fat Lower
+ Inferiore carnoso
</string>
<string name="Fat Lower Lip">
Labbro inferiore sporgente
</string>
<string name="Fat Torso">
- #Fat Torso
+ Torace grosso
</string>
<string name="Fat Upper">
- #Fat Upper
+ Torace grosso
</string>
<string name="Fat Upper Lip">
Labbro superiore sporgente
@@ -2081,7 +2081,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Dita
</string>
<string name="Flared Cuffs">
- Fondo largo
+ Risvolti svasati
</string>
<string name="Flat">
Piatto
@@ -2090,88 +2090,88 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Sedere piatto
</string>
<string name="Flat Head">
- Viso piatto
+ Testa piatta
</string>
<string name="Flat Toe">
Punta piatta
</string>
<string name="Foot Size">
- Grandezza piede
+ Misura piede
</string>
<string name="Forehead Angle">
Angolo della fronte
</string>
<string name="Forehead Heavy">
- Appuntita verso il basso
+ Fronte sporgente
</string>
<string name="Freckles">
Lentiggini
</string>
<string name="Front Bangs Down">
- #Front Bangs Down
+ Frangette in giù
</string>
<string name="Front Bangs Up">
- #Front Bangs Up
+ Frangette in su
</string>
<string name="Front Fringe">
Frangetta
</string>
<string name="Front Hair">
- #Front Hair
+ Capelli davanti
</string>
<string name="Front Hair Down">
- #Front Hair Down
+ Capelli davanti sciolti
</string>
<string name="Front Hair Up">
- #Front Hair Up
+ Capelli davanti raccolti
</string>
<string name="Full Back">
- Scostati
+ Dietro gonfi
</string>
<string name="Full Eyeliner">
- Con eyeliner
+ Eyeliner marcato
</string>
<string name="Full Front">
- Anteriore pieno
+ Anteriore gonfio
</string>
<string name="Full Hair Sides">
- Riempimento lati
+ Lati capelli gonfi
</string>
<string name="Full Sides">
- Pieni
+ Lati gonfi
</string>
<string name="Glossy">
Lucido
</string>
<string name="Glove Fingers">
- Dita dei guanti
+ Dita con guanti
</string>
<string name="Glove Length">
Lunghezza guanti
</string>
<string name="Hair">
- Capelli
+ Capigliature
</string>
<string name="Hair Back">
- Capelli: dietro
+ Capelli: Indietro
</string>
<string name="Hair Front">
- Capelli: davanti
+ Capelli: anteriore
</string>
<string name="Hair Sides">
Capelli: lati
</string>
<string name="Hair Sweep">
- Traslazione
+ Direzione capigliatura
</string>
<string name="Hair Thickess">
- Spessore
+ Foltezza
</string>
<string name="Hair Thickness">
- Spessore barba
+ Foltezza
</string>
<string name="Hair Tilt">
- Rotazione capelli
+ Inclinazione
</string>
<string name="Hair Tilted Left">
Verso sinistra
@@ -2180,16 +2180,16 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Verso destra
</string>
<string name="Hair Volume">
- Capelli: volume
+ Capelli: Volume
</string>
<string name="Hand Size">
Grandezza mani
</string>
<string name="Handlebars">
- Baffi lunghi
+ Baffi a manubrio
</string>
<string name="Head Length">
- Sporgenza del viso
+ Lunghezza testa
</string>
<string name="Head Shape">
Forma della testa
@@ -2198,7 +2198,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Grandezza della testa
</string>
<string name="Head Stretch">
- Compressione lat testa
+ Allungamento testa
</string>
<string name="Heel Height">
Altezza tacchi
@@ -2222,7 +2222,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Alta
</string>
<string name="High and Tight">
- Cavallo alto
+ Alto e stretto
</string>
<string name="Higher">
Più alto
@@ -2267,7 +2267,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Forma del mento
</string>
<string name="Join">
- Avvicinati
+ Iscriviti
</string>
<string name="Jowls">
Guance
@@ -2297,7 +2297,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Meno
</string>
<string name="Less Body Fat">
- Meno grasso
+ Meno grasso corporeo
</string>
<string name="Less Curtains">
Meno
@@ -2339,16 +2339,16 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Meno
</string>
<string name="Lighter">
- Più chiaro
+ Più leggero
</string>
<string name="Lip Cleft">
- Distanza divis. labbro sup.
+ Distanza fossetta labbro
</string>
<string name="Lip Cleft Depth">
- Prof. spacco labbro sup.
+ Prof. fossetta labbro
</string>
<string name="Lip Fullness">
- Riempimento delle labbra
+ Volume labbra
</string>
<string name="Lip Pinkness">
Tonalità rosa labbra
@@ -2375,7 +2375,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Lungo
</string>
<string name="Long Head">
- Viso sporgente
+ Testa lunga
</string>
<string name="Long Hips">
Bacino alto
@@ -2387,7 +2387,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Collo lungo
</string>
<string name="Long Pigtails">
- Ciuffi laterali lunghi
+ Codini lunghi
</string>
<string name="Long Ponytail">
Codino lungo
@@ -2399,16 +2399,16 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Braccia lunghe
</string>
<string name="Longcuffs">
- Longcuffs
+ Maniche lunghe
</string>
<string name="Loose Pants">
- Non attillati
+ Pantaloni ampi
</string>
<string name="Loose Shirt">
- Non attillata
+ Camicia ampia
</string>
<string name="Loose Sleeves">
- Maniche lente
+ Maniche non attillate
</string>
<string name="Love Handles">
Maniglie dell&apos;amore
@@ -2426,7 +2426,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Bassa
</string>
<string name="Low and Loose">
- Cavallo basso
+ Basso e ampio
</string>
<string name="Lower">
Più basso
@@ -2435,7 +2435,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Parte bassa del setto
</string>
<string name="Lower Cheeks">
- Guance
+ Guance inferiori
</string>
<string name="Male">
Maschio
@@ -2444,13 +2444,13 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Riga nel mezzo
</string>
<string name="More">
- Di più
+ Altro
</string>
<string name="More Blush">
Più fard
</string>
<string name="More Body Fat">
- Più grasso
+ Più grasso corporeo
</string>
<string name="More Curtains">
Più
@@ -2519,7 +2519,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Posizione della bocca
</string>
<string name="Mowhawk">
- Vuoti
+ Moicana
</string>
<string name="Muscular">
Muscolatura
@@ -2597,10 +2597,10 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Superiore normale
</string>
<string name="Nose Left">
- Storto a sinistra
+ Naso a sinistra
</string>
<string name="Nose Right">
- Storto a destra
+ Naso a destra
</string>
<string name="Nose Size">
Grandezza naso
@@ -2630,13 +2630,13 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Opaco
</string>
<string name="Open">
- Aperto
+ Apri
</string>
<string name="Open Back">
Retro aperto
</string>
<string name="Open Front">
- Aperto Frontale
+ Davanti aperto
</string>
<string name="Open Left">
Lato sin. aperto
@@ -2672,7 +2672,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Genitali
</string>
<string name="Painted Nails">
- Unghie colorate
+ Unghie smaltate
</string>
<string name="Pale">
Pallido
@@ -2687,7 +2687,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Lunghezza pantaloni
</string>
<string name="Pants Waist">
- Altezza slip
+ Taglia pantalone
</string>
<string name="Pants Wrinkles">
Pantaloni con le grinze
@@ -2705,7 +2705,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Pigmento
</string>
<string name="Pigtails">
- Ciuffi
+ Codini
</string>
<string name="Pink">
Rosa
@@ -2807,16 +2807,16 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Meno pronunciato
</string>
<string name="Shear Back">
- Accostamento posteriore
+ Taglio posteriore
</string>
<string name="Shear Face">
- Distorsione viso
+ Taglio del viso
</string>
<string name="Shear Front">
- Riempimento davanti
+ Taglio anteriore
</string>
<string name="Shear Left">
- A sinistra
+ Taglio a sinistra
</string>
<string name="Shear Left Up">
Distorto a sinistra
@@ -2828,10 +2828,10 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Distorto a destra
</string>
<string name="Sheared Back">
- Accostati
+ Taglio verso dietro
</string>
<string name="Sheared Front">
- Anteriormente vuoto
+ Taglio verso davanti
</string>
<string name="Shift Left">
A sinistra
@@ -2867,10 +2867,10 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Collo corto
</string>
<string name="Short Pigtails">
- Ciuffi laterali corti
+ Codini corti
</string>
<string name="Short Ponytail">
- Codino Corto
+ Codino corto
</string>
<string name="Short Sideburns">
Basette corte
@@ -2900,13 +2900,13 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Basette
</string>
<string name="Sides Hair">
- Capigliatura later.
+ Capigliatura di lato
</string>
<string name="Sides Hair Down">
- Giù
+ Capigliatura di lato sciolta
</string>
<string name="Sides Hair Up">
- Su
+ Capigliatura di lato raccolta
</string>
<string name="Skinny">
Skinny
@@ -2930,19 +2930,19 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Morbidezza maniche
</string>
<string name="Slit Back">
- Spacco: posteriore
+ Spacco: Indietro
</string>
<string name="Slit Front">
Spacco: anteriore
</string>
<string name="Slit Left">
- Spacco: sinistro
+ Spacco: Sinistra
</string>
<string name="Slit Right">
- Spacco: destro
+ Spacco: Destra
</string>
<string name="Small">
- Piccolo
+ Piccola
</string>
<string name="Small Hands">
Mani piccole
@@ -3032,37 +3032,37 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Punta spessa
</string>
<string name="Thickness">
- Thickness
+ Spessore
</string>
<string name="Thin">
- Ossute
+ Sottili
</string>
<string name="Thin Eyebrows">
- Sopracciglia fini
+ Sopracciglia sottili
</string>
<string name="Thin Lips">
- Labbra fini
+ Labbra sottili
</string>
<string name="Thin Nose">
- Naso fino
+ Naso sottile
</string>
<string name="Tight Chin">
- Mento magro
+ Mento stretto
</string>
<string name="Tight Cuffs">
Fondo stretto
</string>
<string name="Tight Pants">
- Attillati
+ Pantaloni attillati
</string>
<string name="Tight Shirt">
- Attilata
+ Camicia attillata
</string>
<string name="Tight Skirt">
- Attillata
+ Gonna attillata
</string>
<string name="Tight Sleeves">
- Attillate
+ Maniche strette
</string>
<string name="Tilt Left">
Tilt Left
@@ -3089,7 +3089,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Distaccato
</string>
<string name="Uncreased">
- Abbassato
+ Senza piega
</string>
<string name="Underbite">
Denti inf. in fuori
@@ -3104,13 +3104,13 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Parte alta degli zigomi
</string>
<string name="Upper Chin Cleft">
- Fessura sup. del mento
+ Fossetta sup. del mento
</string>
<string name="Upper Eyelid Fold">
Piega palpebra sup.
</string>
<string name="Upturned">
- Naso all&apos;insù
+ All&apos;insù
</string>
<string name="Very Red">
Molto rossi
@@ -3125,13 +3125,13 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Capelli bianchi
</string>
<string name="Wide">
- Spalancati
+ Largo
</string>
<string name="Wide Back">
- Laterali post. larghi
+ Dietro largo
</string>
<string name="Wide Front">
- Laterali ant. larghi
+ Davanti largo
</string>
<string name="Wide Lips">
Labbra larghe
@@ -3143,31 +3143,31 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Grinze
</string>
<string name="LocationCtrlAddLandmarkTooltip">
- Aggiungi ai miei landmark
+ Aggiungi ai miei punti di riferimento
</string>
<string name="LocationCtrlEditLandmarkTooltip">
- Modifica i miei landmark
+ Modifica i miei punti di riferimento
</string>
<string name="LocationCtrlInfoBtnTooltip">
- maggiori informazioni sulla posizione attuale
+ Maggiori informazioni sulla posizione attuale
</string>
<string name="LocationCtrlComboBtnTooltip">
- Lo storico delle mie posizioni
+ La cronologia delle mie posizioni
</string>
<string name="UpdaterWindowTitle">
Aggiornamento [APP_NAME]
</string>
<string name="UpdaterNowUpdating">
- [APP_NAME] In aggiornamento...
+ Aggiornamento di [APP_NAME]...
</string>
<string name="UpdaterNowInstalling">
- [APP_NAME] In installazione...
+ Installazione di [APP_NAME]...
</string>
<string name="UpdaterUpdatingDescriptive">
- Il Viewer del programma [APP_NAME] si sta aggiornando all&apos;ultima versione. Potrebbe volerci del tempo, attendi.
+ Il Viewer del programma [APP_NAME] si sta aggiornando all&apos;ultima versione. Potrebbe volerci del tempo, attendi.
</string>
<string name="UpdaterProgressBarTextWithEllipses">
- Aggiornamento in download...
+ Download dell&apos;aggiornamento...
</string>
<string name="UpdaterProgressBarText">
Download dell&apos;aggiornamento
@@ -3176,13 +3176,13 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
Download dell&apos;aggiornamento non riuscito
</string>
<string name="UpdaterFailUpdateDescriptive">
- Il programma [APP_NAME] ha riscontrato un&apos;errore nel tentativo di aggiornamento. Consigliamo di scaricare l&apos;ultima versione direttamente da www.secondlife.com.
+ Il programma [APP_NAME] ha riscontrato un&apos;errore durante il tentativo di aggiornamento. Consigliamo di scaricare l&apos;ultima versione direttamente da www.secondlife.com.
</string>
<string name="UpdaterFailInstallTitle">
- Tentativo di installazione aggiornamento non riuscito
+ Installazione dell&apos;aggiornamento non riuscita
</string>
<string name="UpdaterFailStartTitle">
- Errore nell&apos;apertura del viewer
+ Errore nell&apos;avvio del viewer
</string>
<string name="IM_logging_string">
-- Registrazione messaggi instantanei abilitata --
@@ -3194,7 +3194,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
(anonimo)
</string>
<string name="IM_moderated_chat_label">
- (Moderato: Voice spento di default)
+ (Moderato: Voci disattivate di default)
</string>
<string name="IM_unavailable_text_label">
La chat di testo non è disponibile per questa chiamata.
@@ -3203,7 +3203,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
La chat di testo è stata disabilitata da un moderatore di gruppo.
</string>
<string name="IM_default_text_label">
- Clicca qua per inviare un messaggio instantaneo.
+ Clicca qui per inviare un messaggio instantaneo.
</string>
<string name="IM_to_label">
A
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index ceda48109e..bdd1cc60b7 100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -442,6 +442,9 @@
<panel.string name="access_estate_defined">
(エステートに限定)
</panel.string>
+ <panel.string name="allow_public_access">
+ パブリックアクセスを許可 ([MATURITY])
+ </panel.string>
<panel.string name="estate_override">
1 つ以上のオプションが、不動産レベルで設定されています。
</panel.string>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
index 88c05fbae7..e58fa979d7 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="ピック編集" name="panel_edit_pick">
+ <panel.string name="location_notice">
+ (掲載後更新)
+ </panel.string>
<text name="title">
ピック編集
</text>
@@ -22,7 +25,7 @@
</panel>
</scroll_container>
<panel label="bottom_panel" name="bottom_panel">
- <button label="[WHAT] を保存" name="save_changes_btn"/>
+ <button label="ピックを保存" name="save_changes_btn"/>
<button label="キャンセル" name="cancel_btn"/>
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
index 36c7b75f97..9981d13bbb 100644
--- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
@@ -1,18 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel label="もの" name="main inventory panel">
- <panel.string name="Title">
- もの
+ <panel.string name="ItemcountFetching">
+ [ITEM_COUNT] 個のアイテムを取得中です... [FILTER]
</panel.string>
- <filter_editor label="持ち物をフィルター" name="inventory search editor"/>
- <tab_container name="inventory filter tabs">
- <inventory_panel label="持ち物" name="All Items"/>
- <inventory_panel label="最新" name="Recent Items"/>
- </tab_container>
- <panel name="bottom_panel">
- <button name="options_gear_btn" tool_tip="その他のオプションを表示します"/>
- <button name="add_btn" tool_tip="新しいアイテムを追加します"/>
- <dnd_button name="trash_btn" tool_tip="選択したアイテムを削除します"/>
- </panel>
+ <panel.string name="ItemcountCompleted">
+ [ITEM_COUNT] 個のアイテム [FILTER]
+ </panel.string>
+ <text name="ItemcountText">
+ アイテム:
+ </text>
<menu_bar name="Inventory Menu">
<menu label="ファイル" name="File">
<menu_item_call label="開く" name="Open"/>
@@ -61,4 +57,14 @@
<menu_item_check label="システムフォルダを上に並べる" name="System Folders To Top"/>
</menu>
</menu_bar>
+ <filter_editor label="持ち物をフィルター" name="inventory search editor"/>
+ <tab_container name="inventory filter tabs">
+ <inventory_panel label="持ち物" name="All Items"/>
+ <inventory_panel label="最新" name="Recent Items"/>
+ </tab_container>
+ <panel name="bottom_panel">
+ <button name="options_gear_btn" tool_tip="その他のオプションを表示します"/>
+ <button name="add_btn" tool_tip="新しいアイテムを追加します"/>
+ <dnd_button name="trash_btn" tool_tip="選択したアイテムを削除します"/>
+ </panel>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
index eae9ac03c3..fb273de420 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
@@ -19,10 +19,17 @@
<button label="詳細 &gt;&gt;" label_selected="簡易 &lt;&lt;" name="more_less_btn" tool_tip="アドバンスコントロール"/>
</panel>
<panel name="nearby_media_panel">
+ <text name="nearby_media">
+ 近くのメディア
+ </text>
+ <text name="show">
+ 表示:
+ </text>
<combo_box name="show_combo">
<combo_box.item label="すべて" name="All"/>
<combo_box.item label="この区画内" name="WithinParcel"/>
<combo_box.item label="この区画外" name="OutsideParcel"/>
+ <combo_box.item label="他のアバター" name="OnOthers"/>
</combo_box>
<scroll_list name="media_list">
<scroll_list.columns label="近接" name="media_proximity"/>
@@ -31,7 +38,7 @@
<scroll_list.columns label="名前" name="media_name"/>
<scroll_list.columns label="デバッグ" name="media_debug"/>
</scroll_list>
- <panel>
+ <panel name="media_controls_panel">
<layout_stack name="media_controls">
<layout_panel name="stop">
<button name="stop_btn" tool_tip="選択したメディアを停止"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
index 87cd772143..a8520a51cc 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
@@ -3,6 +3,9 @@
<panel.string name="aspect_ratio_text">
[NUM]:[DEN]
</panel.string>
+ <panel.string name="middle_mouse">
+ マウスの中央
+ </panel.string>
<slider label="視界角" name="camera_fov"/>
<slider label="距離" name="camera_offset_scale"/>
<text name="heading2">
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index a521556c79..e5780697b1 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -46,6 +46,12 @@
<check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/>
<check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/>
<check_box label="チャット履歴に文字だけ表示する" name="plain_text_chat_history"/>
+ <text name="show_ims_in_label">
+ IM の表示方法:
+ </text>
+ <text name="requires_restart_label">
+ (再起動後に反映)
+ </text>
<radio_group name="chat_window" tool_tip="インスタントメッセージを別フローター、または1つのフローターに複数タブで表示します(要再起動)">
<radio_item label="別々のウィンドウ" name="radio" value="0"/>
<radio_item label="タブ" name="radio2" value="1"/>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 18afe387b1..fb70c7db09 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -23,7 +23,22 @@
ハードウェアの検出中です...
</string>
<string name="StartupLoading">
- ローディング
+ [APP_NAME] をインストール中です...
+ </string>
+ <string name="StartupClearingCache">
+ キャッシュをクリア中です...
+ </string>
+ <string name="StartupInitializingTextureCache">
+ テクスチャキャッシュを初期化中です...
+ </string>
+ <string name="StartupInitializingVFS">
+ VFS を初期化中です...
+ </string>
+ <string name="ProgressRestoring">
+ 復元中です...
+ </string>
+ <string name="ProgressChangingResolution">
+ 解像度を変更中です...
</string>
<string name="Fullbright">
明るさ全開(レガシー)
@@ -88,6 +103,9 @@
<string name="LoginFailedNoNetwork">
ネットワークエラー: 接続を確立できませんでした。お使いのネットワーク接続をご確認ください。
</string>
+ <string name="LoginFailed">
+ ログインに失敗しました。
+ </string>
<string name="Quit">
終了
</string>
@@ -97,6 +115,24 @@
<string name="AgentLostConnection">
このリージョンに不都合が発生している可能性があります。 ご使用のインターネット接続をご確認ください。
</string>
+ <string name="SavingSettings">
+ 設定を保存中です...
+ </string>
+ <string name="LoggingOut">
+ ログアウト中です...
+ </string>
+ <string name="ShuttingDown">
+ シャットダウン中です...
+ </string>
+ <string name="YouHaveBeenDisconnected">
+ あなたがいたリージョンへの接続が切れました。
+ </string>
+ <string name="SentToInvalidRegion">
+ 無効なリージョンにテレポートされました。
+ </string>
+ <string name="TestingDisconnect">
+ ビューワの接続を切るテスト中
+ </string>
<string name="TooltipPerson">
</string>
@@ -151,6 +187,24 @@
<string name="TooltipAgentUrl">
クリックしてこの住人のプロフィールを見ます
</string>
+ <string name="TooltipAgentMute">
+ クリックしてこの住人に対して無視設定をします
+ </string>
+ <string name="TooltipAgentUnmute">
+ クリックしてこの住人に対する無視設定を解除します
+ </string>
+ <string name="TooltipAgentIM">
+ クリックしてこの住人に IM を送ります
+ </string>
+ <string name="TooltipAgentPay">
+ クリックしてこの住人に支払います
+ </string>
+ <string name="TooltipAgentOfferTeleport">
+ クリックしてこの住人にテレポートのリクエストを送ります
+ </string>
+ <string name="TooltipAgentRequestFriend">
+ クリックしてこの住人にフレンド登録リクエストを送ります
+ </string>
<string name="TooltipGroupUrl">
クリックしてこのグループの説明文を見ます
</string>
@@ -176,12 +230,31 @@
クリックして secondlife:// コマンドを出します
</string>
<string name="CurrentURL" value=" 現在の URL: [CurrentURL]"/>
+ <string name="TooltipPrice" value="L$[PRICE]-"/>
<string name="SLurlLabelTeleport">
テレポート
</string>
<string name="SLurlLabelShowOnMap">
地図に表示
</string>
+ <string name="SLappAgentMute">
+ 無視
+ </string>
+ <string name="SLappAgentUnmute">
+ ミュート解除
+ </string>
+ <string name="SLappAgentIM">
+ IM
+ </string>
+ <string name="SLappAgentPay">
+ 支払う
+ </string>
+ <string name="SLappAgentOfferTeleport">
+ 次の場所にテレポートを送ります:
+ </string>
+ <string name="SLappAgentRequestFriend">
+ フレンド登録リクエスト
+ </string>
<string name="BUTTON_CLOSE_DARWIN">
閉じる (⌘W)
</string>
@@ -335,6 +408,9 @@
<string name="symbolic link">
リンク
</string>
+ <string name="symbolic folder link">
+ フォルダのリンク
+ </string>
<string name="AvatarEditingAppearance">
(容姿の編集中)
</string>
@@ -849,6 +925,7 @@
コンテンツなし
</string>
<string name="WornOnAttachmentPoint" value=" ([ATTACHMENT_POINT] に装着中)"/>
+ <string name="ActiveGesture" value="[GESLABEL] (アクティブ)"/>
<string name="PermYes">
はい
</string>
@@ -948,6 +1025,9 @@
<string name="InvFolder My Outfits">
マイ アウトフィット
</string>
+ <string name="InvFolder Accessories">
+ アクセサリ
+ </string>
<string name="InvFolder Friends">
フレンド
</string>
@@ -1471,6 +1551,9 @@
<string name="PanelContentsNewScript">
新規スクリプト
</string>
+ <string name="PanelContentsTooltip">
+ オブジェクトの中身
+ </string>
<string name="BusyModeResponseDefault">
メッセージを送った住人は、誰にも邪魔をされたくないため現在「取り込み中」モードです。 あなたのメッセージは、あとで確認できるように IM パネルに表示されます。
</string>
@@ -3375,4 +3458,31 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
<string name="unread_chat_multiple">
[SOURCES] は何か新しいことを言いました。
</string>
+ <string name="paid_you_ldollars">
+ [NAME] は L$[AMOUNT] 支払いました
+ </string>
+ <string name="giving">
+ Giving
+ </string>
+ <string name="uploading_costs">
+ アップロード代金
+ </string>
+ <string name="this_costs">
+ This costs
+ </string>
+ <string name="buying_selected_land">
+ 選択した土地を購入
+ </string>
+ <string name="this_object_costs">
+ This object costs&quot;
+ </string>
+ <string name="group_role_everyone">
+ 全員
+ </string>
+ <string name="group_role_officers">
+ オフィサー
+ </string>
+ <string name="group_role_owners">
+ オーナー
+ </string>
</strings>