diff options
Diffstat (limited to 'indra')
135 files changed, 2387 insertions, 1514 deletions
diff --git a/indra/llcommon/llchat.h b/indra/llcommon/llchat.h index a77bd211f3..52238d4533 100644 --- a/indra/llcommon/llchat.h +++ b/indra/llcommon/llchat.h @@ -68,7 +68,8 @@ typedef enum e_chat_audible_level typedef enum e_chat_style { CHAT_STYLE_NORMAL, - CHAT_STYLE_IRC + CHAT_STYLE_IRC, + CHAT_STYLE_HISTORY }EChatStyle; // A piece of chat diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp index 22fad792da..a86bbbffff 100644 --- a/indra/llrender/llfontfreetype.cpp +++ b/indra/llrender/llfontfreetype.cpp @@ -270,6 +270,14 @@ F32 LLFontFreetype::getXAdvance(llwchar wch) const return (F32)mFontBitmapCachep->getMaxCharWidth(); } +F32 LLFontFreetype::getXAdvance(const LLFontGlyphInfo* glyph) const +{ + if (mFTFace == NULL) + return 0.0; + + return glyph->mXAdvance; +} + F32 LLFontFreetype::getXKerning(llwchar char_left, llwchar char_right) const { if (mFTFace == NULL) @@ -289,6 +297,21 @@ F32 LLFontFreetype::getXKerning(llwchar char_left, llwchar char_right) const return delta.x*(1.f/64.f); } +F32 LLFontFreetype::getXKerning(const LLFontGlyphInfo* left_glyph_info, const LLFontGlyphInfo* right_glyph_info) const +{ + if (mFTFace == NULL) + return 0.0; + + U32 left_glyph = left_glyph_info ? left_glyph_info->mGlyphIndex : 0; + U32 right_glyph = right_glyph_info ? right_glyph_info->mGlyphIndex : 0; + + FT_Vector delta; + + llverify(!FT_Get_Kerning(mFTFace, left_glyph, right_glyph, ft_kerning_unfitted, &delta)); + + return delta.x*(1.f/64.f); +} + BOOL LLFontFreetype::hasGlyph(llwchar wch) const { llassert(!mIsFallback); diff --git a/indra/llrender/llfontfreetype.h b/indra/llrender/llfontfreetype.h index 7a5d029038..f60d09316d 100644 --- a/indra/llrender/llfontfreetype.h +++ b/indra/llrender/llfontfreetype.h @@ -128,7 +128,9 @@ public: }; F32 getXAdvance(llwchar wc) const; + F32 getXAdvance(const LLFontGlyphInfo* glyph) const; F32 getXKerning(llwchar char_left, llwchar char_right) const; // Get the kerning between the two characters + F32 getXKerning(const LLFontGlyphInfo* left_glyph_info, const LLFontGlyphInfo* right_glyph_info) const; // Get the kerning between the two characters LLFontGlyphInfo* getGlyphInfo(llwchar wch) const; diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index 25f8320b02..32ebbd1e3b 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -248,11 +248,21 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons } + // Remember last-used texture to avoid unnecesssary bind calls. + LLImageGL *last_bound_texture = NULL; + + const LLFontGlyphInfo* next_glyph = NULL; + for (i = begin_offset; i < begin_offset + length; i++) { llwchar wch = wstr[i]; - const LLFontGlyphInfo* fgi= mFontFreetype->getGlyphInfo(wch); + const LLFontGlyphInfo* fgi = next_glyph; + next_glyph = NULL; + if(!fgi) + { + fgi = mFontFreetype->getGlyphInfo(wch); + } if (!fgi) { llerrs << "Missing Glyph Info" << llendl; @@ -290,7 +300,8 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons if (next_char && (next_char < LAST_CHARACTER)) { // Kern this puppy. - cur_x += mFontFreetype->getXKerning(wch, next_char); + next_glyph = mFontFreetype->getGlyphInfo(next_char); + cur_x += mFontFreetype->getXKerning(fgi, next_glyph); } // Round after kerning. @@ -427,14 +438,21 @@ F32 LLFontGL::getWidthF32(const llwchar* wchars, S32 begin_offset, S32 max_chars F32 cur_x = 0; const S32 max_index = begin_offset + max_chars; + const LLFontGlyphInfo* next_glyph = NULL; + F32 width_padding = 0.f; for (S32 i = begin_offset; i < max_index && wchars[i] != 0; i++) { llwchar wch = wchars[i]; - const LLFontGlyphInfo* fgi= mFontFreetype->getGlyphInfo(wch); + const LLFontGlyphInfo* fgi = next_glyph; + next_glyph = NULL; + if(!fgi) + { + fgi = mFontFreetype->getGlyphInfo(wch); + } - F32 advance = mFontFreetype->getXAdvance(wch); + F32 advance = mFontFreetype->getXAdvance(fgi); // for the last character we want to measure the greater of its width and xadvance values // so keep track of the difference between these values for the each character we measure @@ -451,7 +469,8 @@ F32 LLFontGL::getWidthF32(const llwchar* wchars, S32 begin_offset, S32 max_chars && (next_char < LAST_CHARACTER)) { // Kern this puppy. - cur_x += mFontFreetype->getXKerning(wch, next_char); + next_glyph = mFontFreetype->getGlyphInfo(next_char); + cur_x += mFontFreetype->getXKerning(fgi, next_glyph); } // Round after kerning. cur_x = (F32)llround(cur_x); @@ -484,6 +503,8 @@ S32 LLFontGL::maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_ch // avoid S32 overflow when max_pixels == S32_MAX by staying in floating point F32 scaled_max_pixels = ceil(max_pixels * sScaleX); F32 width_padding = 0.f; + + LLFontGlyphInfo* next_glyph = NULL; S32 i; for (i=0; (i < max_chars); i++) @@ -526,8 +547,13 @@ S32 LLFontGL::maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_ch in_word = TRUE; } } - - LLFontGlyphInfo* fgi = mFontFreetype->getGlyphInfo(wch); + + LLFontGlyphInfo* fgi = next_glyph; + next_glyph = NULL; + if(!fgi) + { + fgi = mFontFreetype->getGlyphInfo(wch); + } // account for glyphs that run beyond the starting point for the next glyphs width_padding = llmax( 0.f, // always use positive padding amount @@ -546,7 +572,8 @@ S32 LLFontGL::maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_ch if (((i+1) < max_chars) && wchars[i+1]) { // Kern this puppy. - cur_x += mFontFreetype->getXKerning(wch, wchars[i+1]); + next_glyph = mFontFreetype->getGlyphInfo(wchars[i+1]); + cur_x += mFontFreetype->getXKerning(fgi, next_glyph); } // Round after kerning. @@ -652,6 +679,8 @@ S32 LLFontGL::charFromPixelOffset(const llwchar* wchars, S32 begin_offset, F32 t const S32 max_index = begin_offset + llmin(S32_MAX - begin_offset, max_chars); F32 scaled_max_pixels = max_pixels * sScaleX; + + const LLFontGlyphInfo* next_glyph = NULL; S32 pos; for (pos = begin_offset; pos < max_index; pos++) @@ -661,7 +690,15 @@ S32 LLFontGL::charFromPixelOffset(const llwchar* wchars, S32 begin_offset, F32 t { break; // done } - F32 char_width = mFontFreetype->getXAdvance(wch); + + const LLFontGlyphInfo* glyph = next_glyph; + next_glyph = NULL; + if(!glyph) + { + glyph = mFontFreetype->getGlyphInfo(wch); + } + + F32 char_width = mFontFreetype->getXAdvance(glyph); if (round) { @@ -687,11 +724,12 @@ S32 LLFontGL::charFromPixelOffset(const llwchar* wchars, S32 begin_offset, F32 t if (((pos + 1) < max_index) && (wchars[(pos + 1)])) { - llwchar next_char = wchars[pos + 1]; // Kern this puppy. - cur_x += mFontFreetype->getXKerning(wch, next_char); + next_glyph = mFontFreetype->getGlyphInfo(wchars[pos + 1]); + cur_x += mFontFreetype->getXKerning(glyph, next_glyph); } + // Round after kerning. cur_x = llround(cur_x); } diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 0199fe3f57..b6d73cda3c 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -1574,22 +1574,25 @@ void LLFloater::draw() LLUIImage* image = NULL; LLColor4 color; + LLColor4 overlay_color; if (isBackgroundOpaque()) { // NOTE: image may not be set image = getBackgroundImage(); color = getBackgroundColor(); + overlay_color = getBackgroundImageOverlay(); } else { image = getTransparentImage(); color = getTransparentColor(); + overlay_color = getTransparentImageOverlay(); } if (image) { // We're using images for this floater's backgrounds - image->draw(getLocalRect(), UI_VERTEX_COLOR % alpha); + image->draw(getLocalRect(), overlay_color % alpha); } else { @@ -2387,10 +2390,17 @@ void LLFloaterView::adjustToFitScreen(LLFloater* floater, BOOL allow_partial_out LLRect new_rect; new_rect.setLeftTopAndSize(view_rect.mLeft,view_rect.mTop,new_width, new_height); - floater->reshape( new_width, new_height, TRUE ); - floater->setRect(new_rect); + floater->setShape(new_rect); - floater->translateIntoRect( getLocalRect(), false ); + if (floater->followsRight()) + { + floater->translate(old_width - new_width, 0); + } + + if (floater->followsTop()) + { + floater->translate(0, old_height - new_height); + } } } diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp index ede32084d0..75342afbe2 100644 --- a/indra/llui/llkeywords.cpp +++ b/indra/llui/llkeywords.cpp @@ -218,6 +218,86 @@ void LLKeywords::addToken(LLKeywordToken::TOKEN_TYPE type, llassert(0); } } +LLKeywords::WStringMapIndex::WStringMapIndex(const WStringMapIndex& other) +{ + if(other.mOwner) + { + copyData(other.mData, other.mLength); + } + else + { + mOwner = false; + mLength = other.mLength; + mData = other.mData; + } +} + +LLKeywords::WStringMapIndex::WStringMapIndex(const LLWString& str) +{ + copyData(str.data(), str.size()); +} + +LLKeywords::WStringMapIndex::WStringMapIndex(const llwchar *start, size_t length): +mData(start), mLength(length), mOwner(false) +{ +} + +LLKeywords::WStringMapIndex::~WStringMapIndex() +{ + if(mOwner) + delete[] mData; +} + +void LLKeywords::WStringMapIndex::copyData(const llwchar *start, size_t length) +{ + llwchar *data = new llwchar[length]; + memcpy((void*)data, (const void*)start, length * sizeof(llwchar)); + + mOwner = true; + mLength = length; + mData = data; +} + +bool LLKeywords::WStringMapIndex::operator<(const LLKeywords::WStringMapIndex &other) const +{ + // NOTE: Since this is only used to organize a std::map, it doesn't matter if it uses correct collate order or not. + // The comparison only needs to strictly order all possible strings, and be stable. + + bool result = false; + const llwchar* self_iter = mData; + const llwchar* self_end = mData + mLength; + const llwchar* other_iter = other.mData; + const llwchar* other_end = other.mData + other.mLength; + + while(true) + { + if(other_iter >= other_end) + { + // We've hit the end of other. + // This covers two cases: other being shorter than self, or the strings being equal. + // In either case, we want to return false. + result = false; + break; + } + else if(self_iter >= self_end) + { + // self is shorter than other. + result = true; + break; + } + else if(*self_iter != *other_iter) + { + // The current character differs. The strings are not equal. + result = *self_iter < *other_iter; + break; + } + + self_iter++; + other_iter++; + } + + return result; +} LLColor3 LLKeywords::readColor( const std::string& s ) { @@ -429,7 +509,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegmentPtr>* seg_list, const LLW S32 seg_len = p - cur; if( seg_len > 0 ) { - LLWString word( cur, 0, seg_len ); + WStringMapIndex word( cur, seg_len ); word_token_map_t::iterator map_iter = mWordTokenMap.find(word); if( map_iter != mWordTokenMap.end() ) { diff --git a/indra/llui/llkeywords.h b/indra/llui/llkeywords.h index 53377869ca..e5b66dfa56 100644 --- a/indra/llui/llkeywords.h +++ b/indra/llui/llkeywords.h @@ -92,8 +92,33 @@ public: const std::string& key, const LLColor3& color, const std::string& tool_tip = LLStringUtil::null); - - typedef std::map<LLWString, LLKeywordToken*> word_token_map_t; + + // This class is here as a performance optimization. + // The word token map used to be defined as std::map<LLWString, LLKeywordToken*>. + // This worked, but caused a performance bottleneck due to memory allocation and string copies + // because it's not possible to search such a map without creating an LLWString. + // Using this class as the map index instead allows us to search using segments of an existing + // text run without copying them first, which greatly reduces overhead in LLKeywords::findSegments(). + class WStringMapIndex + { + public: + // copy constructor + WStringMapIndex(const WStringMapIndex& other); + // constructor from a string (copies the string's data into the new object) + WStringMapIndex(const LLWString& str); + // constructor from pointer and length + // NOTE: does NOT copy data, caller must ensure that the lifetime of the pointer exceeds that of the new object! + WStringMapIndex(const llwchar *start, size_t length); + ~WStringMapIndex(); + bool operator<(const WStringMapIndex &other) const; + private: + void copyData(const llwchar *start, size_t length); + const llwchar *mData; + size_t mLength; + bool mOwner; + }; + + typedef std::map<WStringMapIndex, LLKeywordToken*> word_token_map_t; typedef word_token_map_t::const_iterator keyword_iterator_t; keyword_iterator_t begin() const { return mWordTokenMap.begin(); } keyword_iterator_t end() const { return mWordTokenMap.end(); } diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp index d963cf4c98..0cd052eefa 100644 --- a/indra/llui/llpanel.cpp +++ b/indra/llui/llpanel.cpp @@ -80,6 +80,8 @@ LLPanel::Params::Params() background_opaque("background_opaque", false), bg_opaque_color("bg_opaque_color"), bg_alpha_color("bg_alpha_color"), + bg_opaque_image_overlay("bg_opaque_image_overlay"), + bg_alpha_image_overlay("bg_alpha_image_overlay"), bg_opaque_image("bg_opaque_image"), bg_alpha_image("bg_alpha_image"), min_width("min_width", 100), @@ -103,6 +105,8 @@ LLPanel::LLPanel(const LLPanel::Params& p) mBgOpaque(p.background_opaque), mBgOpaqueColor(p.bg_opaque_color()), mBgAlphaColor(p.bg_alpha_color()), + mBgOpaqueImageOverlay(p.bg_opaque_image_overlay), + mBgAlphaImageOverlay(p.bg_alpha_image_overlay), mBgOpaqueImage(p.bg_opaque_image()), mBgAlphaImage(p.bg_alpha_image()), mDefaultBtn(NULL), @@ -199,7 +203,7 @@ void LLPanel::draw() // opaque, in-front look if (mBgOpaqueImage.notNull()) { - mBgOpaqueImage->draw( local_rect, UI_VERTEX_COLOR % alpha ); + mBgOpaqueImage->draw( local_rect, mBgOpaqueImageOverlay % alpha ); } else { @@ -212,7 +216,7 @@ void LLPanel::draw() // transparent, in-back look if (mBgAlphaImage.notNull()) { - mBgAlphaImage->draw( local_rect, UI_VERTEX_COLOR % alpha ); + mBgAlphaImage->draw( local_rect, mBgAlphaImageOverlay % alpha ); } else { @@ -481,6 +485,8 @@ void LLPanel::initFromParams(const LLPanel::Params& p) setTransparentColor(p.bg_alpha_color().get()); mBgOpaqueImage = p.bg_opaque_image(); mBgAlphaImage = p.bg_alpha_image(); + mBgOpaqueImageOverlay = p.bg_opaque_image_overlay; + mBgAlphaImageOverlay = p.bg_alpha_image_overlay; } static LLFastTimer::DeclareTimer FTM_PANEL_SETUP("Panel Setup"); diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h index 4e53fd7ea3..03e3dc0c0e 100644 --- a/indra/llui/llpanel.h +++ b/indra/llui/llpanel.h @@ -77,7 +77,9 @@ public: background_opaque; Optional<LLUIColor> bg_opaque_color, - bg_alpha_color; + bg_alpha_color, + bg_opaque_image_overlay, + bg_alpha_image_overlay; // opaque image is for "panel in foreground" look Optional<LLUIImage*> bg_opaque_image, bg_alpha_image; @@ -137,6 +139,8 @@ public: const LLColor4& getTransparentColor() const { return mBgAlphaColor; } LLPointer<LLUIImage> getBackgroundImage() const { return mBgOpaqueImage; } LLPointer<LLUIImage> getTransparentImage() const { return mBgAlphaImage; } + LLColor4 getBackgroundImageOverlay() { return mBgOpaqueImageOverlay; } + LLColor4 getTransparentImageOverlay() { return mBgAlphaImageOverlay; } void setBackgroundVisible( BOOL b ) { mBgVisible = b; } BOOL isBackgroundVisible() const { return mBgVisible; } void setBackgroundOpaque(BOOL b) { mBgOpaque = b; } @@ -262,6 +266,8 @@ private: BOOL mBgOpaque; // use opaque color or image LLUIColor mBgOpaqueColor; LLUIColor mBgAlphaColor; + LLUIColor mBgOpaqueImageOverlay; + LLUIColor mBgAlphaImageOverlay; LLPointer<LLUIImage> mBgOpaqueImage; // "panel in front" look LLPointer<LLUIImage> mBgAlphaImage; // "panel in back" look LLViewBorder* mBorder; diff --git a/indra/llui/llresizehandle.cpp b/indra/llui/llresizehandle.cpp index 367666efbd..00214d451c 100644 --- a/indra/llui/llresizehandle.cpp +++ b/indra/llui/llresizehandle.cpp @@ -124,7 +124,7 @@ BOOL LLResizeHandle::handleHover(S32 x, S32 y, MASK mask) { // Make sure the mouse in still over the application. We don't want to make the parent // so big that we can't see the resize handle any more. - + S32 screen_x; S32 screen_y; localPointToScreen(x, y, &screen_x, &screen_y); @@ -147,61 +147,68 @@ BOOL LLResizeHandle::handleHover(S32 x, S32 y, MASK mask) LLRect scaled_rect = orig_rect; S32 delta_x = screen_x - mDragLastScreenX; S32 delta_y = screen_y - mDragLastScreenY; - - if(delta_x == 0 && delta_y == 0) - return FALSE; - LLCoordGL mouse_dir; // use hysteresis on mouse motion to preserve user intent when mouse stops moving mouse_dir.mX = (screen_x == mLastMouseScreenX) ? mLastMouseDir.mX : screen_x - mLastMouseScreenX; mouse_dir.mY = (screen_y == mLastMouseScreenY) ? mLastMouseDir.mY : screen_y - mLastMouseScreenY; - mLastMouseScreenX = screen_x; mLastMouseScreenY = screen_y; mLastMouseDir = mouse_dir; - S32 new_width = orig_rect.getWidth(); - S32 new_height = orig_rect.getHeight(); + S32 x_multiple = 1; + S32 y_multiple = 1; + switch( mCorner ) + { + case LEFT_TOP: + x_multiple = -1; + y_multiple = 1; + break; + case LEFT_BOTTOM: + x_multiple = -1; + y_multiple = -1; + break; + case RIGHT_TOP: + x_multiple = 1; + y_multiple = 1; + break; + case RIGHT_BOTTOM: + x_multiple = 1; + y_multiple = -1; + break; + } - S32 new_pos_x = orig_rect.mLeft; - S32 new_pos_y = orig_rect.mTop; + S32 new_width = orig_rect.getWidth() + x_multiple * delta_x; + if( new_width < mMinWidth ) + { + new_width = mMinWidth; + delta_x = x_multiple * (mMinWidth - orig_rect.getWidth()); + } + + S32 new_height = orig_rect.getHeight() + y_multiple * delta_y; + if( new_height < mMinHeight ) + { + new_height = mMinHeight; + delta_y = y_multiple * (mMinHeight - orig_rect.getHeight()); + } switch( mCorner ) { - case LEFT_TOP: - new_width-=delta_x; - new_height+=delta_y; - new_pos_x+=delta_x; - new_pos_y+=delta_y; + case LEFT_TOP: + scaled_rect.translate(delta_x, 0); break; case LEFT_BOTTOM: - new_width-=delta_x; - new_height-=delta_y; - new_pos_x+=delta_x; + scaled_rect.translate(delta_x, delta_y); break; case RIGHT_TOP: - new_width+=delta_x; - new_height+=delta_y; - new_pos_y+=delta_y; break; case RIGHT_BOTTOM: - new_width+=delta_x; - new_height-=delta_y; + scaled_rect.translate(0, delta_y); break; } - new_width = llmax(new_width,mMinWidth); - new_height = llmax(new_height,mMinHeight); - - LLRect::tCoordType screen_width = resizing_view->getParent()->getSnapRect().getWidth(); - LLRect::tCoordType screen_height = resizing_view->getParent()->getSnapRect().getHeight(); - - new_width = llmin(new_width, screen_width); - new_height = llmin(new_height, screen_height); - // temporarily set new parent rect - scaled_rect.setLeftTopAndSize(new_pos_x,new_pos_y,new_width,new_height); - + scaled_rect.mRight = scaled_rect.mLeft + new_width; + scaled_rect.mTop = scaled_rect.mBottom + new_height; resizing_view->setRect(scaled_rect); LLView* snap_view = NULL; @@ -252,11 +259,7 @@ BOOL LLResizeHandle::handleHover(S32 x, S32 y, MASK mask) resizing_view->setRect(orig_rect); // translate and scale to new shape - resizing_view->reshape(scaled_rect.getWidth(),scaled_rect.getHeight()); - resizing_view->setRect(scaled_rect); - //set shape to handle dependent floaters... - resizing_view->handleReshape(scaled_rect, false); - + resizing_view->setShape(scaled_rect, true); // update last valid mouse cursor position based on resized view's actual size LLRect new_rect = resizing_view->getRect(); diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index b84e6f45fb..851fb966ec 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1445,10 +1445,10 @@ LLTextBase::segment_set_t::const_iterator LLTextBase::getSegIterContaining(S32 i } // Finds the text segment (if any) at the give local screen position -LLTextSegmentPtr LLTextBase::getSegmentAtLocalPos( S32 x, S32 y ) +LLTextSegmentPtr LLTextBase::getSegmentAtLocalPos( S32 x, S32 y, bool hit_past_end_of_line) { // Find the cursor position at the requested local screen position - S32 offset = getDocIndexFromLocalCoord( x, y, FALSE ); + S32 offset = getDocIndexFromLocalCoord( x, y, FALSE, hit_past_end_of_line); segment_set_t::iterator seg_iter = getSegIterContaining(offset); if (seg_iter != mSegments.end()) { @@ -1788,7 +1788,7 @@ const LLWString& LLTextBase::getWText() const // will be put to its right. If round is false, the cursor will always be put to the // character's left. -S32 LLTextBase::getDocIndexFromLocalCoord( S32 local_x, S32 local_y, BOOL round ) const +S32 LLTextBase::getDocIndexFromLocalCoord( S32 local_x, S32 local_y, BOOL round, bool hit_past_end_of_line) const { // Figure out which line we're nearest to. LLRect visible_region = getVisibleDocumentRect(); @@ -1817,7 +1817,7 @@ S32 LLTextBase::getDocIndexFromLocalCoord( S32 local_x, S32 local_y, BOOL round S32 text_width, text_height; segmentp->getDimensions(line_seg_offset, segment_line_length, text_width, text_height); if (local_x < start_x + text_width // cursor to left of right edge of text - || segmentp->getEnd() >= line_iter->mDocIndexEnd - 1) // or this segment wraps to next line + || (hit_past_end_of_line && (segmentp->getEnd() >= line_iter->mDocIndexEnd - 1))) // or this segment wraps to next line { // Figure out which character we're nearest to. S32 offset; @@ -2402,8 +2402,12 @@ BOOL LLNormalTextSegment::handleHover(S32 x, S32 y, MASK mask) { if (getStyle() && getStyle()->isLink()) { - LLUI::getWindow()->setCursor(UI_CURSOR_HAND); - return TRUE; + // Only process the click if it's actually in this segment, not to the right of the end-of-line. + if(mEditor.getSegmentAtLocalPos(x, y, false) == this) + { + LLUI::getWindow()->setCursor(UI_CURSOR_HAND); + return TRUE; + } } return FALSE; } @@ -2412,8 +2416,12 @@ BOOL LLNormalTextSegment::handleRightMouseDown(S32 x, S32 y, MASK mask) { if (getStyle() && getStyle()->isLink()) { - mEditor.createUrlContextMenu(x, y, getStyle()->getLinkHREF()); - return TRUE; + // Only process the click if it's actually in this segment, not to the right of the end-of-line. + if(mEditor.getSegmentAtLocalPos(x, y, false) == this) + { + mEditor.createUrlContextMenu(x, y, getStyle()->getLinkHREF()); + return TRUE; + } } return FALSE; } @@ -2422,8 +2430,12 @@ BOOL LLNormalTextSegment::handleMouseDown(S32 x, S32 y, MASK mask) { if (getStyle() && getStyle()->isLink()) { - // eat mouse down event on hyperlinks, so we get the mouse up - return TRUE; + // Only process the click if it's actually in this segment, not to the right of the end-of-line. + if(mEditor.getSegmentAtLocalPos(x, y, false) == this) + { + // eat mouse down event on hyperlinks, so we get the mouse up + return TRUE; + } } return FALSE; @@ -2433,8 +2445,12 @@ BOOL LLNormalTextSegment::handleMouseUp(S32 x, S32 y, MASK mask) { if (getStyle() && getStyle()->isLink()) { - LLUrlAction::clickAction(getStyle()->getLinkHREF()); - return TRUE; + // Only process the click if it's actually in this segment, not to the right of the end-of-line. + if(mEditor.getSegmentAtLocalPos(x, y, false) == this) + { + LLUrlAction::clickAction(getStyle()->getLinkHREF()); + return TRUE; + } } return FALSE; diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index 3dda6f4cc8..5b24c63557 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -48,6 +48,7 @@ class LLContextMenu; class LLTextSegment; +class LLNormalTextSegment; typedef LLPointer<LLTextSegment> LLTextSegmentPtr; @@ -61,6 +62,9 @@ class LLTextBase protected LLEditMenuHandler { public: + friend class LLTextSegment; + friend class LLNormalTextSegment; + struct LineSpacingParams : public LLInitParam::Choice<LineSpacingParams> { Alternative<F32> multiple; @@ -165,7 +169,7 @@ public: S32 getVPad() { return mVPad; } S32 getHPad() { return mHPad; } - S32 getDocIndexFromLocalCoord( S32 local_x, S32 local_y, BOOL round ) const; + S32 getDocIndexFromLocalCoord( S32 local_x, S32 local_y, BOOL round, bool hit_past_end_of_line = true) const; LLRect getLocalRectFromDocIndex(S32 pos) const; LLRect getDocRectFromDocIndex(S32 pos) const; @@ -275,7 +279,7 @@ protected: // manage segments void getSegmentAndOffset( S32 startpos, segment_set_t::const_iterator* seg_iter, S32* offsetp ) const; void getSegmentAndOffset( S32 startpos, segment_set_t::iterator* seg_iter, S32* offsetp ); - LLTextSegmentPtr getSegmentAtLocalPos( S32 x, S32 y ); + LLTextSegmentPtr getSegmentAtLocalPos( S32 x, S32 y, bool hit_past_end_of_line = true); segment_set_t::iterator getSegIterContaining(S32 index); segment_set_t::const_iterator getSegIterContaining(S32 index) const; void clearSegments(); diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index 7cd06c9c37..1266a94287 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -1597,12 +1597,82 @@ U32 LLWindowSDL::SDLCheckGrabbyKeys(SDLKey keysym, BOOL gain) return mGrabbyKeyFlags; } + +void check_vm_bloat() +{ +#if LL_LINUX + // watch our own VM and RSS sizes, warn if we bloated rapidly + FILE *fp = fopen("/proc/self/stat", "r"); + if (fp) + { + static long long last_vm_size = 0; + static long long last_rss_size = 0; + const long long significant_vm_difference = 250 * 1024*1024; + const long long significant_rss_difference = 50 * 1024*1024; + + size_t dummy; + char *ptr; + for (int i=0; i<22; ++i) // parse past the values we don't want + { + ptr = NULL; + getdelim(&ptr, &dummy, ' ', fp); + free(ptr); + } + // 23rd space-delimited entry is vsize + ptr = NULL; + getdelim(&ptr, &dummy, ' ', fp); + llassert(ptr); + long long this_vm_size = atoll(ptr); + free(ptr); + // 24th space-delimited entry is RSS + ptr = NULL; + getdelim(&ptr, &dummy, ' ', fp); + llassert(ptr); + long long this_rss_size = getpagesize() * atoll(ptr); + free(ptr); + + llinfos << "VM SIZE IS NOW " << (this_vm_size/(1024*1024)) << " MB, RSS SIZE IS NOW " << (this_rss_size/(1024*1024)) << " MB" << llendl; + + if (llabs(last_vm_size - this_vm_size) > + significant_vm_difference) + { + if (this_vm_size > last_vm_size) + { + llwarns << "VM size grew by " << (this_vm_size - last_vm_size)/(1024*1024) << " MB in last frame" << llendl; + } + else + { + llinfos << "VM size shrank by " << (last_vm_size - this_vm_size)/(1024*1024) << " MB in last frame" << llendl; + } + } + + if (llabs(last_rss_size - this_rss_size) > + significant_rss_difference) + { + if (this_rss_size > last_rss_size) + { + llwarns << "RSS size grew by " << (this_rss_size - last_rss_size)/(1024*1024) << " MB in last frame" << llendl; + } + else + { + llinfos << "RSS size shrank by " << (last_rss_size - this_rss_size)/(1024*1024) << " MB in last frame" << llendl; + } + } + + last_rss_size = this_rss_size; + last_vm_size = this_vm_size; + + fclose(fp); + } +#endif // LL_LINUX +} + + // virtual void LLWindowSDL::processMiscNativeEvents() { #if LL_GTK // Pump GTK events to avoid starvation for: - // * Embedded Gecko // * DBUS servicing // * Anything else which quietly hooks into the default glib/GTK loop if (ll_try_gtk_init()) @@ -1628,6 +1698,12 @@ void LLWindowSDL::processMiscNativeEvents() setlocale(LC_ALL, saved_locale.c_str() ); } #endif // LL_GTK + + // hack - doesn't belong here - but this is just for debugging + if (getenv("LL_DEBUG_BLOAT")) + { + check_vm_bloat(); + } } void LLWindowSDL::gatherInput() diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index c9082da9a9..92031be8c5 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -350,7 +350,7 @@ void LLBottomTray::setVisible(BOOL visible) { mBottomTrayLite->setVisible(visible); } - else + else { LLPanel::setVisible(visible); } diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 8fb9decf7b..6180b880b5 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -66,8 +66,6 @@ static LLDefaultChildRegistry::Register<LLChatHistory> r("chat_history"); const static std::string NEW_LINE(rawstr_to_utf8("\n")); -const static U32 LENGTH_OF_TIME_STR = std::string("12:00").length(); - const static std::string SLURL_APP_AGENT = "secondlife:///app/agent/"; const static std::string SLURL_ABOUT = "/about"; @@ -435,7 +433,8 @@ LLChatHistory::LLChatHistory(const LLChatHistory::Params& p) mTopSeparatorPad(p.top_separator_pad), mBottomSeparatorPad(p.bottom_separator_pad), mTopHeaderPad(p.top_header_pad), - mBottomHeaderPad(p.bottom_header_pad) + mBottomHeaderPad(p.bottom_header_pad), + mIsLastMessageFromLog(false) { LLTextEditor::Params editor_params(p); editor_params.rect = getLocalRect(); @@ -602,8 +601,8 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL style_params.font.style = "ITALIC"; } - //*HACK we graying out chat history by graying out messages that contains full date in a time string - bool message_from_log = chat.mTimeStr.length() > LENGTH_OF_TIME_STR; + bool message_from_log = chat.mChatStyle == CHAT_STYLE_HISTORY; + // We graying out chat history by graying out messages that contains full date in a time string if (message_from_log) { style_params.color(LLColor4::grey); @@ -672,7 +671,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL && mLastFromID == chat.mFromID && mLastMessageTime.notNull() && (new_message_time.secondsSinceEpoch() - mLastMessageTime.secondsSinceEpoch()) < 60.0 - && mLastMessageTimeStr.size() == chat.mTimeStr.size()) //*HACK to distinguish between current and previous chat session's histories + && mIsLastMessageFromLog == message_from_log) //distinguish between current and previous chat session's histories { view = getSeparator(); p.top_pad = mTopSeparatorPad; @@ -706,7 +705,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL mLastFromName = chat.mFromName; mLastFromID = chat.mFromID; mLastMessageTime = new_message_time; - mLastMessageTimeStr = chat.mTimeStr; + mIsLastMessageFromLog = message_from_log; } if (chat.mNotifId.notNull()) diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h index 32600bb71d..950b32861b 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -128,7 +128,8 @@ class LLChatHistory : public LLUICtrl std::string mLastFromName; LLUUID mLastFromID; LLDate mLastMessageTime; - std::string mLastMessageTimeStr; + bool mIsLastMessageFromLog; + //std::string mLastMessageTimeStr; std::string mMessageHeaderFilename; std::string mMessageSeparatorFilename; diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 847695577a..9c0e7a158d 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -633,12 +633,14 @@ void LLIMFloater::updateMessages() LLUUID from_id = msg["from_id"].asUUID(); std::string from = msg["from"].asString(); std::string message = msg["message"].asString(); + bool is_history = msg["is_history"].asBoolean(); LLChat chat; chat.mFromID = from_id; chat.mSessionID = mSessionID; chat.mFromName = from; chat.mTimeStr = time; + chat.mChatStyle = is_history ? CHAT_STYLE_HISTORY : chat.mChatStyle; // process offer notification if (msg.has("notification_id")) diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 77e3012d26..faddffe0fc 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -357,7 +357,7 @@ void LLIMModel::LLIMSession::sessionInitReplyReceived(const LLUUID& new_session_ } } -void LLIMModel::LLIMSession::addMessage(const std::string& from, const LLUUID& from_id, const std::string& utf8_text, const std::string& time) +void LLIMModel::LLIMSession::addMessage(const std::string& from, const LLUUID& from_id, const std::string& utf8_text, const std::string& time, const bool is_history) { LLSD message; message["from"] = from; @@ -365,6 +365,7 @@ void LLIMModel::LLIMSession::addMessage(const std::string& from, const LLUUID& f message["message"] = utf8_text; message["time"] = time; message["index"] = (LLSD::Integer)mMsgs.size(); + message["is_history"] = is_history; mMsgs.push_front(message); @@ -393,7 +394,7 @@ void LLIMModel::LLIMSession::addMessagesFromHistory(const std::list<LLSD>& histo std::string timestamp = msg[IM_TIME]; std::string text = msg[IM_TEXT]; - addMessage(from, from_id, text, timestamp); + addMessage(from, from_id, text, timestamp, true); it++; } @@ -407,11 +408,11 @@ void LLIMModel::LLIMSession::chatFromLogFile(LLLogChat::ELogLineType type, const if (type == LLLogChat::LOG_LINE) { - self->addMessage("", LLSD(), msg["message"].asString(), ""); + self->addMessage("", LLSD(), msg["message"].asString(), "", true); } else if (type == LLLogChat::LOG_LLSD) { - self->addMessage(msg["from"].asString(), msg["from_id"].asUUID(), msg["message"].asString(), msg["time"].asString()); + self->addMessage(msg["from"].asString(), msg["from_id"].asUUID(), msg["message"].asString(), msg["time"].asString(), true); } } diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index ad6cede727..e7404074e0 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -66,7 +66,7 @@ public: void sessionInitReplyReceived(const LLUUID& new_session_id); void addMessagesFromHistory(const std::list<LLSD>& history); - void addMessage(const std::string& from, const LLUUID& from_id, const std::string& utf8_text, const std::string& time); + void addMessage(const std::string& from, const LLUUID& from_id, const std::string& utf8_text, const std::string& time, const bool is_history = false); void onVoiceChannelStateChanged(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state, const LLVoiceChannel::EDirection& direction); /** @deprecated */ diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index c66d067779..e493c4bf9c 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -358,6 +358,20 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p) getTextEntry()->setRightMouseUpCallback(boost::bind(&LLLocationInputCtrl::onTextEditorRightClicked,this,_2,_3,_4)); updateWidgetlayout(); + // Connecting signal for updating location on "Show Coordinates" setting change. + LLControlVariable* coordinates_control = gSavedSettings.getControl("NavBarShowCoordinates").get(); + if (coordinates_control) + { + mCoordinatesControlConnection = coordinates_control->getSignal()->connect(boost::bind(&LLLocationInputCtrl::refreshLocation, this)); + } + + // Connecting signal for updating parcel icons on "Show Parcel Properties" setting change. + LLControlVariable* parcel_properties_control = gSavedSettings.getControl("NavBarShowParcelProperties").get(); + if (parcel_properties_control) + { + mParcelPropertiesControlConnection = parcel_properties_control->getSignal()->connect(boost::bind(&LLLocationInputCtrl::refreshParcelIcons, this)); + } + // - Make the "Add landmark" button updated when either current parcel gets changed // or a landmark gets created or removed from the inventory. // - Update the location string on parcel change. @@ -391,6 +405,8 @@ LLLocationInputCtrl::~LLLocationInputCtrl() LLViewerParcelMgr::getInstance()->removeObserver(mParcelChangeObserver); delete mParcelChangeObserver; + mCoordinatesControlConnection.disconnect(); + mParcelPropertiesControlConnection.disconnect(); mParcelMgrConnection.disconnect(); mLocationHistoryConnection.disconnect(); } @@ -763,8 +779,7 @@ void LLLocationInputCtrl::refreshParcelIcons() // Our "cursor" moving right to left S32 x = mAddLandmarkBtn->getRect().mLeft; - static LLUICachedControl<bool> show_properties("NavBarShowParcelProperties", false); - if (show_properties) + if (gSavedSettings.getBOOL("NavBarShowParcelProperties")) { LLViewerParcelMgr* vpm = LLViewerParcelMgr::getInstance(); @@ -1008,7 +1023,6 @@ void LLLocationInputCtrl::onLocationContextMenuItemClicked(const LLSD& userdata) { gSavedSettings.setBOOL("NavBarShowParcelProperties", !gSavedSettings.getBOOL("NavBarShowParcelProperties")); - refreshParcelIcons(); } else if (item == "landmark") { diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h index caa62daa1b..4bb41f3bf4 100644 --- a/indra/newview/lllocationinputctrl.h +++ b/indra/newview/lllocationinputctrl.h @@ -174,6 +174,8 @@ private: LLRemoveLandmarkObserver* mRemoveLandmarkObserver; LLParcelChangeObserver* mParcelChangeObserver; + boost::signals2::connection mCoordinatesControlConnection; + boost::signals2::connection mParcelPropertiesControlConnection; boost::signals2::connection mParcelMgrConnection; boost::signals2::connection mLocationHistoryConnection; LLUIImage* mLandmarkImageOn; diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index f13445fa5d..3650b43364 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -39,12 +39,17 @@ #include "llviewercontrol.h" #include "llinstantmessage.h" +#include "llsingleton.h" // for LLSingleton #include <boost/algorithm/string/trim.hpp> #include <boost/algorithm/string/replace.hpp> #include <boost/regex.hpp> #include <boost/regex/v4/match_results.hpp> +#include <boost/date_time/gregorian/gregorian.hpp> +#include <boost/date_time/posix_time/posix_time.hpp> +#include <boost/date_time/local_time_adjustor.hpp> + const S32 LOG_RECALL_SIZE = 2048; const static std::string IM_TIME("time"); @@ -83,11 +88,93 @@ const static boost::regex NAME_AND_TEXT("(You:|Second Life:|[^\\s:]+\\s*[:]{1}|\ //is used to parse complex object names like "Xstreet SL Terminal v2.2.5 st" const static std::string NAME_TEXT_DIVIDER(": "); +// is used for timestamps adjusting +const static char* DATE_FORMAT("%Y/%m/%d %H:%M"); +const static char* TIME_FORMAT("%H:%M"); + const static int IDX_TIMESTAMP = 1; const static int IDX_STUFF = 2; const static int IDX_NAME = 1; const static int IDX_TEXT = 3; +using namespace boost::posix_time; +using namespace boost::gregorian; + +class LLLogChatTimeScaner: public LLSingleton<LLLogChatTimeScaner> +{ +public: + LLLogChatTimeScaner() + { + // Note, date/time facets will be destroyed by string streams + mDateStream.imbue(std::locale(mDateStream.getloc(), new date_input_facet(DATE_FORMAT))); + mTimeStream.imbue(std::locale(mTimeStream.getloc(), new time_facet(TIME_FORMAT))); + mTimeStream.imbue(std::locale(mTimeStream.getloc(), new time_input_facet(DATE_FORMAT))); + } + + date getTodayPacificDate() + { + typedef boost::date_time::local_adjustor<ptime, -8, no_dst> pst; + typedef boost::date_time::local_adjustor<ptime, -7, no_dst> pdt; + time_t t_time = time(NULL); + ptime p_time = LLStringOps::getPacificDaylightTime() + ? pdt::utc_to_local(from_time_t(t_time)) + : pst::utc_to_local(from_time_t(t_time)); + struct tm s_tm = to_tm(p_time); + return date_from_tm(s_tm); + } + + void checkAndCutOffDate(std::string& time_str) + { + // Cuts off the "%Y/%m/%d" from string for todays timestamps. + // Assume that passed string has at least "%H:%M" time format. + date log_date(not_a_date_time); + date today(getTodayPacificDate()); + + // Parse the passed date + mDateStream.str(LLStringUtil::null); + mDateStream << time_str; + mDateStream >> log_date; + mDateStream.clear(); + + days zero_days(0); + days days_alive = today - log_date; + + if ( days_alive == zero_days ) + { + // Yep, today's so strip "%Y/%m/%d" info + ptime stripped_time(not_a_date_time); + + mTimeStream.str(LLStringUtil::null); + mTimeStream << time_str; + mTimeStream >> stripped_time; + mTimeStream.clear(); + + time_str.clear(); + + mTimeStream.str(LLStringUtil::null); + mTimeStream << stripped_time; + mTimeStream >> time_str; + mTimeStream.clear(); + } + + LL_DEBUGS("LLChatLogParser") + << " log_date: " + << log_date + << " today: " + << today + << " days alive: " + << days_alive + << " new time: " + << time_str + << LL_ENDL; + } + + +private: + std::stringstream mDateStream; + std::stringstream mTimeStream; +}; + //static std::string LLLogChat::makeLogFileName(std::string filename) { @@ -377,7 +464,8 @@ bool LLChatLogParser::parse(std::string& raw, LLSD& im) boost::trim(timestamp); timestamp.erase(0, 1); timestamp.erase(timestamp.length()-1, 1); - im[IM_TIME] = timestamp; + LLLogChatTimeScaner::instance().checkAndCutOffDate(timestamp); + im[IM_TIME] = timestamp; } else { diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 8fc11d3929..16384ef6e0 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -303,6 +303,7 @@ void LLNearbyChat::loadHistory() chat.mFromID = from_id; chat.mText = msg[IM_TEXT].asString(); chat.mTimeStr = msg[IM_TIME].asString(); + chat.mChatStyle = CHAT_STYLE_HISTORY; addMessage(chat, true, do_not_log); it++; diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp index c187ee7bf2..aefbe9a3de 100644 --- a/indra/newview/llnotificationhandlerutil.cpp +++ b/indra/newview/llnotificationhandlerutil.cpp @@ -54,6 +54,8 @@ const static std::string GRANTED_MODIFY_RIGHTS("GrantedModifyRights"), OFFER_FRIENDSHIP("OfferFriendship"), FRIENDSHIP_ACCEPTED("FriendshipAccepted"), FRIENDSHIP_OFFERED("FriendshipOffered"), + FRIENDSHIP_ACCEPTED_BYME("FriendshipAcceptedByMe"), + FRIENDSHIP_DECLINED_BYME("FriendshipDeclinedByMe"), FRIEND_ONLINE("FriendOnline"), FRIEND_OFFLINE("FriendOffline"), SERVER_OBJECT_MESSAGE("ServerObjectMessage"), TELEPORT_OFFERED("TeleportOffered"); @@ -66,6 +68,8 @@ bool LLHandlerUtil::canLogToIM(const LLNotificationPtr& notification) || PAYMENT_RECIVED == notification->getName() || OFFER_FRIENDSHIP == notification->getName() || FRIENDSHIP_OFFERED == notification->getName() + || FRIENDSHIP_ACCEPTED_BYME == notification->getName() + || FRIENDSHIP_DECLINED_BYME == notification->getName() || SERVER_OBJECT_MESSAGE == notification->getName() || INVENTORY_ACCEPTED == notification->getName() || INVENTORY_DECLINED == notification->getName(); diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp index c55c8d6221..be76959d07 100644 --- a/indra/newview/llnotificationtiphandler.cpp +++ b/indra/newview/llnotificationtiphandler.cpp @@ -43,7 +43,7 @@ using namespace LLNotificationsUI; -class LLOnalineStatusToast : public LLToastPanel +class LLOnlineStatusToast : public LLToastPanel { public: @@ -56,9 +56,9 @@ public: Params() {} }; - LLOnalineStatusToast(Params& p) : LLToastPanel(p.notification) + LLOnlineStatusToast(Params& p) : LLToastPanel(p.notification) { - LLUICtrlFactory::getInstance()->buildPanel(this, "panel_online_status.xml"); + LLUICtrlFactory::getInstance()->buildPanel(this, "panel_online_status_toast.xml"); childSetValue("avatar_icon", p.avatar_id); childSetValue("message", p.message); @@ -148,11 +148,11 @@ bool LLTipHandler::processNotification(const LLSD& notify) LLToastPanel* notify_box = NULL; if("FriendOffline" == notification->getName() || "FriendOnline" == notification->getName()) { - LLOnalineStatusToast::Params p; + LLOnlineStatusToast::Params p; p.notification = notification; p.message = notification->getMessage(); p.avatar_id = notification->getPayload()["FROM_ID"]; - notify_box = new LLOnalineStatusToast(p); + notify_box = new LLOnlineStatusToast(p); } else { diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 642f672faf..395467dffb 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1318,6 +1318,9 @@ void LLViewerMediaImpl::loadURI() { if(mMediaSource) { + // trim whitespace from front and back of URL - fixes EXT-5363 + LLStringUtil::trim( mMediaURL ); + // *HACK: we don't know if the URI coming in is properly escaped // (the contract doesn't specify whether it is escaped or not. // but LLQtWebKit expects it to be, so we do our best to encode diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 5338ae9346..6a9e6f090f 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -193,9 +193,20 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response) msg->nextBlockFast(_PREHASH_FolderData); msg->addUUIDFast(_PREHASH_FolderID, fid); msg->sendReliable(LLHost(payload["sender"].asString())); + + LLSD payload = notification["payload"]; + payload["SUPPRESS_TOAST"] = true; + LLNotificationsUtil::add("FriendshipAcceptedByMe", + notification["substitutions"], payload); break; } case 1: // Decline + { + LLSD payload = notification["payload"]; + payload["SUPPRESS_TOAST"] = true; + LLNotificationsUtil::add("FriendshipDeclinedByMe", + notification["substitutions"], payload); + } case 2: // Send IM - decline and start IM session { // decline @@ -2212,7 +2223,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) LLSD args; args["owner_id"] = from_id; args["slurl"] = location; - nearby_chat->addMessage(chat, true, args); + args["type"] = LLNotificationsUI::NT_NEARBYCHAT; + LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args); } diff --git a/indra/newview/skins/default/xui/de/floater_buy_land.xml b/indra/newview/skins/default/xui/de/floater_buy_land.xml index 5efa557869..7426e97d9e 100644 --- a/indra/newview/skins/default/xui/de/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/de/floater_buy_land.xml @@ -1,43 +1,170 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="buy land" title="LAND KAUFEN"> + <floater.string name="can_resell"> + Verkauf möglich. + </floater.string> + <floater.string name="can_not_resell"> + Verkauf nicht möglich. + </floater.string> + <floater.string name="can_change"> + Zusammenlegen/unterteilen möglich. + </floater.string> + <floater.string name="can_not_change"> + Zusammenlegen/unterteilen nicht möglich. + </floater.string> + <floater.string name="cant_buy_for_group"> + Sie sind nicht berechtigt, Land fÃŒr die aktive Gruppe zu kaufen. + </floater.string> + <floater.string name="no_land_selected"> + Kein Land ausgewÀhlt. + </floater.string> + <floater.string name="multiple_parcels_selected"> + Mehrere unterschiedliche Parzellen ausgewÀhlt. +Verkleinern Sie Ihre Auswahl. + </floater.string> + <floater.string name="no_permission"> + Sie sind nicht berechtigt, Land fÃŒr die aktive Gruppe zu kaufen. + </floater.string> + <floater.string name="parcel_not_for_sale"> + Die ausgewÀhlte Parzelle steht nicht zum Verkauf. + </floater.string> + <floater.string name="group_already_owns"> + Die Parzelle befindet sich bereits in Gruppenbesitz. + </floater.string> + <floater.string name="you_already_own"> + Die Parzelle gehört Ihnen bereits. + </floater.string> + <floater.string name="set_to_sell_to_other"> + Die ausgewÀhlte Parzelle steht zum Verkauf an Dritte. + </floater.string> + <floater.string name="no_public_land"> + Das ausgewÀhlte Land beinhaltet kein öffentliches Land. + </floater.string> + <floater.string name="not_owned_by_you"> + Sie haben Land ausgewÀhlt, das einer anderen Person gehört. +Verkleinern Sie Ihre Auswahl. + </floater.string> + <floater.string name="processing"> + Kauf wird abgewickelt... + +(Dies kann 1 bis 2 Minuten dauern.) + </floater.string> + <floater.string name="fetching_error"> + Fehler bei Abfrage der Landkauf-Informationen. + </floater.string> + <floater.string name="buying_will"> + Bei Landkauf: + </floater.string> + <floater.string name="buying_for_group"> + Landkauf fÃŒr Gruppe: + </floater.string> + <floater.string name="cannot_buy_now"> + Kaufen jetzt nicht möglich: + </floater.string> + <floater.string name="not_for_sale"> + Nicht zu verkaufen: + </floater.string> + <floater.string name="none_needed"> + nicht benötigt + </floater.string> + <floater.string name="must_upgrade"> + Sie mÃŒssen Ihr Konto upgraden, um Land kaufen zu können. + </floater.string> + <floater.string name="cant_own_land"> + Mit Ihrem Konto können Sie Land kaufen. + </floater.string> + <floater.string name="land_holdings"> + Sie besitzen [BUYER] m² Land. + </floater.string> + <floater.string name="pay_to_for_land"> + [SELLER] [AMOUNT] L$ fÃŒr das Land bezahlen + </floater.string> + <floater.string name="buy_for_US"> + Kaufen Sie [AMOUNT] L$ fÃŒr ca. [LOCAL_AMOUNT], + </floater.string> + <floater.string name="parcel_meters"> + Diese Parzelle ist [AMOUNT] m². + </floater.string> + <floater.string name="premium_land"> + Dieses Land ist eine Premium-Immobilie. Es wird mit [AMOUNT] m² angesetzt. + </floater.string> + <floater.string name="discounted_land"> + Dieses Land ist im Angebot. Es wird mit [AMOUNT] m² angesetzt. + </floater.string> + <floater.string name="meters_supports_object"> + [AMOUNT] m² +unterstÃŒtzt [AMOUNT2] Objekte + </floater.string> + <floater.string name="sold_with_objects"> + mit Objekten verkauft + </floater.string> + <floater.string name="sold_without_objects"> + Objekte nicht im Verkauf mit eingeschlossen + </floater.string> + <floater.string name="info_price_string"> + [PRICE] L$ +([PRICE_PER_SQM] L$/m²) +[SOLD_WITH_OBJECTS] + </floater.string> + <floater.string name="insufficient_land_credits"> + Die Gruppe [GROUP] benötigt ausreichende gespendete Landnutzungsrechte, um die Parzelle abzudecken, bevor der Kauf abgeschlossen werden kann. + </floater.string> + <floater.string name="have_enough_lindens"> + Sie haben [AMOUNT] L$, genug zum Kauf dieses Landes. + </floater.string> + <floater.string name="not_enough_lindens"> + Sie haben nur [AMOUNT] L$, brauchen aber mindestens [AMOUNT2] L$. + </floater.string> + <floater.string name="balance_left"> + Nach dem Einkauf verbleiben Ihnen noch [AMOUNT] L$. + </floater.string> + <floater.string name="balance_needed"> + FÃŒr dieses Land mÃŒssen Sie mindestens [AMOUNT] L$ kaufen. + </floater.string> + <floater.string name="no_parcel_selected"> + (keine Parzelle ausgewÀhlt) + </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> - <text left="680" name="region_name_text" left_delta="140"> + <text left="680" left_delta="140" name="region_name_text"> (unbekannt) </text> <text name="region_type_label"> Typ: </text> - <text left="680" name="region_type_text" left_delta="140"> + <text left="680" left_delta="140" name="region_type_text"> (unbekannt) </text> <text name="estate_name_label"> GrundstÃŒck: </text> - <text left="680" name="estate_name_text" left_delta="140"> + <text left="680" left_delta="140" name="estate_name_text"> (unbekannt) </text> <text name="estate_owner_label" right="600" width="200"> GrundstÃŒckseigentÃŒmer: </text> - <text left="680" name="estate_owner_text" left_delta="140"> + <text left="680" left_delta="140" name="estate_owner_text"> (unbekannt) </text> - <text name="resellable_changeable_label" left="410"> + <text left="410" name="resellable_changeable_label"> Gekauftes Land in dieser Region: </text> - <text name="resellable_clause" left="410"> + <text left="410" name="resellable_clause"> Wiederverkauf möglich oder nicht möglich. </text> - <text name="changeable_clause" left="410"> + <text left="410" name="changeable_clause"> Darft oder darf nicht zusammengelegt/unterteilt werden. </text> - <text name="covenant_text" left="410"> + <text left="410" name="covenant_text"> Sie mÃŒssen dem GrundstÃŒcksvertrag zustimmen: </text> <text left="470" name="covenant_timestamp_text"/> - <text_editor name="covenant_editor" left="470"> + <text_editor left="470" name="covenant_editor"> Wird geladen... </text_editor> <check_box label="Ich stimme dem obigen Vertrag zu." name="agree_covenant"/> @@ -79,7 +206,7 @@ Objekte im Verkauf eingeschlossen <combo_box.item label="7,50 US$/Monat, vierteljÀhrliche Abrechnung" name="US$7.50/month,billedquarterly"/> <combo_box.item label="6,00 US$/Monat, jÀhrliche Abrechnung" name="US$6.00/month,billedannually"/> </combo_box> - <text name="land_use_action" top="270" height="36"> + <text height="36" name="land_use_action" top="270"> Erhöhen Sie Ihre monatlichen LandnutzungsgebÃŒhren auf 40 US$/month. </text> @@ -108,131 +235,4 @@ Diese Parzelle ist 512 m² gross. <check_box label="[AMOUNT] m² Beitrag von der Gruppe entfernen." name="remove_contribution"/> <button label="Kaufen" name="buy_btn"/> <button label="Abbrechen" name="cancel_btn"/> - <string name="can_resell"> - Verkauf möglich. - </string> - <string name="can_not_resell"> - Verkauf nicht möglich. - </string> - <string name="can_change"> - Zusammenlegen/unterteilen möglich. - </string> - <string name="can_not_change"> - Zusammenlegen/unterteilen nicht möglich. - </string> - <string name="cant_buy_for_group"> - Sie sind nicht berechtigt, Land fÃŒr die aktive Gruppe zu kaufen. - </string> - <string name="no_land_selected"> - Kein Land ausgewÀhlt. - </string> - <string name="multiple_parcels_selected"> - Mehrere unterschiedliche Parzellen ausgewÀhlt. -Verkleinern Sie Ihre Auswahl. - </string> - <string name="no_permission"> - Sie sind nicht berechtigt, Land fÃŒr die aktive Gruppe zu kaufen. - </string> - <string name="parcel_not_for_sale"> - Die ausgewÀhlte Parzelle steht nicht zum Verkauf. - </string> - <string name="group_already_owns"> - Die Parzelle befindet sich bereits in Gruppenbesitz. - </string> - <string name="you_already_own"> - Die Parzelle gehört Ihnen bereits. - </string> - <string name="set_to_sell_to_other"> - Die ausgewÀhlte Parzelle steht zum Verkauf an Dritte. - </string> - <string name="no_public_land"> - Das ausgewÀhlte Land beinhaltet kein öffentliches Land. - </string> - <string name="not_owned_by_you"> - Sie haben Land ausgewÀhlt, das einer anderen Person gehört. -Verkleinern Sie Ihre Auswahl. - </string> - <string name="processing"> - Kauf wird abgewickelt... - -(Dies kann 1 bis 2 Minuten dauern.) - </string> - <string name="fetching_error"> - Fehler bei Abfrage der Landkauf-Informationen. - </string> - <string name="buying_will"> - Bei Landkauf: - </string> - <string name="buying_for_group"> - Landkauf fÃŒr Gruppe: - </string> - <string name="cannot_buy_now"> - Kaufen jetzt nicht möglich: - </string> - <string name="not_for_sale"> - Nicht zu verkaufen: - </string> - <string name="none_needed"> - nicht benötigt - </string> - <string name="must_upgrade"> - Sie mÃŒssen Ihr Konto upgraden, um Land kaufen zu können. - </string> - <string name="cant_own_land"> - Mit Ihrem Konto können Sie Land kaufen. - </string> - <string name="land_holdings"> - Sie besitzen [BUYER] m² Land. - </string> - <string name="pay_to_for_land"> - [SELLER] [AMOUNT] L$ fÃŒr das Land bezahlen - </string> - <string name="buy_for_US"> - Kaufen Sie [AMOUNT] L$ fÃŒr ca. [LOCAL_AMOUNT], - </string> - <string name="parcel_meters"> - Diese Parzelle ist [AMOUNT] m². - </string> - <string name="premium_land"> - Dieses Land ist eine Premium-Immobilie. Es wird mit [AMOUNT] m² angesetzt. - </string> - <string name="discounted_land"> - Dieses Land ist im Angebot. Es wird mit [AMOUNT] m² angesetzt. - </string> - <string name="meters_supports_object"> - [AMOUNT] m² -unterstÃŒtzt [AMOUNT2] Objekte - </string> - <string name="sold_with_objects"> - mit Objekten verkauft - </string> - <string name="sold_without_objects"> - Objekte nicht im Verkauf mit eingeschlossen - </string> - <string name="info_price_string"> - [PRICE] L$ -([PRICE_PER_SQM] L$/m²) -[SOLD_WITH_OBJECTS] - </string> - <string name="insufficient_land_credits"> - Die Gruppe [GROUP] benötigt ausreichende gespendete Landnutzungsrechte, um die Parzelle abzudecken, bevor der Kauf abgeschlossen werden kann. - </string> - <string name="have_enough_lindens"> - Sie haben [AMOUNT] L$, genug zum Kauf dieses Landes. - </string> - <string name="not_enough_lindens"> - Sie haben nur [AMOUNT] L$, brauchen aber mindestens [AMOUNT2] L$. - </string> - <string name="balance_left"> - Nach dem Einkauf verbleiben Ihnen noch [AMOUNT] L$. - </string> - <string name="balance_needed"> - FÃŒr dieses Land mÃŒssen Sie mindestens [AMOUNT] L$ kaufen. - </string> - <string name="no_parcel_selected"> - (keine Parzelle ausgewÀhlt) - </string> - <string name="buy_currency"> - [LINDENS] L$ fÃŒr ca. [USD] US$ kaufen - </string> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_event.xml b/indra/newview/skins/default/xui/de/floater_event.xml new file mode 100644 index 0000000000..a41ac521a3 --- /dev/null +++ b/indra/newview/skins/default/xui/de/floater_event.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="Event" name="Event" title="EVENT-DETAILS"> + <floater.string name="none"> + keines + </floater.string> + <floater.string name="notify"> + Benachrichtigen + </floater.string> + <floater.string name="dont_notify"> + Nicht benachrichtigen + </floater.string> + <layout_stack name="layout"> + <layout_panel name="profile_stack"> + <text name="event_name"> + Namenloses Event....namenlos! Tadaaa! Tadatadaaaah! + </text> + <text name="event_category"> + (keine Kategorie) + </text> + <text name="event_runby_label"> + AusgefÃŒhrt von: + </text> + <text initial_value="(wird in Datenbank gesucht)" name="event_runby"/> + <text name="event_date"> + 10/10/2010 + </text> + <text name="event_duration"> + 1 Stunde + </text> + <text name="event_cover"> + Kostenlos + </text> + <text name="event_location_label"> + Standort: + </text> + <text name="event_location" value="SampleParcel, Name Long (145, 228, 26)"/> + <text name="rating_label" value="Einstufung:"/> + <text name="rating_value" value="unbekannt"/> + </layout_panel> + <layout_panel name="button_panel"> + <button name="create_event_btn" tool_tip="Event erstellen"/> + <button name="god_delete_event_btn" tool_tip="Event löschen"/> + <button label="Mich benachrichtigen" name="notify_btn"/> + <button label="Teleportieren" name="teleport_btn"/> + <button label="Karte" name="map_btn"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml index 89af08096e..8c110e5516 100644 --- a/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="modal container"> +<floater name="modal container" title="Outfit speichern"> <button label="Speichern" label_selected="Speichern" name="Save"/> <button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/> <text name="Save item as:"> diff --git a/indra/newview/skins/default/xui/de/floater_outgoing_call.xml b/indra/newview/skins/default/xui/de/floater_outgoing_call.xml index 17467d4891..5372b8387e 100644 --- a/indra/newview/skins/default/xui/de/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/de/floater_outgoing_call.xml @@ -27,9 +27,12 @@ <text name="nearby"> Die Verbindung zu [VOICE_CHANNEL_NAME] wurde abgebrochen. [RECONNECT_NEARBY] </text> - <text name="nearby_P2P"> + <text name="nearby_P2P_by_other"> [VOICE_CHANNEL_NAME] hat den Anruf beendet. [RECONNECT_NEARBY] </text> + <text name="nearby_P2P_by_agent"> + Sie haben das GesprÀch beendet. [RECONNECT_NEARBY] + </text> <text name="leaving"> [CURRENT_CHAT] wird verlassen. </text> diff --git a/indra/newview/skins/default/xui/de/floater_preferences.xml b/indra/newview/skins/default/xui/de/floater_preferences.xml index ca1d58279f..a2712c437b 100644 --- a/indra/newview/skins/default/xui/de/floater_preferences.xml +++ b/indra/newview/skins/default/xui/de/floater_preferences.xml @@ -6,7 +6,7 @@ <panel label="Allgemein" name="general"/> <panel label="Grafik" name="display"/> <panel label="PrivatsphÀre" name="im"/> - <panel label="Sound" name="audio"/> + <panel label="Sound & Medien" name="audio"/> <panel label="Chat" name="chat"/> <panel label="Meldungen" name="msgs"/> <panel label="Konfiguration" name="input"/> diff --git a/indra/newview/skins/default/xui/de/floater_preview_texture.xml b/indra/newview/skins/default/xui/de/floater_preview_texture.xml index ac6a61cde6..526c0813bd 100644 --- a/indra/newview/skins/default/xui/de/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/de/floater_preview_texture.xml @@ -42,6 +42,6 @@ </combo_item> </combo_box> <button label="OK" name="Keep"/> - <button label="Abbrechen" name="Discard"/> + <button label="Verwerfen" name="Discard"/> <button label="Speichern unter" name="save_tex_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/de/inspect_avatar.xml b/indra/newview/skins/default/xui/de/inspect_avatar.xml index eedbdc9904..a0bd24a69f 100644 --- a/indra/newview/skins/default/xui/de/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/de/inspect_avatar.xml @@ -18,7 +18,7 @@ <slider name="volume_slider" tool_tip="LautstÀrke" value="0.5"/> <button label="Freund hinzufÃŒgen" name="add_friend_btn" width="110"/> <button label="IM" name="im_btn"/> - <button label="Mehr" name="view_profile_btn" width="44" left_delta="120"/> + <button label="Profil" left_delta="120" name="view_profile_btn" width="44"/> <panel name="moderator_panel"> <button label="Voice deaktivieren" name="disable_voice"/> <button label="Voice aktivieren" name="enable_voice"/> diff --git a/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml index 30927ccb83..6f003dc9a5 100644 --- a/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml @@ -15,4 +15,5 @@ <menu_item_call label="Auf Karte anzeigen" name="find_on_map"/> <menu_item_call label="Hineinzoomen" name="zoom_in"/> <menu_item_call label="Bezahlen" name="pay"/> + <menu_item_call label="Teilen" name="share"/> </menu> 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 5651f1097e..a69ef3891a 100644 --- a/indra/newview/skins/default/xui/de/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/de/menu_people_nearby.xml @@ -2,6 +2,7 @@ <context_menu name="Avatar Context Menu"> <menu_item_call label="Profil anzeigen" name="View Profile"/> <menu_item_call label="Freund hinzufÃŒgen" name="Add Friend"/> + <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="Teilen" name="Share"/> diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml index f233617e4a..d978d9e40c 100644 --- a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/de/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="Freunde hinzufÃŒgen" name="Add Friends"/> + <menu_item_call label="Freunde entfernen" name="Remove Friend"/> <menu_item_call label="IM" name="IM"/> <menu_item_call label="Anrufen" name="Call"/> <menu_item_call label="Teilen" name="Share"/> diff --git a/indra/newview/skins/default/xui/de/menu_profile_overflow.xml b/indra/newview/skins/default/xui/de/menu_profile_overflow.xml index 22f983c4d0..03bc19aa3f 100644 --- a/indra/newview/skins/default/xui/de/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/de/menu_profile_overflow.xml @@ -2,7 +2,8 @@ <toggleable_menu name="profile_overflow_menu"> <menu_item_call label="Bezahlen" name="pay"/> <menu_item_call label="Teilen" name="share"/> - <menu_item_check label="Ignorieren/Freischalten" name="block_unblock"/> + <menu_item_call label="Ignorieren" name="block"/> + <menu_item_call label="Freischalten" name="unblock"/> <menu_item_call label="Hinauswerfen" name="kick"/> <menu_item_call label="Einfrieren" name="freeze"/> <menu_item_call label="Auftauen" name="unfreeze"/> diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml index dbccd2817c..a04532376c 100644 --- a/indra/newview/skins/default/xui/de/menu_viewer.xml +++ b/indra/newview/skins/default/xui/de/menu_viewer.xml @@ -9,8 +9,8 @@ <menu_item_call label="Mein Profil" name="Profile"/> <menu_item_call label="Mein Aussehen" name="Appearance"/> <menu_item_check label="Mein Inventar" name="Inventory"/> - <menu_item_call label="Inventar auf Seitenleiste anzeigen" name="ShowSidetrayInventory"/> - <menu_item_call label="Meine Gesten" name="Gestures"/> + <menu_item_check label="Mein Inventar" name="ShowSidetrayInventory"/> + <menu_item_check label="Meine Gesten" name="Gestures"/> <menu label="Mein Status" name="Status"> <menu_item_call label="Abwesend" name="Set Away"/> <menu_item_call label="BeschÀftigt" name="Set Busy"/> @@ -24,7 +24,6 @@ <menu_item_call label="Meine Gruppen" name="My Groups"/> <menu_item_check label="Chat in der NÀhe" name="Nearby Chat"/> <menu_item_call label="Leute in der NÀhe" name="Active Speakers"/> - <menu_item_check label="Medien in der NÀhe" name="Nearby Media"/> </menu> <menu label="Welt" name="World"> <menu_item_check label="Minikarte" name="Mini-Map"/> @@ -40,6 +39,10 @@ <menu label="Anzeigen" name="LandShow"> <menu_item_check label="Bewegungssteuerung" name="Movement Controls"/> <menu_item_check label="Ansichtsteuerung" name="Camera Controls"/> + <menu_item_check label="Bannlinien" name="Ban Lines"/> + <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> <menu_item_call label="Teleport nach Hause" name="Teleport Home"/> <menu_item_call label="Hier als Zuhause wÀhlen" name="Set Home to Here"/> @@ -55,11 +58,11 @@ <menu label="Bauen" name="BuildTools"> <menu_item_check label="Bauen" name="Show Build Tools"/> <menu label="Bauwerkzeug auswÀhlen" name="Select Tool"> - <menu_item_call label="Fokus-Werkzeug" name="Focus"/> - <menu_item_call label="Werkzeug âBewegenâ" name="Move"/> + <menu_item_call label="Fokus" name="Focus"/> + <menu_item_call label="Verschieben" name="Move"/> <menu_item_call label="Bearbeiten" name="Edit"/> - <menu_item_call label="Werkzeug âErstellen"" name="Create"/> - <menu_item_call label="Land-Werkzeug" name="Land"/> + <menu_item_call label="Erstellen" name="Create"/> + <menu_item_call label="Land" name="Land"/> </menu> <menu label="Bearbeiten" name="Edit"> <menu_item_call label="RÃŒckgÀngig" name="Undo"/> @@ -379,7 +382,7 @@ <menu_item_call label="Temp-Asset-Daten ausgeben" name="Dump Temp Asset Data"/> <menu_item_call label="Regions-Status speichern" name="Save Region State"/> </menu> - <menu_item_call label="Gott-Tools" name="God Tools"/> + <menu_item_call label="Gott-Werkzeuge" name="God Tools"/> </menu> <menu label="Admin" name="Deprecated"> <menu label="Objekt anhÀngen" name="Attach Object"/> diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index b067f9cca5..da4a96962e 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/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="Unbekannte Meldung" name="MissingAlert"> @@ -1059,6 +1071,7 @@ Der Gruppe â[GROUP_NAME]â </notification> <notification name="ErrorMessage"> [ERROR_MESSAGE] + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AvatarMovedDesired"> Ihr gewÃŒnschter Zielort ist zurzeit nicht verfÃŒgbar. @@ -1936,10 +1949,10 @@ Von einer Webseite zu diesem Formular linken, um anderen leichten Zugang zu dies Betreff: [SUBJECT], Nachricht: [MESSAGE] </notification> <notification name="FriendOnline"> - [NAME_SLURL] ist online + [FIRST] [LAST] ist online </notification> <notification name="FriendOffline"> - [NAME_SLURL] ist offline + [FIRST] [LAST] ist offline </notification> <notification name="AddSelfFriend"> Obwohl Sie ein sehr netter Mensch sind, können Sie sich nicht selbst als Freund hinzufÃŒgen. diff --git a/indra/newview/skins/default/xui/de/panel_bottomtray.xml b/indra/newview/skins/default/xui/de/panel_bottomtray.xml index 7a627e32c8..d3f89b0ad3 100644 --- a/indra/newview/skins/default/xui/de/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/de/panel_bottomtray.xml @@ -7,6 +7,11 @@ Voice-Chat-Steuerung anzeigen/ausblenden </string> <layout_stack name="toolbar_stack"> + <layout_panel name="speak_panel"> + <talk_button name="talk"> + <speak_button label="Sprechen" label_selected="Sprechen" name="speak_btn"/> + </talk_button> + </layout_panel> <layout_panel name="gesture_panel"> <gesture_combo_list label="Gesten" name="Gesture" tool_tip="Gesten anzeigen/ausblenden"/> </layout_panel> diff --git a/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml index f333ce77e0..b89e4f90de 100644 --- a/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml @@ -26,10 +26,10 @@ </accordion> </layout_panel> <layout_panel name="button_row"> - <button name="btn_create" tool_tip="Neue Gruppe erstellen"/> <button label="Chat" name="btn_chat"/> <button label="Gruppe anrufen" name="btn_call" tool_tip="Diese Gruppe anrufen"/> <button label="Speichern" label_selected="Speichern" name="btn_apply"/> + <button label="Gruppe erstellen" name="btn_create" tool_tip="Neue Gruppe erstellen"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_group_notices.xml b/indra/newview/skins/default/xui/de/panel_group_notices.xml index 2ed149e6fc..cc5664bd97 100644 --- a/indra/newview/skins/default/xui/de/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/de/panel_group_notices.xml @@ -37,7 +37,7 @@ Maximal 200 pro Gruppe tÀglich AnhÀngen: </text> <text name="string"> - Das Objekt hierin ziehen und ablegen, um es anzuhÀngen: + Das Objekt hierhin ziehen und ablegen, um es anzuhÀngen: </text> <button label="Entfernen" label_selected="Anhang entfernen" name="remove_attachment" tool_tip="Anhang von Ihrer Benachrichtigung entfernen"/> <button label="Senden" label_selected="Senden" name="send_notice"/> diff --git a/indra/newview/skins/default/xui/de/panel_me.xml b/indra/newview/skins/default/xui/de/panel_me.xml index ea74f01c8a..26b9812212 100644 --- a/indra/newview/skins/default/xui/de/panel_me.xml +++ b/indra/newview/skins/default/xui/de/panel_me.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Mein Profil!!!!!" name="panel_me"> +<panel label="Mein Profil" name="panel_me"> <tab_container name="tabs"> <panel label="MEIN PROFIL" name="panel_profile"/> <panel label="MEINE AUSWAHL" name="panel_picks"/> diff --git a/indra/newview/skins/default/xui/de/panel_nearby_media.xml b/indra/newview/skins/default/xui/de/panel_nearby_media.xml new file mode 100644 index 0000000000..ec2ad42fa1 --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_nearby_media.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="nearby_media"> + <string name="media_item_count_format"> + (%ls Medien-Objekte) + </string> + <string name="empty_item_text"> + <leer> + </string> + <string name="parcel_media_name"> + Streaming-Medien auf Parzelle + </string> + <string name="parcel_audio_name"> + Streaming-Audio auf Parzelle + </string> + <string name="playing_suffix"> + (wird abgespielt) + </string> + <panel name="minimized_controls"> + <button label="Alle stoppen" name="all_nearby_media_disable_btn" tool_tip="Alle Medien in der NÀhe ausschalten"/> + <button label="Alle starten" name="all_nearby_media_enable_btn" tool_tip="Alle Medien in der NÀhe einschalten"/> + <button name="open_prefs_btn" tool_tip="Medien-Einstellungen öffnen"/> + <button label="Mehr >>" label_selected="Weniger <<" name="more_less_btn" tool_tip="Erweiterte Steuerung"/> + </panel> + <panel name="nearby_media_panel"> + <combo_box name="show_combo"> + <combo_box.item label="Alle" name="All"/> + <combo_box.item label="Auf dieser Parzelle" name="WithinParcel"/> + <combo_box.item label="AuÃerhalb dieser Parzelle" name="OutsideParcel"/> + </combo_box> + <scroll_list name="media_list"> + <scroll_list.columns label="Umgebung" name="media_proximity"/> + <scroll_list.columns label="Sichtbar" name="media_visibility"/> + <scroll_list.columns label="Klasse" name="media_class"/> + <scroll_list.columns label="Name" name="media_name"/> + <scroll_list.columns label="Fehler beseitigen" name="media_debug"/> + </scroll_list> + <panel> + <layout_stack name="media_controls"> + <layout_panel name="stop"> + <button name="stop_btn" tool_tip="AusgewÀhlte Medien stoppen"/> + </layout_panel> + <layout_panel name="play"> + <button name="play_btn" tool_tip="AusgewÀhlte Medien wiedergeben"/> + </layout_panel> + <layout_panel name="pause"> + <button name="pause_btn" tool_tip="AusgewÀhlte Medien pausieren"/> + </layout_panel> + <layout_panel name="volume_slider_ctrl"> + <slider_bar initial_value="0.5" name="volume_slider" tool_tip="LautstÀrke fÃŒr ausgewÀhlte Medien"/> + </layout_panel> + <layout_panel name="mute"> + <button name="mute_btn" tool_tip="Audio fÃŒr ausgewÀhlte Medien stummschalten"/> + </layout_panel> + <layout_panel name="zoom"> + <button name="zoom_btn" tool_tip="Auf ausgewÀhlte Medien zoomen"/> + </layout_panel> + <layout_panel name="unzoom"> + <button name="unzoom_btn" tool_tip="Von ausgewÀhlten Medien wegzoomen"/> + </layout_panel> + </layout_stack> + </panel> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/de/panel_online_status.xml b/indra/newview/skins/default/xui/de/panel_online_status.xml new file mode 100644 index 0000000000..7c7448c061 --- /dev/null +++ b/indra/newview/skins/default/xui/de/panel_online_status.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_preferences_privacy.xml b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml index 29b402415c..42a625fbf6 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml @@ -3,7 +3,7 @@ <panel.string name="log_in_to_change"> Anmelden, um Ãnderungen vorzunehmen </panel.string> - <button label="Cache leeren" name="clear_cache"/> + <button label="Cache leeren" name="clear_cache" tool_tip="Bild bei Anmeldung, letzter Standort, Teleport-Liste, Internet- und Texturen-Cache löschen"/> <text name="cache_size_label_l"> (Standorte, Bilder, Web, Suchverlauf) </text> @@ -11,9 +11,6 @@ <check_box label="Nur Freunde und Gruppen können mich anrufen oder mir eine IM schicken" name="voice_call_friends_only_check"/> <check_box label="Mikrofon ausschalten, wenn Anrufe beendet werden" name="auto_disengage_mic_check"/> <check_box label="Cookies annehmen" name="cookies_enabled"/> - <check_box label="Medien aktiviert" name="media_enabled"/> - <check_box label="Automatische Wiedergabe zulassen" name="autoplay_enabled"/> - <check_box label="Musik aktiviert" name="music_enabled"/> <text name="Logs:"> Protokolle: </text> 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 2398da71d0..b01db30c82 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml @@ -1,16 +1,20 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Sounds" name="Preference Media panel"> <slider label="Master-LautstÀrke" name="System Volume"/> - <check_box initial_value="true" label="Stummschalten, wenn verkleinert" name="mute_when_minimized"/> - <slider label="Umgebung" name="Wind Volume"/> + <check_box initial_value="true" label="Stummschalten, wenn minimiert" name="mute_when_minimized"/> <slider label="SchaltflÀchen" name="UI Volume"/> - <slider label="Medien" name="Media Volume"/> + <slider label="Umgebung" name="Wind Volume"/> <slider label="Soundeffekte" name="SFX Volume"/> <slider label="Musik wird gestreamt" name="Music Volume"/> - <check_box label="Voice aktivieren" name="enable_voice_check"/> - <slider label="Sprache" name="Voice Volume"/> + <check_box label="Aktiviert" name="music_enabled"/> + <slider label="Medien" name="Media Volume"/> + <check_box label="Aktiviert" name="enable_media"/> + <slider label="Voice-Chat" name="Voice Volume"/> + <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"> - Zuhören von: + Voice-Chat-Einstellungen </text> <radio_group name="ear_location"> <radio_item label="Kameraposition" name="0"/> diff --git a/indra/newview/skins/default/xui/de/panel_side_tray.xml b/indra/newview/skins/default/xui/de/panel_side_tray.xml index ba9cdb7c87..3c81636fa0 100644 --- a/indra/newview/skins/default/xui/de/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/de/panel_side_tray.xml @@ -7,7 +7,9 @@ <panel label="Startseite" name="panel_home"/> </sidetray_tab> <sidetray_tab description="Ihr öffentliches Profil und Auswahl bearbeiten." name="sidebar_me" tab_title="Mein Profil"> - <panel label="Ich" name="panel_me"/> + <panel_container name="panel_container"> + <panel label="Ich" name="panel_me"/> + </panel_container> </sidetray_tab> <sidetray_tab description="Freunde, Kontakte und Leute in Ihrer NÀhe finden." name="sidebar_people" tab_title="Leute"> <panel_container name="panel_container"> 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 46b6c75698..283df990ae 100644 --- a/indra/newview/skins/default/xui/de/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/de/panel_status_bar.xml @@ -26,5 +26,6 @@ <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="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 f1f7cef877..c9307a5d7d 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -825,7 +825,7 @@ ESC drÃŒcken, um zur Normalansicht zurÃŒckzukehren </string> <string name="InventoryNoMatchingItems"> - Im Inventar wurden keine passenden Objekte gefunden. + 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. @@ -1504,7 +1504,7 @@ (wird nach Veröffentlichung aktualisiert) </string> <string name="NoPicksClassifiedsText"> - Es wurde keine Auswahl getroffen/keine Anzeigen ausgewÀhlt + Sie haben keine Auswahl oder Anzeigen erstelllt. Klicken Sie auf die âPlus"-SchaltflÀche, um eine Auswahl oder Anzeige zu erstellen. </string> <string name="PicksClassifiedsLoadingText"> Wird geladen... diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index ae686d9ab7..28616d503b 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -6,7 +6,7 @@ border="false" bg_opaque_image="Window_Foreground" bg_alpha_image="Window_Background" - bg_alpha_color="0 0 0 0" + bg_alpha_image_overlay="DkGray_66" legacy_header_height="18" can_minimize="true" can_tear_off="false" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 61ff66b407..4c4867b862 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -354,6 +354,24 @@ function="ToggleControl" parameter="ShowParcelOwners" /> </menu_item_check> + <menu_item_check + label="Coordinates" + name="Coordinates"> + <menu_item_check.on_click + function="ToggleControl" + parameter="NavBarShowCoordinates" /> + <menu_item_check.on_check + control="NavBarShowCoordinates" /> + </menu_item_check> + <menu_item_check + label="Parcel Properties" + name="Parcel Properties"> + <menu_item_check.on_click + function="ToggleControl" + parameter="NavBarShowParcelProperties" /> + <menu_item_check.on_check + control="NavBarShowParcelProperties" /> + </menu_item_check> </menu> <menu_item_separator layout="topleft" /> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 867e320ffe..c5200be7a9 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5205,9 +5205,23 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th type="notify"> [NAME] declined your friendship offer. </notification> + + <notification + icon="notify.tga" + name="FriendshipAcceptedByMe" + type="offer"> +Friend request accepted. + </notification> <notification icon="notify.tga" + name="FriendshipDeclinedByMe" + type="offer"> +Friend request declined. + </notification> + + <notification + icon="notify.tga" name="OfferCallingCard" type="notify"> [FIRST] [LAST] is offering their calling card. diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 53ca0005a5..4c5d5a1b96 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -47,7 +47,7 @@ min_height="23" width="310" top="4" - min_width="220" + min_width="216" name="chat_bar" user_resize="false" filename="panel_nearby_chat_bar.xml" /> diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml index 51e2256a7d..250dadd390 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml @@ -2,7 +2,8 @@ <panel background_visible="true" bevel_style="in" - bg_alpha_color="black" + bg_opaque_color="Black" + bg_alpha_color="DkGray_66" follows="top|left|right" height="24" label="im_header" 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 5373699c02..b196d8eeb7 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 @@ -56,7 +56,7 @@ background_visible="true" use_ellipses="true" width="275" follows="top|left|right" - word_wrap="true" + word_wrap="false" mouse_opaque="false"/> <line_editor follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml index 6927906d3d..66070c028d 100644 --- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml @@ -8,7 +8,7 @@ min_height="350" name="landmark_info" top="20" - width="330"> + width="333"> <string name="title_create_landmark" value="Create Landmark" /> @@ -58,11 +58,11 @@ height="23" image_overlay="BackArrow_Off" layout="topleft" - left="10" + left="11" name="back_btn" tool_tip="Back" tab_stop="false" - top="0" + top="4" width="23" /> <text follows="top|left|right" @@ -72,36 +72,36 @@ left_pad="10" name="title" text_color="LtGray" - top="0" + top="2" use_ellipses="true" value="Place Profile" - width="275" /> + width="280" /> <scroll_container color="DkGray2" follows="all" - height="533" + height="532" layout="topleft" - left="10" + left="9" name="place_scroll" opaque="true" - top_pad="5" - width="313"> + top_pad="10" + width="310"> <panel bg_alpha_color="DkGray2" follows="left|top|right" - height="610" + height="700" layout="topleft" left="0" min_height="300" name="scrolling_panel" top="0" - width="313"> + width="285"> <texture_picker enabled="false" - follows="top|left" - height="190" + follows="left|top|right" + height="197" layout="topleft" - left="10" + left="11" name="logo" top="10" width="290" /> @@ -113,29 +113,29 @@ left="10" name="region_title" text_color="white" - top_pad="5" + top_pad="10" use_ellipses="true" value="SampleRegion" - width="290" /> + width="280" /> <text follows="left|top|right" height="14" layout="topleft" left="10" name="parcel_title" - top_pad="4" + top_pad="10" use_ellipses="true" value="SampleParcel, Name Long (145, 228, 26)" - width="285" /> + width="280" /> <expandable_text follows="left|top|right" height="50" layout="topleft" - left="5" + left="10" name="description" top_pad="10" value="Du waltz die spritz" - width="300" /> + width="280" /> <icon follows="top|left" height="16" @@ -149,9 +149,9 @@ follows="left|top|right" height="16" layout="topleft" - left_pad="8" + left_pad="5" name="maturity_value" - top_delta="0" + top_pad="-13" value="unknown" width="268" /> <panel @@ -284,7 +284,7 @@ width="290" /> <combo_box follows="bottom|left|right" - height="20" + height="23" layout="topleft" left="0" name="folder_combo" diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml index e7104fd34e..fdc26b5c46 100644 --- a/indra/newview/skins/default/xui/en/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml @@ -17,7 +17,7 @@ layout="topleft" left="0" name="landmarks_accordion" - top="2" + top="0" width="380"> <accordion_tab layout="topleft" @@ -107,7 +107,7 @@ layout="topleft" left="10" name="options_gear_btn" - top="10" + top="14" width="18" /> <button follows="bottom|left" @@ -126,10 +126,10 @@ image_selected="TrashItem_Press" image_unselected="TrashItem_Off" layout="topleft" - right="-10" + right="-8" name="trash_btn" tool_tip="Remove selected landmark" - top="10" + top="14" width="18" /> </panel> </panel> 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 29c0f1fa4b..5cd5d0dfea 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -2,7 +2,7 @@ <panel background_visible="true" follows="all" - height="400" + height="408" label="Things" layout="topleft" min_height="350" @@ -13,102 +13,6 @@ name="Title"> Things </panel.string> - <filter_editor - text_pad_left="14" - follows="left|top|right" - height="23" - label="Filter Inventory" - layout="topleft" - left="15" -max_length="300" - name="inventory search editor" - top="26" - width="303" /> - <tab_container -follows="all" -halign="center" - height="300" - layout="topleft" - left_delta="-4" - name="inventory filter tabs" - tab_height="30" - tab_position="top" - tab_min_width="100" - top_pad="4" - width="305"> - <inventory_panel - border="false" - follows="all" - height="295" - label="MY INVENTORY" - help_topic="my_inventory_tab" - layout="topleft" - left="0" - name="All Items" - top="16" - width="290" /> - <inventory_panel - border="false" - follows="all" - height="295" - label="RECENT" - help_topic="recent_inventory_tab" - layout="topleft" - left_delta="0" - name="Recent Items" - width="290" /> - </tab_container> - - <panel - background_visible="true" - bevel_style="none" - bottom="0" - follows="left|right|bottom" - height="30" - layout="bottomleft" - left="0" - visible="true" - name="bottom_panel" - width="330"> - <button - follows="bottom|left" - tool_tip="Show additional options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" - layout="topleft" - left="10" - name="options_gear_btn" - picture_style="true" - top="6" - width="18" /> - <button - follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" - layout="topleft" - left_pad="5" - name="add_btn" - picture_style="true" - tool_tip="Add new item" - width="18" /> - <dnd_button - follows="bottom|right" - height="18" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" - layout="topleft" - right="-5" - name="trash_btn" - picture_style="true" - tool_tip="Remove selected item" - top="6" - width="18" /> - </panel> - <menu_bar bg_visible="false" follows="left|top|right" @@ -490,4 +394,114 @@ halign="center" </menu_item_check> </menu> </menu_bar> + <filter_editor + text_pad_left="10" + follows="left|top|right" + height="23" + label="Filter Inventory" + layout="topleft" + left="10" +max_length="300" + name="inventory search editor" + top="26" + width="303" /> + <tab_container + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" +follows="all" +halign="center" + height="305" + layout="topleft" + left="6" + name="inventory filter tabs" + tab_height="30" + tab_position="top" + tab_min_width="100" + top_pad="10" + width="315"> + <inventory_panel + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" + border="false" + bevel_style="none" + follows="all" + height="295" + label="MY INVENTORY" + help_topic="my_inventory_tab" + layout="topleft" + left="0" + name="All Items" + top="16" + width="290" /> + <inventory_panel + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" + border="false" + bevel_style="none" + follows="all" + height="295" + label="RECENT" + help_topic="recent_inventory_tab" + layout="topleft" + left_delta="0" + name="Recent Items" + width="290" /> + </tab_container> + + <panel + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" + bevel_style="none" + follows="left|right|bottom" + height="38" + layout="topleft" + top_pad="-1" + left="9" + name="bottom_panel" + width="310"> + <button + follows="bottom|left" + tool_tip="Show additional options" + height="18" + image_disabled="OptionsMenu_Disabled" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + layout="topleft" + left="8" + name="options_gear_btn" + top="14" + width="18" /> + <button + follows="bottom|left" + height="18" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + image_disabled="AddItem_Disabled" + layout="topleft" + left_pad="10" + name="add_btn" + tool_tip="Add new item" + width="18" /> + <dnd_button + follows="bottom|right" + height="18" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + layout="topleft" + right="-7" + name="trash_btn" + tool_tip="Remove selected item" + top="14" + width="18" /> + </panel> + + </panel> diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index 710ca733e0..86eaa79587 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -11,15 +11,15 @@ border="false"> <tab_container follows="all" - height="500" + height="490" layout="topleft" - left="10" + left="6" name="appearance_tabs" tab_min_width="140" tab_height="30" tab_position="top" halign="center" - width="313"> + width="315"> <inventory_panel background_visible="true" background_opaque="true" @@ -49,39 +49,51 @@ start_folder="Current Outfit" width="313" /> </tab_container> + <panel + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="left|right|bottom" + height="38" + layout="topleft" + left="9" + visible="true" + top_pad="-1" + width="310" /> <panel - background_visible="true" + background_visible="false" follows="bottom|left" height="50" layout="topleft" - left="0" + left="9" visible="true" name="bottom_panel" - top_pad="10" - width="313"> - <button - follows="bottom|left" - tool_tip="Show additional options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" - layout="topleft" - left="10" - name="options_gear_btn" - top="6" - width="18" /> - <dnd_button - follows="bottom|left" - height="18" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" - layout="topleft" - right="-5" - name="trash_btn" - tool_tip="Remove selected item" - top="6" - width="18" /> + top_pad="-38" + width="310"> + <button + follows="bottom|left" + tool_tip="Show additional options" + height="18" + image_disabled="OptionsMenu_Disabled" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + layout="topleft" + left="8" + name="options_gear_btn" + top="14" + width="18" /> + <dnd_button + follows="bottom|right" + height="18" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + layout="topleft" + right="-9" + name="trash_btn" + tool_tip="Remove selected item" + top="14" + width="18" /> <button follows="bottom|left" height="23" @@ -89,20 +101,19 @@ layout="topleft" name="make_outfit_btn" tool_tip="Save appearance as an outfit" - top="26" - left='10' - width="120" /> + top="43" + left="0" + width="153" /> <button follows="bottom|right" height="23" label="Wear" layout="topleft" name="wear_btn" - right="-10" - left_pad="10" - top="26" + left_pad="3" + top="43" tool_tip="Wear selected outfit" - width="120" /> + width="152" /> <button follows="bottom|left" height="23" @@ -114,4 +125,5 @@ visible="false" width="20" /> </panel> + </panel> diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 752bccc351..daab52f06a 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -29,6 +29,7 @@ name="groups_filter_label" value="Filter Groups" /> <filter_editor + text_pad_left="10" follows="left|top|right" height="23" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index 54a5db9b16..0093a08e15 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -4,7 +4,7 @@ bg_opaque_color="DkGray2" background_visible="true" background_opaque="true" follows="all" - height="547" + height="548" label="Picks" layout="topleft" left="0" diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml index 94c9b2de01..b22dad5841 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -8,7 +8,7 @@ min_height="350" name="place_profile" top="20" - width="330"> + width="333"> <string name="on" value="On" /> @@ -143,11 +143,11 @@ height="23" image_overlay="BackArrow_Off" layout="topleft" - left="10" + left="11" name="back_btn" tool_tip="Back" tab_stop="false" - top="0" + top="4" width="23" /> <text follows="top|left|right" @@ -157,36 +157,36 @@ left_pad="10" name="title" text_color="LtGray" - top="0" + top="2" use_ellipses="true" value="Place Profile" - width="275" /> + width="280" /> <scroll_container color="DkGray2" follows="all" - height="533" + height="532" layout="topleft" - left="10" + left="9" name="place_scroll" opaque="true" - top_pad="5" - width="313"> + top_pad="10" + width="310"> <panel bg_alpha_color="DkGray2" follows="left|top|right" - height="533" + height="700" layout="topleft" left="0" min_height="300" name="scrolling_panel" top="0" - width="313"> + width="285"> <texture_picker enabled="false" - follows="top|left" - height="190" + follows="left|top|right" + height="197" layout="topleft" - left="10" + left="11" name="logo" top="10" width="290" /> diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index c4e4b9aa9b..57535649de 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -17,12 +17,12 @@ background_visible="true" name="teleport_history_tab_title" value="TELEPORT HISTORY" /> <filter_editor - text_pad_left="14" + text_pad_left="10" follows="left|top|right" font="SansSerifSmall" height="23" layout="topleft" - left="15" + left="10" label="Filter My Places" max_length="300" name="Filter" @@ -31,15 +31,15 @@ background_visible="true" <tab_container follows="all" halign="center" - height="500" + height="503" layout="topleft" - left="10" + left="6" name="Places Tabs" tab_min_width="80" tab_height="30" tab_position="top" top_pad="10" - width="313" /> + width="315" /> <panel class="panel_place_profile" filename="panel_place_profile.xml" @@ -51,7 +51,7 @@ background_visible="true" name="panel_place_profile" top="5" visible="false" - width="313" /> + width="315" /> <panel class="panel_landmark_info" filename="panel_landmark_info.xml" @@ -63,13 +63,13 @@ background_visible="true" name="panel_landmark_info" top="5" visible="false" - width="313" /> + width="315" /> <panel height="19" layout="topleft" - left="0" + left="4" name="button_panel" - width="313"> + width="315"> <button follows="bottom|left" height="23" @@ -78,65 +78,58 @@ background_visible="true" left="5" name="teleport_btn" tool_tip="Teleport to the selected area" - top="0" - width="100" /> + top="1" + width="108" /> <button follows="bottom|left" height="23" label="Map" layout="topleft" - left_pad="5" + left_pad="3" name="map_btn" - top="0" - width="70" /> + width="85" /> <button follows="bottom|left" height="23" label="Edit" layout="topleft" - left_pad="5" + left_pad="3" name="edit_btn" tool_tip="Edit landmark information" - top="0" - width="70" /> + width="83" /> <button follows="bottom|right" height="23" - image_disabled="ForwardArrow_Off" - image_selected="ForwardArrow_Press" - image_unselected="ForwardArrow_Off" + label="âŒ" layout="topleft" name="overflow_btn" tool_tip="Show additional options" - right="-10" - top="0" - width="18" /> + left_pad="3" + width="23" /> <button - follows="bottom|right" + follows="bottom|left" height="23" - label="Close" + label="Save" layout="topleft" - name="close_btn" - right="-10" - top="0" - width="60" /> + name="save_btn" + left="5" + top_pad="-23" + width="152" /> <button follows="bottom|right" height="23" label="Cancel" layout="topleft" name="cancel_btn" - right="-10" - top="0" - width="60" /> + left_pad="3" + width="153" /> <button follows="bottom|right" height="23" - label="Save" + label="Close" layout="topleft" - name="save_btn" - right="-75" - top="0" + name="close_btn" + left_pad="3" width="60" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml index 06da64533b..ecf7252a11 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="Teleport History" bottom="0" height="326" left="0" width="380" +<panel name="Teleport History" bottom="0" height="400" left="0" width="380" help_topic="panel_teleport_history" - border="true" follows="left|top|right|bottom"> + border="false" follows="left|top|right|bottom"> <accordion follows="left|top|right|bottom" - height="300" + height="368" layout="topleft" left="0" top="0" name="history_accordion" + background_visible="true" + bg_alpha_color="DkGray2" width="380"> <accordion_tab layout="topleft" @@ -51,7 +53,7 @@ top="0" width="380"> </flat_list_view> - </accordion_tab> + </accordion_tab>5 <accordion_tab layout="topleft" name="3_days_ago" @@ -138,19 +140,20 @@ </accordion_tab> </accordion> <panel - background_visible="true" + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" bevel_style="none" - top_pad="0" + bottom="0" follows="left|right|bottom" - height="30" - label="bottom_panel" - layout="topleft" + height="38" + layout="bottomleft" left="0" name="bottom_panel" width="380"> <button follows="bottom|left" - font="SansSerifBigBold" tool_tip="Show additional optioins" height="18" image_disabled="OptionsMenu_Disabled" @@ -159,7 +162,7 @@ layout="topleft" left="10" name="gear_btn" - top="5" + top="14" width="18" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml index bde45a9487..b3d55fec65 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml @@ -37,20 +37,20 @@ width="333"> name="openoutfit_btn" /> <icon follows="top|left" - height="30" + height="24" image_name="TabIcon_Appearance_Off" name="outfit_icon" mouse_opaque="false" visible="true" - left="5" + left="9" top="0" - width="30" /> + width="24" /> <text font="SansSerifHugeBold" height="20" left_pad="5" text_color="LtGray" - top="3" + top="0" use_ellipses="true" width="305" follows="top|left" @@ -76,7 +76,7 @@ width="333"> height="23" follows="left|top|right" layout="topleft" - left="15" + left="10" label="Filter Outfits" max_length="300" name="Filter" @@ -90,7 +90,7 @@ width="333"> min_height="410" width="320" left="0" - top_pad="0" + top_pad="6" follows="all" /> <!-- <button follows="bottom|left" diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index fb5f9d2ec8..a233d42568 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -32,10 +32,10 @@ width="330" /> <panel height="25" - layout="bottomright" + layout="topleft" name="button_panel" - left="5" - bottom="5" + left="9" + top_pad="-2" width="313"> <button enabled="true" @@ -46,17 +46,17 @@ left="0" name="info_btn" top="0" - width="100" /> + width="153" /> <button enabled="false" follows="bottom|left" height="23" label="Wear" layout="topleft" - left="130" + left="156" name="wear_btn" top="0" - width="100" /> + width="152" /> <button enabled="false" follows="bottom|left" @@ -64,19 +64,19 @@ label="Play" layout="topleft" name="play_btn" - left="130" + left="156" top="0" - width="80" /> + width="152" /> <button enabled="false" follows="bottom|left" height="23" label="Teleport" layout="topleft" - left="130" + left="156" name="teleport_btn" top="0" - width="100" /> + width="152" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml index 18b59741bf..12c06504ca 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml @@ -43,10 +43,10 @@ height="23" image_overlay="BackArrow_Off" layout="topleft" - left="10" + left="14" name="back_btn" tab_stop="false" - top="0" + top="2" width="23" /> <text follows="top|left|right" @@ -71,10 +71,10 @@ width="150" /> <panel follows="all" - height="490" + height="493" label="" layout="topleft" - left="10" + left="9" help_topic="" top="45" width="313" @@ -161,13 +161,14 @@ </text> <button follows="top|right" - height="23" - label="Profile" + height="16" + image_selected="Inspector_I" + image_unselected="Inspector_I" layout="topleft" - right="-1" + right="-5" name="BtnCreator" top_delta="-6" - width="78" /> + width="16" /> <text type="string" length="1" @@ -203,13 +204,14 @@ </text> <button follows="top|right" - height="23" - label="Profile" + height="16" + image_selected="Inspector_I" + image_unselected="Inspector_I" layout="topleft" - right="-1" + right="-5" name="BtnOwner" top_delta="-3" - width="78" /> + width="16" /> <text type="string" length="1" @@ -239,8 +241,6 @@ top_pad="10" follows="left|top" layout="topleft" mouse_opaque="false" - background_visible="true" - bg_alpha_color="DkGray" name="perms_inv" left="0" top_pad="25" @@ -400,7 +400,7 @@ top_pad="10" </panel> <panel height="30" - layout="bottomright" + layout="topleft" name="button_panel" left="5" bottom="2" diff --git a/indra/newview/skins/default/xui/en/widgets/panel.xml b/indra/newview/skins/default/xui/en/widgets/panel.xml index 7262c0dc5c..9bf99fa363 100644 --- a/indra/newview/skins/default/xui/en/widgets/panel.xml +++ b/indra/newview/skins/default/xui/en/widgets/panel.xml @@ -6,6 +6,8 @@ --> <panel bg_opaque_color="PanelFocusBackgroundColor" bg_alpha_color="PanelDefaultBackgroundColor" + bg_opaque_image_overlay="White" + bg_alpha_image_overlay="White" background_visible="false" background_opaque="false" chrome="false"/>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/fr/floater_buy_land.xml b/indra/newview/skins/default/xui/fr/floater_buy_land.xml index f5cf871844..7c9a31a4c3 100644 --- a/indra/newview/skins/default/xui/fr/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_buy_land.xml @@ -1,5 +1,132 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="buy land" title="ACHETER DU TERRAIN"> + <floater.string name="can_resell"> + Peut être revendu. + </floater.string> + <floater.string name="can_not_resell"> + Ne peut pas être revendu. + </floater.string> + <floater.string name="can_change"> + Peut être fusionné ou divisé. + </floater.string> + <floater.string name="can_not_change"> + Ne peut pas être fusionné ou divisé. + </floater.string> + <floater.string name="cant_buy_for_group"> + Vous n'avez pas la permission d'acheter de terrain pour votre groupe. + </floater.string> + <floater.string name="no_land_selected"> + Aucun terrain sélectionné. + </floater.string> + <floater.string name="multiple_parcels_selected"> + Vous avez sélectionné plusieurs parcelles. +Sélectionnez une zone plus petite. + </floater.string> + <floater.string name="no_permission"> + Vous n'avez pas la permission d'acheter de terrain pour votre groupe. + </floater.string> + <floater.string name="parcel_not_for_sale"> + La parcelle sélectionnée n'est pas à vendre. + </floater.string> + <floater.string name="group_already_owns"> + La parcelle appartient déjà au groupe. + </floater.string> + <floater.string name="you_already_own"> + La parcelle vous appartient déjà . + </floater.string> + <floater.string name="set_to_sell_to_other"> + La parcelle sélectionnée doit déjà être vendue à quelqu'un d'autre. + </floater.string> + <floater.string name="no_public_land"> + Il n'y a pas de terrain public dans cette zone. + </floater.string> + <floater.string name="not_owned_by_you"> + Le terrain sélectionné appartient à quelqu'un d'autre. +Sélectionnez une zone plus petite. + </floater.string> + <floater.string name="processing"> + Achat en cours de traitement... + +(Veuillez patienter quelques instants.) + </floater.string> + <floater.string name="fetching_error"> + Une erreur s'est produite pendant le traitement de l'achat du terrain. + </floater.string> + <floater.string name="buying_will"> + Si vous achetez ce terrain : + </floater.string> + <floater.string name="buying_for_group"> + Si vous achetez le terrain pour le groupe : + </floater.string> + <floater.string name="cannot_buy_now"> + Impossible d'acheter maintenant : + </floater.string> + <floater.string name="not_for_sale"> + Pas à vendre : + </floater.string> + <floater.string name="none_needed"> + aucun besoin + </floater.string> + <floater.string name="must_upgrade"> + Pour posséder du terrain, vous devez avoir un niveau de compte supérieur. + </floater.string> + <floater.string name="cant_own_land"> + Avec votre compte, vous pouvez posséder du terrain. + </floater.string> + <floater.string name="land_holdings"> + Vous détenez [BUYER] m² de terrain. + </floater.string> + <floater.string name="pay_to_for_land"> + Payez [AMOUNT] L$ à [SELLER] pour ce terrain + </floater.string> + <floater.string name="buy_for_US"> + Achetez [AMOUNT] L$ pour environ [LOCAL_AMOUNT], + </floater.string> + <floater.string name="parcel_meters"> + Cette parcelle fait [AMOUNT] m² + </floater.string> + <floater.string name="premium_land"> + C'est un terrain premium, [AMOUNT] m². + </floater.string> + <floater.string name="discounted_land"> + Ce terrain est en solde, [AMOUNT] m². + </floater.string> + <floater.string name="meters_supports_object"> + [AMOUNT] m² +prend en charge [AMOUNT2] objets + </floater.string> + <floater.string name="sold_with_objects"> + vendu avec objets + </floater.string> + <floater.string name="sold_without_objects"> + objets non inclus + </floater.string> + <floater.string name="info_price_string"> + [PRICE] L$ +([PRICE_PER_SQM] L$/m²) +[SOLD_WITH_OBJECTS] + </floater.string> + <floater.string name="insufficient_land_credits"> + Ce groupe, [GROUP], aura besoin de suffisamment de crédit pour payer les frais d'occupation de terrain avant que l'achat de cette parcelle ne soit finalisé. + </floater.string> + <floater.string name="have_enough_lindens"> + Vous avez [AMOUNT] L$, ce qui est suffisant pour acheter ce terrain. + </floater.string> + <floater.string name="not_enough_lindens"> + Vous n'avez que [AMOUNT] L$ et vous avez besoin de [AMOUNT2] L$ de plus. + </floater.string> + <floater.string name="balance_left"> + AprÚs cet achat, il vous restera [AMOUNT] L$. + </floater.string> + <floater.string name="balance_needed"> + Pour avoir les moyens d'acquérir ce terrain, vous devez acheter au moins [AMOUNT] L$. + </floater.string> + <floater.string name="no_parcel_selected"> + (aucune parcelle sélectionnée) + </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"> Région : </text> @@ -37,10 +164,10 @@ Vous devez accepter le rÚglement du domaine : </text> <text left="470" name="covenant_timestamp_text"/> - <text_editor name="covenant_editor" left="510"> + <text_editor left="510" name="covenant_editor"> Chargement... </text_editor> - <check_box label="J'accepte le rÚglement ci-dessus." name="agree_covenant" left="510"/> + <check_box label="J'accepte le rÚglement ci-dessus." left="510" name="agree_covenant"/> <text name="info_parcel_label"> Parcelle : </text> @@ -79,20 +206,9 @@ vendu avec objets <combo_box.item label="7,50 US$/mois, facturation trimestrielle" name="US$7.50/month,billedquarterly"/> <combo_box.item label="6,00 US$/mois, facturation annuelle" name="US$6.00/month,billedannually"/> </combo_box> - <text - type="string" - length="1" - follows="top|left" - font="SansSerifBig" - height="16" - layout="topleft" - left="72" - name="land_use_action" - right="500" - top="284" - width="400"> - Augmentez vos frais d'occupation de terrain à 40 US$/mois. - </text> + <text follows="top|left" font="SansSerifBig" height="16" layout="topleft" left="72" length="1" name="land_use_action" right="500" top="284" type="string" width="400"> + Augmentez vos frais d'occupation de terrain à 40 US$/mois. + </text> <text name="land_use_reason"> Vous détenez 1 309 m² de terrain. Cette parcelle fait 512 m². @@ -118,131 +234,4 @@ Cette parcelle fait 512 m². <check_box label="Enlever [AMOUNT] m² de contribution du groupe." name="remove_contribution"/> <button label="Acheter" name="buy_btn"/> <button label="Annuler" name="cancel_btn"/> - <string name="can_resell"> - Peut être revendu. - </string> - <string name="can_not_resell"> - Ne peut pas être revendu. - </string> - <string name="can_change"> - Peut être fusionné ou divisé. - </string> - <string name="can_not_change"> - Ne peut pas être fusionné ou divisé. - </string> - <string name="cant_buy_for_group"> - Vous n'avez pas la permission d'acheter de terrain pour votre groupe. - </string> - <string name="no_land_selected"> - Aucun terrain sélectionné. - </string> - <string name="multiple_parcels_selected"> - Vous avez sélectionné plusieurs parcelles. -Sélectionnez une zone plus petite. - </string> - <string name="no_permission"> - Vous n'avez pas la permission d'acheter de terrain pour votre groupe. - </string> - <string name="parcel_not_for_sale"> - La parcelle sélectionnée n'est pas à vendre. - </string> - <string name="group_already_owns"> - La parcelle appartient déjà au groupe. - </string> - <string name="you_already_own"> - La parcelle vous appartient déjà . - </string> - <string name="set_to_sell_to_other"> - La parcelle sélectionnée doit déjà être vendue à quelqu'un d'autre. - </string> - <string name="no_public_land"> - Il n'y a pas de terrain public dans cette zone. - </string> - <string name="not_owned_by_you"> - Le terrain sélectionné appartient à quelqu'un d'autre. -Sélectionnez une zone plus petite. - </string> - <string name="processing"> - Achat en cours de traitement... - -(Veuillez patienter quelques instants.) - </string> - <string name="fetching_error"> - Une erreur s'est produite pendant le traitement de l'achat du terrain. - </string> - <string name="buying_will"> - Si vous achetez ce terrain : - </string> - <string name="buying_for_group"> - Si vous achetez le terrain pour le groupe : - </string> - <string name="cannot_buy_now"> - Impossible d'acheter maintenant : - </string> - <string name="not_for_sale"> - Pas à vendre : - </string> - <string name="none_needed"> - aucun besoin - </string> - <string name="must_upgrade"> - Pour posséder du terrain, vous devez avoir un niveau de compte supérieur. - </string> - <string name="cant_own_land"> - Avec votre compte, vous pouvez posséder du terrain. - </string> - <string name="land_holdings"> - Vous détenez [BUYER] m² de terrain. - </string> - <string name="pay_to_for_land"> - Payez [AMOUNT] L$ à [SELLER] pour ce terrain - </string> - <string name="buy_for_US"> - Achetez [AMOUNT] L$ pour environ [LOCAL_AMOUNT], - </string> - <string name="parcel_meters"> - Cette parcelle fait [AMOUNT] m² - </string> - <string name="premium_land"> - C'est un terrain premium, [AMOUNT] m². - </string> - <string name="discounted_land"> - Ce terrain est en solde, [AMOUNT] m². - </string> - <string name="meters_supports_object"> - [AMOUNT] m² -prend en charge [AMOUNT2] objets - </string> - <string name="sold_with_objects"> - vendu avec objets - </string> - <string name="sold_without_objects"> - objets non inclus - </string> - <string name="info_price_string"> - [PRICE] L$ -([PRICE_PER_SQM] L$/m²) -[SOLD_WITH_OBJECTS] - </string> - <string name="insufficient_land_credits"> - Ce groupe, [GROUP], aura besoin de suffisamment de crédit pour payer les frais d'occupation de terrain avant que l'achat de cette parcelle ne soit finalisé. - </string> - <string name="have_enough_lindens"> - Vous avez [AMOUNT] L$, ce qui est suffisant pour acheter ce terrain. - </string> - <string name="not_enough_lindens"> - Vous n'avez que [AMOUNT] L$ et vous avez besoin de [AMOUNT2] L$ de plus. - </string> - <string name="balance_left"> - AprÚs cet achat, il vous restera [AMOUNT] L$. - </string> - <string name="balance_needed"> - Pour avoir les moyens d'acquérir ce terrain, vous devez acheter au moins [AMOUNT] L$. - </string> - <string name="no_parcel_selected"> - (aucune parcelle sélectionnée) - </string> - <string name="buy_currency"> - Acheter [LINDENS] L$ pour environ [USD] US$ - </string> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_event.xml b/indra/newview/skins/default/xui/fr/floater_event.xml new file mode 100644 index 0000000000..02192c65ec --- /dev/null +++ b/indra/newview/skins/default/xui/fr/floater_event.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="Ãvénement" name="Event" title="DÃTAILS SUR L'ÃVÃNEMENT"> + <floater.string name="none"> + aucun + </floater.string> + <floater.string name="notify"> + Prévenir + </floater.string> + <floater.string name="dont_notify"> + Ne pas prévenir + </floater.string> + <layout_stack name="layout"> + <layout_panel name="profile_stack"> + <text name="event_name"> + Nameless Event...of Doom! De doom! Doom doom. + </text> + <text name="event_category"> + (pas de catégorie) + </text> + <text name="event_runby_label"> + Organisé par : + </text> + <text initial_value="(récupération en cours)" name="event_runby"/> + <text name="event_date"> + 10/10/2010 + </text> + <text name="event_duration"> + 1 heure + </text> + <text name="event_cover"> + Gratuit + </text> + <text name="event_location_label"> + Lieu : + </text> + <text name="event_location" value="SampleParcel, Name Long (145, 228, 26)"/> + <text name="rating_label" value="Catégorie :"/> + <text name="rating_value" value="inconnu"/> + </layout_panel> + <layout_panel name="button_panel"> + <button name="create_event_btn" tool_tip="Créer un événement"/> + <button name="god_delete_event_btn" tool_tip="Supprimer l'événement"/> + <button label="Me prévenir" name="notify_btn"/> + <button label="Téléporter" name="teleport_btn"/> + <button label="Carte" name="map_btn"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml index 46e253ba2c..d77dfbdf82 100644 --- a/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="modal container"> +<floater name="modal container" title="Enregistrer la tenue"> <button label="Enregistrer" label_selected="Enregistrer" name="Save"/> <button label="Annuler" label_selected="Annuler" name="Cancel"/> <text name="Save item as:"> diff --git a/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml b/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml index 09bcdef2f1..2420c2b04b 100644 --- a/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml @@ -27,8 +27,11 @@ <text name="nearby"> Vous avez été déconnecté(e) de [VOICE_CHANNEL_NAME]. [RECONNECT_NEARBY] </text> - <text name="nearby_P2P"> - [VOICE_CHANNEL_NAME] a mis fin à lâappel. [RECONNECT_NEARBY] + <text name="nearby_P2P_by_other"> + [VOICE_CHANNEL_NAME] a mis fin à l'appel. [RECONNECT_NEARBY] + </text> + <text name="nearby_P2P_by_agent"> + Vous avez mis fin à l'appel. [RECONNECT_NEARBY] </text> <text name="leaving"> En train de quitter [CURRENT_CHAT]. diff --git a/indra/newview/skins/default/xui/fr/floater_preferences.xml b/indra/newview/skins/default/xui/fr/floater_preferences.xml index 4db7ca304c..406e91a18a 100644 --- a/indra/newview/skins/default/xui/fr/floater_preferences.xml +++ b/indra/newview/skins/default/xui/fr/floater_preferences.xml @@ -6,7 +6,7 @@ <panel label="Général" name="general"/> <panel label="Graphiques" name="display"/> <panel label="Confidentialité" name="im"/> - <panel label="Son" name="audio"/> + <panel label="Son et Média" name="audio"/> <panel label="Chat" name="chat"/> <panel label="Notifications" name="msgs"/> <panel label="Configuration" name="input"/> 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 2ff14b4a68..dc40d31a79 100644 --- a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml @@ -42,6 +42,6 @@ </combo_item> </combo_box> <button label="OK" name="Keep"/> - <button label="Annuler" name="Discard"/> + <button label="Jeter" name="Discard"/> <button label="Enregistrer sous" name="save_tex_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/fr/inspect_avatar.xml b/indra/newview/skins/default/xui/fr/inspect_avatar.xml index be23369dc7..381a52ed43 100644 --- a/indra/newview/skins/default/xui/fr/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/fr/inspect_avatar.xml @@ -18,7 +18,7 @@ <slider name="volume_slider" tool_tip="Volume de la voix" value="0.5"/> <button label="Devenir amis" name="add_friend_btn"/> <button label="IM" name="im_btn"/> - <button label="Plus" name="view_profile_btn"/> + <button label="Profil" name="view_profile_btn"/> <panel name="moderator_panel"> <button label="Désactiver le chat vocal" name="disable_voice"/> <button label="Activer le chat vocal" name="enable_voice"/> diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml index 39ba4b1074..e5746dd4c2 100644 --- a/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml @@ -15,4 +15,5 @@ <menu_item_call label="Situer sur la carte" name="find_on_map"/> <menu_item_call label="Zoomer en avant" name="zoom_in"/> <menu_item_call label="Payer" name="pay"/> + <menu_item_call label="Partager" name="share"/> </menu> 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 d48be969f4..08a97ee403 100644 --- a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml @@ -2,6 +2,7 @@ <context_menu name="Avatar Context Menu"> <menu_item_call label="Voir le profil" name="View Profile"/> <menu_item_call label="Devenir amis" name="Add Friend"/> + <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="Partager" name="Share"/> diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml index 2185ac95e9..18ae84a67b 100644 --- a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/fr/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="Devenir amis" name="Add Friends"/> + <menu_item_call label="Supprimer des amis" name="Remove Friend"/> <menu_item_call label="IM" name="IM"/> <menu_item_call label="Appeler" name="Call"/> <menu_item_call label="Partager" name="Share"/> diff --git a/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml b/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml index 381c75ce31..ab5016465d 100644 --- a/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml @@ -2,7 +2,8 @@ <toggleable_menu name="profile_overflow_menu"> <menu_item_call label="Payer" name="pay"/> <menu_item_call label="Partager" name="share"/> - <menu_item_check label="Ignorer/Ne plus ignorer" name="block_unblock"/> + <menu_item_call label="Ignorer" name="block"/> + <menu_item_call label="Ne plus ignorer" name="unblock"/> <menu_item_call label="Ãjecter" name="kick"/> <menu_item_call label="Geler" name="freeze"/> <menu_item_call label="Dégeler" name="unfreeze"/> diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml index 33a82569a1..21f39682ba 100644 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -9,7 +9,7 @@ <menu_item_call label="Mon profil" name="Profile"/> <menu_item_call label="Mon apparence" name="Appearance"/> <menu_item_check label="Mon inventaire" name="Inventory"/> - <menu_item_call label="Afficher l'inventaire dans le panneau latéral" name="ShowSidetrayInventory"/> + <menu_item_call label="Mon inventaire" name="ShowSidetrayInventory"/> <menu_item_call label="Mes gestes" name="Gestures"/> <menu label="Mon statut" name="Status"> <menu_item_call label="Absent" name="Set Away"/> diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index 1bafd593cf..e122032447 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/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="Message de notification inconnu" name="MissingAlert"> @@ -1039,6 +1051,7 @@ Céder ces [AREA] m² de terrain au groupe [GROUP_NAME] ? </notification> <notification name="ErrorMessage"> [ERROR_MESSAGE] + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AvatarMovedDesired"> La destination que vous avez choisie n'est pas disponible actuellement. @@ -1917,10 +1930,10 @@ Liez-la à partir d'une page web pour permettre aux autres résidents d&apo Sujet : [SUBJECT], Message : [MESSAGE] </notification> <notification name="FriendOnline"> - [NAME_SLURL] est connecté + [FIRST] [LAST] est connecté(e) </notification> <notification name="FriendOffline"> - [NAME_SLURL] est déconnecté + [FIRST] [LAST] est déconnecté(e) </notification> <notification name="AddSelfFriend"> Même si vous êtes extrêmement sympathique, vous ne pouvez pas devenir ami avec vous-même. diff --git a/indra/newview/skins/default/xui/fr/panel_bottomtray.xml b/indra/newview/skins/default/xui/fr/panel_bottomtray.xml index b3fac96250..d3e4afd6ee 100644 --- a/indra/newview/skins/default/xui/fr/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/fr/panel_bottomtray.xml @@ -7,6 +7,11 @@ Affiche/Masque le panneau de contrÃŽle vocal </string> <layout_stack name="toolbar_stack"> + <layout_panel name="speak_panel"> + <talk_button name="talk"> + <speak_button label="Parler" label_selected="Parler" name="speak_btn"/> + </talk_button> + </layout_panel> <layout_panel name="gesture_panel"> <gesture_combo_list label="Geste" name="Gesture" tool_tip="Affiche/Masque les gestes"/> </layout_panel> diff --git a/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml index 081a956a3f..5b08b4aefb 100644 --- a/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml @@ -26,10 +26,10 @@ </accordion> </layout_panel> <layout_panel name="button_row"> - <button name="btn_create" tool_tip="Créer un groupe"/> <button label="Chat" name="btn_chat"/> <button label="Appel de groupe" name="btn_call" tool_tip="Appeler ce groupe"/> <button label="Enregistrer" label_selected="Enregistrer" name="btn_apply"/> + <button label="Créer un groupe" name="btn_create" tool_tip="Créer un groupe"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_me.xml b/indra/newview/skins/default/xui/fr/panel_me.xml index a34d43603b..2521967bc6 100644 --- a/indra/newview/skins/default/xui/fr/panel_me.xml +++ b/indra/newview/skins/default/xui/fr/panel_me.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Mon profil !" name="panel_me"> +<panel label="Mon profil" name="panel_me"> <tab_container name="tabs"> <panel label="MON PROFIL" name="panel_profile"/> <panel label="MES PRÃFÃRENCES" name="panel_picks"/> diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml new file mode 100644 index 0000000000..53b9bc6f82 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="nearby_media"> + <string name="media_item_count_format"> + (%ld articles de média) + </string> + <string name="empty_item_text"> + <vide> + </string> + <string name="parcel_media_name"> + Flux de média de la parcelle + </string> + <string name="parcel_audio_name"> + Flux audio de la parcelle + </string> + <string name="playing_suffix"> + (lecture en cours) + </string> + <panel name="minimized_controls"> + <button label="Tout arrêter" name="all_nearby_media_disable_btn" tool_tip="Désactiver tous les médias prÚs de vous"/> + <button label="Tout lancer" name="all_nearby_media_enable_btn" tool_tip="Activer tous les médias prÚs de vous"/> + <button name="open_prefs_btn" tool_tip="Ouvrir les préférences de média"/> + <button label="Plus >>" label_selected="Moins <<" name="more_less_btn" tool_tip="Options avancées"/> + </panel> + <panel name="nearby_media_panel"> + <combo_box name="show_combo"> + <combo_box.item label="Tout" name="All"/> + <combo_box.item label="Dans cette parcelle" name="WithinParcel"/> + <combo_box.item label="En dehors de la parcelle" name="OutsideParcel"/> + </combo_box> + <scroll_list name="media_list"> + <scroll_list.columns label="Proximité" name="media_proximity"/> + <scroll_list.columns label="Visible" name="media_visibility"/> + <scroll_list.columns label="Classe" name="media_class"/> + <scroll_list.columns label="Nom" name="media_name"/> + <scroll_list.columns label="Débogage" name="media_debug"/> + </scroll_list> + <panel> + <layout_stack name="media_controls"> + <layout_panel name="stop"> + <button name="stop_btn" tool_tip="Arrêter le média sélectionné"/> + </layout_panel> + <layout_panel name="play"> + <button name="play_btn" tool_tip="Jouer le média sélectionné"/> + </layout_panel> + <layout_panel name="pause"> + <button name="pause_btn" tool_tip="Pauser le média sélectionné"/> + </layout_panel> + <layout_panel name="volume_slider_ctrl"> + <slider_bar initial_value="0.5" name="volume_slider" tool_tip="Volume audio pour le média sélectionné"/> + </layout_panel> + <layout_panel name="mute"> + <button name="mute_btn" tool_tip="Couper l'audio sur le média sélectionné"/> + </layout_panel> + <layout_panel name="zoom"> + <button name="zoom_btn" tool_tip="Zoomer en avant sur le média sélectionné"/> + </layout_panel> + <layout_panel name="unzoom"> + <button name="unzoom_btn" tool_tip="Zoomer en arriÚre sur le média sélectionné"/> + </layout_panel> + </layout_stack> + </panel> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/fr/panel_online_status.xml b/indra/newview/skins/default/xui/fr/panel_online_status.xml new file mode 100644 index 0000000000..fdc489f375 --- /dev/null +++ b/indra/newview/skins/default/xui/fr/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/fr/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml index 3035183b28..f14ccc3a8e 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml @@ -3,7 +3,7 @@ <panel.string name="log_in_to_change"> se connecter pour changer </panel.string> - <button label="Vider le cache" name="clear_cache"/> + <button label="Vider le cache" name="clear_cache" tool_tip="Effacer l'image de connexion, le dernier lieu, l'historique des téléportations et la texture du cache."/> <text name="cache_size_label_l"> (Endroits, images, web, historique des recherches) </text> @@ -11,9 +11,6 @@ <check_box label="Seuls mes amis et groupes peuvent m'appeler ou m'envoyer un IM" name="voice_call_friends_only_check"/> <check_box label="Fermer le micro à la fin d'un appel" name="auto_disengage_mic_check"/> <check_box label="Accepter les cookies" name="cookies_enabled"/> - <check_box label="Média activé" name="media_enabled"/> - <check_box label="Autoriser la lecture automatique du média" name="autoplay_enabled"/> - <check_box label="Musique activée" name="music_enabled"/> <text name="Logs:"> Journaux : </text> 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 4f5ef423f5..663775559a 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml @@ -1,16 +1,20 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Sons" name="Preference Media panel"> <slider label="Volume principal" name="System Volume"/> - <check_box initial_value="true" label="Couper le son si minimisé" name="mute_when_minimized"/> - <slider label="Ambiant" name="Wind Volume"/> + <check_box initial_value="true" label="Couper le son quand minimisé" name="mute_when_minimized"/> <slider label="Boutons" name="UI Volume"/> - <slider label="Média" name="Media Volume"/> + <slider label="Ambiant" name="Wind Volume"/> <slider label="Effets sonores" name="SFX Volume"/> <slider label="Flux musical" name="Music Volume"/> - <check_box label="Activer le chat vocal" name="enable_voice_check"/> + <check_box label="Activé" name="music_enabled"/> + <slider label="Média" name="Media Volume"/> + <check_box label="Activé" name="enable_media"/> <slider label="Chat vocal" name="Voice Volume"/> + <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"> - Ãcouter à partir de : + ParamÚtres du chat vocal </text> <radio_group name="ear_location"> <radio_item label="Position de la caméra" name="0"/> diff --git a/indra/newview/skins/default/xui/fr/panel_side_tray.xml b/indra/newview/skins/default/xui/fr/panel_side_tray.xml index 6329324a23..178ae4324b 100644 --- a/indra/newview/skins/default/xui/fr/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/fr/panel_side_tray.xml @@ -7,7 +7,9 @@ <panel label="domicile" name="panel_home"/> </sidetray_tab> <sidetray_tab description="Modifiez votre profil public et vos Favoris." name="sidebar_me" tab_title="Mon profil"> - <panel label="Moi" name="panel_me"/> + <panel_container name="panel_container"> + <panel label="Moi" name="panel_me"/> + </panel_container> </sidetray_tab> <sidetray_tab description="Trouvez vos amis, vos contacts et les personnes se trouvant prÚs de vous." name="sidebar_people" tab_title="Personnes"> <panel_container name="panel_container"> 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 600676ee71..e58e806f99 100644 --- a/indra/newview/skins/default/xui/fr/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/fr/panel_status_bar.xml @@ -26,5 +26,6 @@ <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="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 aff2187484..f25fe09c84 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -825,7 +825,7 @@ Appuyez sur ESC pour quitter la vue subjective </string> <string name="InventoryNoMatchingItems"> - Aucun objet correspondant dans l'inventaire. + Aucun objet correspondant dans l'inventaire. Essayer la [secondlife:///app/search/groups "Recherche"]. </string> <string name="FavoritesNoMatchingItems"> Faites glisser un repÚre ici pour l'ajouter à vos Favoris. @@ -1504,7 +1504,7 @@ (mise à jour aprÚs la publication) </string> <string name="NoPicksClassifiedsText"> - Il n'y a pas de préférences/petites annonces ici + 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="PicksClassifiedsLoadingText"> Chargement... 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 bf3452c161..d57a81c770 100644 --- a/indra/newview/skins/default/xui/ja/floater_about_land.xml +++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml @@ -27,13 +27,13 @@ [AREA] å¹³æ¹ã¡ãŒãã« </panel.string> <panel.string name="auction_id_text"> - ãªãŒã¯ã·ã§ã³IDïŒ [ID] + ãªãŒã¯ã·ã§ã³ IDïŒ [ID] </panel.string> <panel.string name="need_tier_to_modify"> ãã®åå°ãä¿®æ£å€æŽããã«ã¯ã賌å
¥ãæ¿èªããå¿
èŠããããŸãã </panel.string> <panel.string name="group_owned_text"> - (ã°ã«ãŒãææ) + ïŒã°ã«ãŒãææïŒ </panel.string> <panel.string name="profile_text"> ãããã£ãŒã« @@ -42,13 +42,13 @@ æ
å ± </panel.string> <panel.string name="public_text"> - (å
Œ
±) + ïŒå
Œ
±ïŒ </panel.string> <panel.string name="none_text"> ïŒãªãïŒ </panel.string> <panel.string name="sale_pending_text"> - (賌å
¥å¯©æ»äž) + ïŒè³Œå
¥å¯©æ»äžïŒ </panel.string> <panel.string name="no_selection_text"> åºç»ãéžæãããŠããŸããã @@ -95,7 +95,7 @@ è²©å£²å¯Ÿè±¡å€ </text> <text name="For Sale: Price L$[PRICE]."> - äŸ¡æ ŒïŒ L$[PRICE] ïŒL$[PRICE_PER_SQM]/å¹³æ¹ã¡ãŒãã«ïŒ + äŸ¡æ ŒïŒ L$ [PRICE] ïŒL$ [PRICE_PER_SQM] / å¹³æ¹ã¡ãŒãã«ïŒ </text> <button label="åå°ã売ã" label_selected="åå°ã販売..." name="Sell Land..." width="100"/> <text name="For sale to"> @@ -132,7 +132,7 @@ <button label="å
¥å Žèš±å¯ã賌å
¥" label_selected="å
¥å Žèš±å¯ã賌å
¥..." left="130" name="Buy Pass..." tool_tip="ãã®åå°ãžã®äžæçãªã¢ã¯ã»ã¹ãèš±å¯ããŸãã" width="100"/> <button label="åå°ã®æŸæ£" label_selected="åå°ãæŸæ£..." name="Abandon Land..."/> <button label="åå°ãåãæ»ã" label_selected="åå°ã®è¿éãèŠæ±..." name="Reclaim Land..."/> - <button label="ãªã³ãã³ã»ãŒã«" label_selected="Lindenã»ãŒã«..." name="Linden Sale..." tool_tip="åå°ãææãããŠãããã³ã³ãã³ããèšå®ãããŠããå¿
èŠããããŸãããªãŒã¯ã·ã§ã³ã®å¯Ÿè±¡ã«ãªã£ãŠããªãããšãå¿
èŠæ¡ä»¶ã§ãã"/> + <button label="ãªã³ãã³ã»ãŒã«" label_selected="Linden ã»ãŒã«..." name="Linden Sale..." tool_tip="åå°ãææãããŠãããã³ã³ãã³ããèšå®ãããŠããå¿
èŠããããŸãããªãŒã¯ã·ã§ã³ã®å¯Ÿè±¡ã«ãªã£ãŠããªãããšãå¿
èŠæ¡ä»¶ã§ãã"/> </panel> <panel label="çŽæ¬Ÿ" name="land_covenant_panel"> <panel.string name="can_resell"> @@ -155,7 +155,7 @@ ã¡ã€ã³ã©ã³ã </text> <text name="estate_owner_lbl"> - ãªãŒããŒïŒ + ææè
ïŒ </text> <text name="estate_owner_text"> ïŒãªãïŒ @@ -188,7 +188,7 @@ åè²©ïŒ </text> <text name="resellable_clause"> - ãã®å°åïŒãªãŒãžã§ã³ïŒã«ããåå°ã¯å販ã§ããŸããã + ãã®ãªãŒãžã§ã³ïŒå°åïŒã«ããåå°ã¯å販ã§ããŸããã </text> <text name="changeable_lbl"> ååå²ïŒ @@ -200,10 +200,10 @@ </panel> <panel label="ãªããžã§ã¯ã" name="land_objects_panel"> <panel.string left="200" name="objects_available_text"> - [MAX]ã®å
[COUNT]ïŒ[AVAILABLE]å©çšå¯èœïŒ + [MAX] ã®å
[COUNT]ïŒ[AVAILABLE] å©çšå¯èœïŒ </panel.string> <panel.string left="200" name="objects_deleted_text"> - [MAX]ã®å
[COUNT]ïŒ[DELETED]ãåé€ïŒ + [MAX] ã®å
[COUNT]ïŒ[DELETED] ãåé€ïŒ </panel.string> <text name="parcel_object_bonus"> ãªããžã§ã¯ãããŒãã¹: [BONUS] @@ -212,7 +212,7 @@ ããªã 䜿çšç¶æ³ïŒ </text> <text left="200" name="objects_available"> - [MAX]ã®å
[COUNT]ïŒ[AVAILABLE]å©çšå¯èœïŒ + [MAX] ã®å
[COUNT] ïŒ[AVAILABLE] å©çšå¯èœïŒ </text> <text name="Primitives parcel supports:" width="200"> åºç»ã§ãµããŒããããããªã æ°ïŒ @@ -227,7 +227,7 @@ [COUNT] </text> <text name="Owned by parcel owner:" width="300"> - åºç»ãªãŒããŒã«ããææïŒ + åºç»ææè
ã®ææç©ïŒ </text> <text left="200" name="owner_objects_text"> [COUNT] @@ -243,7 +243,7 @@ <button label="衚瀺" label_selected="衚瀺" name="ShowGroup" right="-145"/> <button label="è¿åŽ" label_selected="è¿åŽ..." name="ReturnGroup..." right="-15" tool_tip="ãªããžã§ã¯ãããªãŒããŒã«è¿åŽããŸã"/> <text name="Owned by others:"> - ä»äººã«ããææïŒ + ä»äººã®ææç©ïŒ </text> <text left="200" name="other_objects_text"> [COUNT] @@ -251,17 +251,17 @@ <button label="衚瀺" label_selected="衚瀺" name="ShowOther" right="-145"/> <button label="è¿åŽ" label_selected="è¿åŽ..." name="ReturnOther..." right="-15" tool_tip="ãªããžã§ã¯ãããªãŒããŒã«è¿åŽããŸã"/> <text name="Selected / sat upon:"> - éžææžã¿ïŒæ±ºå®æžã¿ïŒ + éžææžã¿ã»æ±ºå®æžã¿ïŒ </text> <text left="200" name="selected_objects_text"> [COUNT] </text> <text name="Autoreturn" width="500"> - ä»äººã®ãªããžã§ã¯ããèªåè¿åŽïŒååäœã0ã§èªåè¿åŽãªãïŒïŒ + ä»äººã®ãªããžã§ã¯ããèªåè¿åŽïŒååäœã0 ã§èªåè¿åŽãªãïŒïŒ </text> <line_editor left_delta="5" name="clean other time" right="-80"/> <text name="Object Owners:" width="150"> - ãªããžã§ã¯ãã®ãªãŒããŒïŒ + ãªããžã§ã¯ãã®ææè
ïŒ </text> <button label="ãªã¹ãæŽæ°" label_selected="ãªã¹ãæŽæ°" left="146" name="Refresh List" tool_tip="ãªããžã§ã¯ãã®ãªã¹ããæŽæ°ããŸã"/> <button label="ãªããžã§ã¯ããè¿åŽãã" label_selected="ãªããžã§ã¯ãã®è¿åŽ..." left="256" name="Return objects..."/> @@ -278,7 +278,7 @@ ãã®åºç»ãæ€çŽ¢çµæã«è¡šç€ºãã </panel.string> <panel.string name="search_disabled_small_tooltip"> - åºç»é¢ç©ã128å¹³æ¹ã¡ãŒãã«ããã以äžã®ããããã®ãªãã·ã§ã³ã¯ç¡å¹ã§ãã + åºç»é¢ç©ã 128 å¹³æ¹ã¡ãŒãã«ããã以äžã®ããããã®ãªãã·ã§ã³ã¯ç¡å¹ã§ãã 倧ããªåºç»ã®ã¿æ€çŽ¢ã«è¡šç€ºãããããšãå¯èœã§ãã </panel.string> <panel.string name="search_disabled_permissions_tooltip"> @@ -330,11 +330,11 @@ </text> <check_box label="å®å
šïŒãã¡ãŒãžãªãïŒ" name="check safe" tool_tip="ãã§ãã¯ãå
¥ãããšãã®åå°ã§ã®ãã¡ãŒãžã³ã³ããããç¡å¹ã«ãªãããå®å
šãã«èšå®ãããŸãã ãã§ãã¯ãå€ããšãã¡ãŒãžã³ã³ããããæå¹ã«ãªããŸãã"/> <check_box label="ããã·ã³ã°ãå¶é" name="PushRestrictCheck" tool_tip="ã¹ã¯ãªããã«ããããã·ã³ã°ãå¶éããŸãã ãã®ãªãã·ã§ã³ãéžæããããšã«ãããããªãã®åå°ã§ã®ç Žå£çè¡åãé²ãããšãã§ããŸãã"/> - <check_box label="æ€çŽ¢ã«åºç»ã衚瀺ïŒé± L$30ïŒ" name="ShowDirectoryCheck" tool_tip="ãã®åºç»ãæ€çŽ¢çµæã«è¡šç€ºããŸã"/> + <check_box label="æ€çŽ¢ã«åºç»ã衚瀺ïŒé± L$ 30ïŒ" name="ShowDirectoryCheck" tool_tip="ãã®åºç»ãæ€çŽ¢çµæã«è¡šç€ºããŸã"/> <combo_box name="land category with adult"> <combo_box.item label="å
šã«ããŽãª" name="item0"/> - <combo_box.item label="Lindenæåšå°" name="item1"/> - <combo_box.item label="Adult" name="item2"/> + <combo_box.item label="Linden æåšå°" name="item1"/> + <combo_box.item label="ã¢ãã«ã" name="item2"/> <combo_box.item label="ã¢ãŒããšã«ã«ãã£ãŒ" name="item3"/> <combo_box.item label="ããžãã¹" name="item4"/> <combo_box.item label="æè²ç" name="item5"/> @@ -348,7 +348,7 @@ </combo_box> <combo_box name="land category"> <combo_box.item label="å
šã«ããŽãªãŒ" name="item0"/> - <combo_box.item label="Lindenæåšå°" name="item1"/> + <combo_box.item label="Linden æåšå°" name="item1"/> <combo_box.item label="ã¢ãŒã&ã«ã«ãã£ãŒ" name="item3"/> <combo_box.item label="ããžãã¹" name="item4"/> <combo_box.item label="æè²ç" name="item5"/> @@ -402,7 +402,7 @@ </text> <texture_picker label="" left="120" name="media texture" tool_tip="åçãã¯ãªãã¯ããŠéžæ"/> <text name="replace_texture_help" width="290"> - ãã®ãã¯ã¹ãã£ã䜿çšãããªããžã§ã¯ãã®ãã¬ã€ãã¯ãªãã¯ãããšãã ãŒããŒã Web ããŒãžã衚瀺ããŸãã ãã¯ã¹ãã£ãå€æŽããã«ã¯ãµã ãã€ã«ãéžæããŠãã ããã + ãã®ãã¯ã¹ãã£ã䜿çšãããªããžã§ã¯ãã®ãåçããã¯ãªãã¯ãããšãåç»ã Web ããŒãžã衚瀺ããŸãã ãã¯ã¹ãã£ãå€æŽããã«ã¯ãµã ãã€ã«ãéžæããŠãã ããã </text> <check_box label="ã¹ã±ãŒã«ãèªåèšå®" name="media_auto_scale" tool_tip="ãã®ãªãã·ã§ã³ããã§ãã¯ãããšããã®åºç»ã®ã³ã³ãã³ãã®ã¹ã±ãŒã«ãèªåçã«èšå®ãããŸãã åäœé床ãšç»è³ªãå°ãäœäžããããšããããŸãããä»ã®ãã¯ã¹ãã£ãŒã®ã¹ã±ãŒãªã³ã°ãæŽåãå¿
èŠã«ãªãããšã¯ãããŸããã"/> <text name="media_size" tool_tip="ã¬ã³ããªã³ã°ããWebã¡ãã£ã¢ã®ãµã€ãºã§ããããã©ã«ãã® 0 ã®ãŸãŸã«ããŸãã"> @@ -439,7 +439,7 @@ ïŒãšã¹ããŒãã«éå®ïŒ </panel.string> <panel.string name="estate_override"> - 1ã€ä»¥äžã®ãªãã·ã§ã³ããäžåç£ã¬ãã«ã§èšå®ãããŠããŸãã + 1 ã€ä»¥äžã®ãªãã·ã§ã³ããäžåç£ã¬ãã«ã§èšå®ãããŠããŸãã </panel.string> <text name="Limit access to this parcel to:"> ãã®åºç»ãžã®ã¢ã¯ã»ã¹ @@ -450,7 +450,7 @@ </text> <check_box label="æ¯ææ
å ±ç»é²æž [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="æªç¢ºèªã®äœäººã®ç«å
¥ãçŠæ¢ããŸãã"/> <check_box label="å¹Žéœ¢ç¢ºèª [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="幎霢確èªãæžãŸããŠããªãäœäººã®ç«å
¥ãçŠæ¢ããŸãã 詳ããæ
å ±ã¯ [SUPPORT_SITE] ãã芧äžããã"/> - <check_box label="ã°ã«ãŒãã®ã¢ã¯ã»ã¹ãèš±å¯ïŒ[GROUP]" name="GroupCheck" tool_tip="[äžè¬]ã¿ãã§ãã°ã«ãŒããéžæããŠãã ããã"/> + <check_box label="ã°ã«ãŒãã®ã¢ã¯ã»ã¹ãèš±å¯ïŒ[GROUP]" name="GroupCheck" tool_tip="ãäžè¬ãã¿ãã§ãã°ã«ãŒããéžæããŠãã ããã"/> <check_box label="å
¥å Žèš±å¯ã販売ïŒ" name="PassCheck" tool_tip="ãã®åºç»ãžã®äžæçãªã¢ã¯ã»ã¹ãèš±å¯ããŸã"/> <combo_box name="pass_combo"> <combo_box.item label="誰ã§ã" name="Anyone"/> diff --git a/indra/newview/skins/default/xui/ja/floater_build_options.xml b/indra/newview/skins/default/xui/ja/floater_build_options.xml index 9fd788d9cb..8cb67ca521 100644 --- a/indra/newview/skins/default/xui/ja/floater_build_options.xml +++ b/indra/newview/skins/default/xui/ja/floater_build_options.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="build options floater" title="ã°ãªãããªãã·ã§ã³"> - <spinner label="ã°ãªãããŠãããïŒã¡ãŒãã«ïŒ" name="GridResolution"/> + <spinner label="ã°ãªããåäœïŒã¡ãŒãã«ïŒ" name="GridResolution"/> <spinner label="ã°ãªããïŸç¯å²ïŒã¡ãŒãã«ïŒ" name="GridDrawSize"/> - <check_box label="ãµããŠãããã«ã¹ããã" name="GridSubUnit"/> + <check_box label="ãã现ããåäœã§ã¹ããããã£ãã" name="GridSubUnit"/> <check_box label="暪æé¢ã衚瀺" name="GridCrossSection"/> - <text name="grid_opacity_label" tool_tip="ã°ãªããã®éæ床"> - éæåºŠïŒ + <text name="grid_opacity_label" tool_tip="ã°ãªããã®äžéæ床"> + äžéæåºŠïŒ </text> <slider label="ã°ãªããã®äžéæ床" name="GridOpacity"/> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_buy_land.xml b/indra/newview/skins/default/xui/ja/floater_buy_land.xml index f332c3d988..a50f36b6f3 100644 --- a/indra/newview/skins/default/xui/ja/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/ja/floater_buy_land.xml @@ -1,5 +1,132 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="buy land" title="åå°ã®è³Œå
¥"> + <floater.string name="can_resell"> + å販å¯èœ + </floater.string> + <floater.string name="can_not_resell"> + å販äžå¯èœ + </floater.string> + <floater.string name="can_change"> + çµ±åã»ååå²å¯èœ + </floater.string> + <floater.string name="can_not_change"> + çµ±åã»ååå²äžå¯èœ + </floater.string> + <floater.string name="cant_buy_for_group"> + ããªãã¯ã¢ã¯ãã£ããªã°ã«ãŒãçšã®åå°è³Œå
¥ãèš±å¯ãããŠããŸãã + </floater.string> + <floater.string name="no_land_selected"> + åå°ãéžæãããŠããŸãã + </floater.string> + <floater.string name="multiple_parcels_selected"> + è€æ°ã®ç°ãªã£ãåºç»ãéžæããŸããã +ããããå°ããªç¯å²ãéžæããŠãã ããã + </floater.string> + <floater.string name="no_permission"> + ããªãã¯ã¢ã¯ãã£ããªã°ã«ãŒãçšã®åå°è³Œå
¥ãèš±å¯ãããŠããŸãã + </floater.string> + <floater.string name="parcel_not_for_sale"> + éžæãããåºç»ã¯è²©å£²å¯Ÿè±¡å€ã§ã + </floater.string> + <floater.string name="group_already_owns"> + ã°ã«ãŒãã¯ãã§ã«ãã®åºç»ãææããŠããŸã + </floater.string> + <floater.string name="you_already_own"> + ããªãã¯ãã§ã«ãã®åºç»ãææããŠããŸã + </floater.string> + <floater.string name="set_to_sell_to_other"> + éžæãããåºç»ã¯ãä»ã®äººãžã®è²©å£²ã決ãŸã£ãŠããŸã + </floater.string> + <floater.string name="no_public_land"> + éžæãããå°åã«ãå
Œ
±ã®åå°ã¯ãããŸãã + </floater.string> + <floater.string name="not_owned_by_you"> + ä»ã®äœ¿çšè
ã«ææãããåå°ãéžæãããŠããŸãã +ããããå°ããªç¯å²ãéžæããŠãã ããã + </floater.string> + <floater.string name="processing"> + 賌å
¥åŠçäž... + +ïŒæ°åãããããšããããŸãïŒ + </floater.string> + <floater.string name="fetching_error"> + åå°è³Œå
¥ã®æ
å ±å
¥æäžã«ãšã©ãŒãèµ·ããŸãã + </floater.string> + <floater.string name="buying_will"> + ãã®åå°ãè²·ããšïŒ + </floater.string> + <floater.string name="buying_for_group"> + ã°ã«ãŒãçšã®åå°ã賌å
¥ãããšïŒ + </floater.string> + <floater.string name="cannot_buy_now"> + çŸåšè³Œå
¥äžå¯ïŒ + </floater.string> + <floater.string name="not_for_sale"> + 販売察象å€ïŒ + </floater.string> + <floater.string name="none_needed"> + äžåå¿
èŠãªã + </floater.string> + <floater.string name="must_upgrade"> + ã¢ã«ãŠã³ããã¢ããã°ã¬ãŒãããªããšãåå°ãææã§ããŸãã + </floater.string> + <floater.string name="cant_own_land"> + ããªãã®ã¢ã«ãŠã³ãã§åå°ãææã§ããŸã + </floater.string> + <floater.string name="land_holdings"> + ããªãã¯ã[BUYER] å¹³æ¹ã¡ãŒãã«ã®åå°ãææããŠããŸãã + </floater.string> + <floater.string name="pay_to_for_land"> + ãã®åå°ã®ä»£éãšããŠã[SELLER]ã«L$[AMOUNT]ãæ¯æã + </floater.string> + <floater.string name="buy_for_US"> + L$ [AMOUNT] ããçŽ [LOCAL_AMOUNT] ã§è³Œå
¥ããŸãã + </floater.string> + <floater.string name="parcel_meters"> + ãã®åºç»ã¯ [AMOUNT] å¹³æ¹ã¡ãŒãã«ã§ãã + </floater.string> + <floater.string name="premium_land"> + ãã®åå°ã¯å²ãå¢ãä»ã§ãã [AMOUNT] å¹³æ¹ã¡ãŒãã«ã®æéãããããŸãã + </floater.string> + <floater.string name="discounted_land"> + ãã®åå°ã¯ãã£ã¹ã«ãŠã³ããããŠããŸãã [AMOUNT] å¹³æ¹ã¡ãŒãã«ã®æéãããããŸãã + </floater.string> + <floater.string name="meters_supports_object"> + [AMOUNT] å¹³æ¹ã¡ãŒãã« +ãªããžã§ã¯ã [AMOUNT2] åãµããŒã + </floater.string> + <floater.string name="sold_with_objects"> + ãªããžã§ã¯ã蟌ã¿ã§è²©å£² + </floater.string> + <floater.string name="sold_without_objects"> + ãªããžã§ã¯ãã¯å«ãŸããŠããŸãã + </floater.string> + <floater.string name="info_price_string"> + L$ [PRICE] +ïŒL$[PRICE_PER_SQM]/å¹³æ¹ã¡ãŒãã«ïŒ +[SOLD_WITH_OBJECTS] + </floater.string> + <floater.string name="insufficient_land_credits"> + ãã® [GROUP] ãåºç»ã®è³Œå
¥æç¶ããå®äºããã«ã¯ã äŸ¡æ Œã«èŠåãã ãã®å¯ä»ãããåå°ã®å©çšå®çžŸãå¿
èŠã§ã + </floater.string> + <floater.string name="have_enough_lindens"> + ããªãã®ææãã L$ [AMOUNT]ã§ããã®åå°ã賌å
¥ã§ããŸã + </floater.string> + <floater.string name="not_enough_lindens"> + ããªãã®ææé㯠L$ [AMOUNT]ã ãã§ãããšL$ [AMOUNT2] å¿
èŠã§ã + </floater.string> + <floater.string name="balance_left"> + 賌å
¥åŸãããªãã®æ®é¡ã¯L$[AMOUNT]ã«ãªããŸã + </floater.string> + <floater.string name="balance_needed"> + ãã®åå°ãè²·ãã«ã¯ãå°ãªããšã L$ [AMOUNT] ã賌å
¥ããå¿
èŠããããŸã + </floater.string> + <floater.string name="no_parcel_selected"> + (åºç»ãéžå®ãããŠããŸãã) + </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"> å°åïŒ </text> @@ -27,10 +154,10 @@ <text name="resellable_changeable_label"> ãã®å°åã§è³Œå
¥ããåå°ïŒ </text> - <text name="resellable_clause" left="460"> + <text left="460" name="resellable_clause"> å販ã§ããå Žåãšã§ããªãå ŽåããããŸãã </text> - <text name="changeable_clause" left="460"> + <text left="460" name="changeable_clause"> çµ±åãŸãã¯ååå²ã§ããå Žåãšã§ããªãå ŽåããããŸãã </text> <text name="covenant_text"> @@ -107,131 +234,4 @@ <check_box label="ã°ã«ãŒããã [AMOUNT] å¹³æ¹ã¡ãŒãã«ã®è²¢ç®ãåãé€ããŸãã" name="remove_contribution"/> <button label="賌å
¥" name="buy_btn"/> <button label="åãæ¶ã" name="cancel_btn"/> - <string name="can_resell"> - å販å¯èœ - </string> - <string name="can_not_resell"> - å販äžå¯èœ - </string> - <string name="can_change"> - çµ±åã»ååå²å¯èœ - </string> - <string name="can_not_change"> - çµ±åã»ååå²äžå¯èœ - </string> - <string name="cant_buy_for_group"> - ããªãã¯ã¢ã¯ãã£ããªã°ã«ãŒãçšã®åå°è³Œå
¥ãèš±å¯ãããŠããŸãã - </string> - <string name="no_land_selected"> - åå°ãéžæãããŠããŸãã - </string> - <string name="multiple_parcels_selected"> - è€æ°ã®ç°ãªã£ãåºç»ãéžæããŸããã -ããããå°ããªç¯å²ãéžæããŠãã ããã - </string> - <string name="no_permission"> - ããªãã¯ã¢ã¯ãã£ããªã°ã«ãŒãçšã®åå°è³Œå
¥ãèš±å¯ãããŠããŸãã - </string> - <string name="parcel_not_for_sale"> - éžæãããåºç»ã¯è²©å£²å¯Ÿè±¡å€ã§ã - </string> - <string name="group_already_owns"> - ã°ã«ãŒãã¯ãã§ã«ãã®åºç»ãææããŠããŸã - </string> - <string name="you_already_own"> - ããªãã¯ãã§ã«ãã®åºç»ãææããŠããŸã - </string> - <string name="set_to_sell_to_other"> - éžæãããåºç»ã¯ãä»ã®äººãžã®è²©å£²ã決ãŸã£ãŠããŸã - </string> - <string name="no_public_land"> - éžæãããå°åã«ãå
Œ
±ã®åå°ã¯ãããŸãã - </string> - <string name="not_owned_by_you"> - ä»ã®äœ¿çšè
ã«ææãããåå°ãéžæãããŠããŸãã -ããããå°ããªç¯å²ãéžæããŠãã ããã - </string> - <string name="processing"> - 賌å
¥åŠçäž... - -ïŒæ°åãããããšããããŸãïŒ - </string> - <string name="fetching_error"> - åå°è³Œå
¥ã®æ
å ±å
¥æäžã«ãšã©ãŒãèµ·ããŸãã - </string> - <string name="buying_will"> - ãã®åå°ãè²·ããšïŒ - </string> - <string name="buying_for_group"> - ã°ã«ãŒãçšã®åå°ã賌å
¥ãããšïŒ - </string> - <string name="cannot_buy_now"> - çŸåšè³Œå
¥äžå¯ïŒ - </string> - <string name="not_for_sale"> - 販売察象å€ïŒ - </string> - <string name="none_needed"> - äžåå¿
èŠãªã - </string> - <string name="must_upgrade"> - ã¢ã«ãŠã³ããã¢ããã°ã¬ãŒãããªããšãåå°ãææã§ããŸãã - </string> - <string name="cant_own_land"> - ããªãã®ã¢ã«ãŠã³ãã§åå°ãææã§ããŸã - </string> - <string name="land_holdings"> - ããªãã¯ã[BUYER] å¹³æ¹ã¡ãŒãã«ã®åå°ãææããŠããŸãã - </string> - <string name="pay_to_for_land"> - ãã®åå°ã®ä»£éãšããŠã[SELLER]ã«L$[AMOUNT]ãæ¯æã - </string> - <string name="buy_for_US"> - L$ [AMOUNT] ããçŽ [LOCAL_AMOUNT] ã§è³Œå
¥ããŸãã - </string> - <string name="parcel_meters"> - ãã®åºç»ã¯ [AMOUNT] å¹³æ¹ã¡ãŒãã«ã§ãã - </string> - <string name="premium_land"> - ãã®åå°ã¯å²ãå¢ãä»ã§ãã [AMOUNT] å¹³æ¹ã¡ãŒãã«ã®æéãããããŸãã - </string> - <string name="discounted_land"> - ãã®åå°ã¯ãã£ã¹ã«ãŠã³ããããŠããŸãã [AMOUNT] å¹³æ¹ã¡ãŒãã«ã®æéãããããŸãã - </string> - <string name="meters_supports_object"> - [AMOUNT] å¹³æ¹ã¡ãŒãã« -ãªããžã§ã¯ã [AMOUNT2] åãµããŒã - </string> - <string name="sold_with_objects"> - ãªããžã§ã¯ã蟌ã¿ã§è²©å£² - </string> - <string name="sold_without_objects"> - ãªããžã§ã¯ãã¯å«ãŸããŠããŸãã - </string> - <string name="info_price_string"> - L$ [PRICE] -ïŒL$[PRICE_PER_SQM]/å¹³æ¹ã¡ãŒãã«ïŒ -[SOLD_WITH_OBJECTS] - </string> - <string name="insufficient_land_credits"> - ãã® [GROUP] ãåºç»ã®è³Œå
¥æç¶ããå®äºããã«ã¯ã äŸ¡æ Œã«èŠåãã ãã®å¯ä»ãããåå°ã®å©çšå®çžŸãå¿
èŠã§ã - </string> - <string name="have_enough_lindens"> - ããªãã®ææãã L$ [AMOUNT]ã§ããã®åå°ã賌å
¥ã§ããŸã - </string> - <string name="not_enough_lindens"> - ããªãã®ææé㯠L$ [AMOUNT]ã ãã§ãããšL$ [AMOUNT2] å¿
èŠã§ã - </string> - <string name="balance_left"> - 賌å
¥åŸãããªãã®æ®é¡ã¯L$[AMOUNT]ã«ãªããŸã - </string> - <string name="balance_needed"> - ãã®åå°ãè²·ãã«ã¯ãå°ãªããšã L$ [AMOUNT] ã賌å
¥ããå¿
èŠããããŸã - </string> - <string name="no_parcel_selected"> - (åºç»ãéžå®ãããŠããŸãã) - </string> - <string name="buy_currency"> - çŽUS$ [USD]ã§L$ [LINDENS]ã賌å
¥ - </string> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_event.xml b/indra/newview/skins/default/xui/ja/floater_event.xml new file mode 100644 index 0000000000..306b262b70 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/floater_event.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater label="ã€ãã³ã" name="Event" title="ã€ãã³ã詳现"> + <floater.string name="none"> + ãªã + </floater.string> + <floater.string name="notify"> + ç¥ããã + </floater.string> + <floater.string name="dont_notify"> + ç¥ãããªã + </floater.string> + <layout_stack name="layout"> + <layout_panel name="profile_stack"> + <text name="event_name"> + Nameless Event...of Doom! De doom! Doom doom. + </text> + <text name="event_category"> + ïŒã«ããŽãªãªãïŒ + </text> + <text name="event_runby_label"> + äž»å¬è
ïŒ + </text> + <text initial_value="ïŒååŸäžïŒ" name="event_runby"/> + <text name="event_date"> + 10/10/2010 + </text> + <text name="event_duration"> + 1 æé + </text> + <text name="event_cover"> + ç¡æ + </text> + <text name="event_location_label"> + å ŽæïŒ + </text> + <text name="event_location" value="SampleParcel, Name Long (145, 228, 26)"/> + <text name="rating_label" value="ã¬ãŒãã£ã³ã°åºåïŒ"/> + <text name="rating_value" value="äžæ"/> + </layout_panel> + <layout_panel name="button_panel"> + <button name="create_event_btn" tool_tip="ã€ãã³ãäœæ"/> + <button name="god_delete_event_btn" tool_tip="ã€ãã³ãåé€"/> + <button label="ç¥ããã" name="notify_btn"/> + <button label="ãã¬ããŒã" name="teleport_btn"/> + <button label="å°å³" name="map_btn"/> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml index 16a3da5508..70555e6ded 100644 --- a/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="modal container"> +<floater name="modal container" title="ã¢ãŠããã£ãããä¿åãã"> <button label="ä¿å" label_selected="ä¿å" name="Save"/> <button label="ãã£ã³ã»ã«" label_selected="ãã£ã³ã»ã«" name="Cancel"/> <text name="Save item as:"> diff --git a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml index 574eb6e0a3..4ccaf1a4af 100644 --- a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml @@ -27,9 +27,12 @@ <text name="nearby"> [VOICE_CHANNEL_NAME] ãžã®æ¥ç¶ãåããŸããã [RECONNECT_NEARBY] </text> - <text name="nearby_P2P"> + <text name="nearby_P2P_by_other"> [VOICE_CHANNEL_NAME] ãã³ãŒã«ãçµäºããŸããã [RECONNECT_NEARBY] </text> + <text name="nearby_P2P_by_agent"> + ã³ãŒã«ãçµäºããŸããã [RECONNECT_NEARBY] + </text> <text name="leaving"> [CURRENT_CHAT] ãçµäºããŸãã </text> diff --git a/indra/newview/skins/default/xui/ja/floater_preferences.xml b/indra/newview/skins/default/xui/ja/floater_preferences.xml index e2893d5eab..6ba27b71a6 100644 --- a/indra/newview/skins/default/xui/ja/floater_preferences.xml +++ b/indra/newview/skins/default/xui/ja/floater_preferences.xml @@ -6,7 +6,7 @@ <panel label="äžè¬" name="general"/> <panel label="ã°ã©ãã£ãã¯" name="display"/> <panel label="ãã©ã€ãã·ãŒ" name="im"/> - <panel label="ãµãŠã³ã" name="audio"/> + <panel label="ãµãŠã³ããšã¡ãã£ã¢" name="audio"/> <panel label="ãã£ãã" name="chat"/> <panel label="ã¡ãã»ãŒãž" name="msgs"/> <panel label="ã»ããã¢ãã" name="input"/> diff --git a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml index c322538127..6ea1d79cfc 100644 --- a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml @@ -42,6 +42,6 @@ </combo_item> </combo_box> <button label="OK" name="Keep"/> - <button label="ãã£ã³ã»ã«" name="Discard"/> + <button label="åŠåãã" name="Discard"/> <button label="å¥åã§ä¿å" name="save_tex_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml index 4ad54ec7ab..53384aca90 100644 --- a/indra/newview/skins/default/xui/ja/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/ja/floater_snapshot.xml @@ -65,8 +65,8 @@ </text> <combo_box label="ç»åã¬ã€ã€ãŒ" name="layer_types"> <combo_box.item label="è²" name="Colors"/> - <combo_box.item label="æ·±ã" name="Depth"/> - <combo_box.item label="ãªã°ãžã§ã¯ãã®ã€ãæ¶ã" name="ObjectMattes"/> + <combo_box.item label="è²æ·±åºŠ" name="Depth"/> + <combo_box.item label="ããããªããžã§ã¯ã" name="ObjectMattes"/> </combo_box> <check_box label="ã€ã³ã¿ãŒãã§ãŒã¹" name="ui_check"/> <check_box label="HUD" name="hud_check"/> diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml index 456e30c2b4..24bb5b614c 100644 --- a/indra/newview/skins/default/xui/ja/floater_tools.xml +++ b/indra/newview/skins/default/xui/ja/floater_tools.xml @@ -7,16 +7,16 @@ éžæããåŽãã¯ãªãã¯ãããã©ãã°ããŠåŒã䌞ã°ã </floater.string> <floater.string name="status_move"> - 移åïŒïŸïŸïŸïœ¯ïœžïŸãã³ããŒïŒShiftãæŒããªããïŸïŸïŸïœ¯ïœžïŸ + 移åïŒãã©ãã°ãã³ããŒïŒShift + ãã©ãã° </floater.string> <floater.string name="status_modifyland"> åå°ãã¯ãªãã¯ãããã¿ã³ãæŒãããŸãŸå
¥åããŠä¿®æ£å€æŽ </floater.string> <floater.string name="status_camera"> - ã¯ãªãã¯ã»ãã©ãã°ã§èŠç移å + ã¯ãªã㯠+ ãã©ãã°ã§èŠç移å </floater.string> <floater.string name="status_grab"> - ãã©ãã°ã§ç§»åãCtrlã§æã¡äžããCtrl+Shiftã§å転 + ãã©ãã°ã§ç§»åãCtrlã§æã¡äžããCtrl + Shiftã§å転 </floater.string> <floater.string name="status_place"> ã€ã³ã¯ãŒã«ãã§ã¯ãªãã¯ããŠäœæ @@ -31,10 +31,10 @@ ããŒã«ã« </floater.string> <floater.string name="grid_world_text"> - äžç + ã€ã³ã¯ãŒã«ã </floater.string> <floater.string name="grid_reference_text"> - åç
§ + ã¬ãã¡ã¬ã³ã¹ </floater.string> <floater.string name="grid_attachment_text"> ã¢ã¿ããã¡ã³ã @@ -50,12 +50,12 @@ <radio_group name="focus_radio_group"> <radio_item label="ãºãŒã " name="radio zoom"/> <radio_item label="è»è·¡ïŒCtrlïŒ" name="radio orbit"/> - <radio_item label="æ°Žå¹³ã»åçŽç§»å (Ctrl+Shift)" name="radio pan"/> + <radio_item label="æ°Žå¹³ã»åçŽç§»å (Ctrl + Shift)" name="radio pan"/> </radio_group> <radio_group name="move_radio_group"> <radio_item label="移å" name="radio move"/> <radio_item label="æã¡äžããïŒCtrlïŒ" name="radio lift"/> - <radio_item label="å転 (Ctrl+Shift)" name="radio spin"/> + <radio_item label="å転 (Ctrl + Shift)" name="radio spin"/> </radio_group> <radio_group name="edit_radio_group"> <radio_item label="移å" name="radio position"/> @@ -68,14 +68,14 @@ ß: [COUNT] </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="ãã¯ã¹ãã£ãåŒäŒžã°ã" name="checkbox stretch textures"/> <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="World"/> <combo_box.item label="ããŒã«ã«ã°ãªãã" name="Local"/> <combo_box.item label="ãªãã¡ã¬ã³ã¹ã°ãªãã" name="Reference"/> </combo_box> - <button label="ãªãã·ã§ã³" label_selected="ãªãã·ã§ã³" name="Options..." tool_tip="ã°ãªãããªãã·ã§ã³ããã£ãšèŠã"/> + <button label="ãªãã·ã§ã³" label_selected="ãªãã·ã§ã³" name="Options..." tool_tip="ã°ãªãããªãã·ã§ã³ã衚瀺ããŸã"/> <button label="" label_selected="" name="ToolCube" tool_tip="ãã¥ãŒã"/> <button label="" label_selected="" name="ToolPrism" tool_tip="ããªãºã "/> <button label="" label_selected="" name="ToolPyramid" tool_tip="ãã©ããã"/> @@ -150,7 +150,7 @@ åèšïŒ L$ </panel.string> <panel.string name="Cost Per Unit"> - Price Per: L$ + åäŸ¡ïŒ L$ </panel.string> <panel.string name="Cost Mixed"> æ··åäŸ¡æ Œ @@ -165,7 +165,7 @@ 説æïŒ </text> <text name="Creator:"> - ã¯ãªãšãŒã¿ãŒ + å¶äœè
ïŒ </text> <text name="Creator Name"> Esbee Linden @@ -201,7 +201,7 @@ <combo_box.item label="ãªãªãžãã«" name="Original"/> </combo_box> <spinner label="äŸ¡æ ŒïŒ L$" name="Edit Cost"/> - <check_box label="æ€çŽ¢ã«è¡šç€º" name="search_check" tool_tip="æ€çŽ¢çµæã§ããã®ãªããžã§ã¯ãã人ã«èŠãã"/> + <check_box label="æ€çŽ¢ã«è¡šç€º" name="search_check" tool_tip="æ€çŽ¢çµæã«ãã®ãªããžã§ã¯ãã衚瀺ããŸã"/> <panel name="perms_build"> <text name="perm_modify"> ããªãã¯ãã®ãªããžã§ã¯ããä¿®æ£ã§ããŸã @@ -216,7 +216,7 @@ </text> <check_box label="ä¿®æ£" name="checkbox next owner can modify"/> <check_box label="ã³ããŒ" name="checkbox next owner can copy"/> - <check_box label="å販ã»ãã¬ãŒã³ã" name="checkbox next owner can transfer" tool_tip="次ã®ææè
ã¯ãã®ãªããžã§ã¯ããä»äººã«ããããå販ããããšãã§ããŸã"/> + <check_box label="å販ã»ãã¬ãŒã³ã" name="checkbox next owner can transfer" tool_tip="次ã®ææè
ã¯ãã®ãªããžã§ã¯ããä»äººã«ããããå販ã§ããŸã"/> <text name="B:"> B: </text> @@ -238,7 +238,7 @@ </panel> </panel> <panel label="圢ç¶" name="Object"> - <check_box label="ããã¯æžã¿" name="checkbox locked" tool_tip="ãªããžã§ã¯ãã®ç§»åãšåé€ãçŠæ¢ããŸãã ãã®æ©èœã䜿ããšãæ§ç¯äžã«æå³ããªãç·šéãé²ãããšãã§ããŸãã"/> + <check_box label="ããã¯æžã¿" name="checkbox locked" tool_tip="ãªããžã§ã¯ãã®ç§»åãšåé€ãçŠæ¢ããŸãã ãã®æ©èœã䜿ããšãå¶äœäžã®æå³ãã¬ç·šéãé²ãããšãã§ããŸãã"/> <check_box label="ç©ç" name="Physical Checkbox Ctrl" tool_tip="ãªããžã§ã¯ãã«å¯Ÿããéåã®äœçšãšåœ±é¿ãæå¹ã«ããŸã"/> <check_box label="èšæ" name="Temporary Checkbox Ctrl" tool_tip="å¶äœåŸ 1 åã§ãªããžã§ã¯ãã¯åé€ãããŸã"/> <check_box label="ãã¡ã³ãã " name="Phantom Checkbox Ctrl" tool_tip="ãªããžã§ã¯ãå士ã®è¡çªãŸãã¯ãªããžã§ã¯ããšã¢ãã¿ãŒã®è¡çªãåé¿ããŸã"/> @@ -280,7 +280,7 @@ <combo_box.item label="ãŽã " name="Rubber"/> </combo_box> <text name="text cut"> - ãã¹ã«ãã (å§ç¹ã»çµç¹) + ãã¹ã«ããïŒå§ç¹ãšçµç¹ïŒ </text> <spinner label="B" name="cut begin"/> <spinner label="E" name="cut end"/> @@ -300,7 +300,7 @@ <combo_box.item label="äžè§åœ¢" name="Triangle"/> </combo_box> <text name="text twist"> - ã²ãã (å§ç¹ã»çµç¹) + ã²ããïŒå§ç¹ãšçµç¹ïŒ </text> <spinner label="B" name="Twist Begin"/> <spinner label="E" name="Twist End"/> @@ -318,13 +318,13 @@ <spinner label="X" name="Shear X"/> <spinner label="Y" name="Shear Y"/> <text name="advanced_cut"> - ãããã£ãŒã«ã«ãã (å§ç¹ã»çµç¹) + ãããã£ãŒã«ã«ããïŒå§ç¹ãšçµç¹ïŒ </text> <text name="advanced_dimple"> - ããŒã¿ (å§ç¹ã»çµç¹) + ããŒã¿ïŒå§ç¹ãšçµç¹ïŒ </text> <text name="advanced_slice"> - åãåã (å§ç¹ã»çµç¹) + åãåãïŒå§ç¹ãšçµç¹ïŒ </text> <spinner label="B" name="Path Limit Begin"/> <spinner label="E" name="Path Limit End"/> @@ -339,7 +339,7 @@ <text name="text revolutions"> åè»¢äœ </text> - <texture_picker label="ã¹ã«ã«ãããã¯ã¹ãã£ãŒ" name="sculpt texture control" tool_tip="ã¯ãªãã¯ããŠåçãéžæããŠãã ããã"/> + <texture_picker label="ã¹ã«ã«ãããã¯ã¹ãã£" name="sculpt texture control" tool_tip="ã¯ãªãã¯ããŠåçãéžæããŠãã ããã"/> <check_box label="ãã©ãŒ" name="sculpt mirror control" tool_tip="ã¹ã«ã«ããããªã ã X 軞äžã§å転ãããŸã"/> <check_box label="è£è¿ã" name="sculpt invert control" tool_tip="ã¹ã«ã«ããããªã ãå転ãããŠè£è¿ããŸã"/> <text name="label sculpt type"> @@ -355,20 +355,20 @@ </panel> <panel label="ç¹åŸŽ" name="Features"> <text name="select_single"> - ããªã ã1ã€ã ãéžæããŠç·šéããŠãã ãã + ããªã ã 1 ã€ã ãéžæããŠç·šéããŠãã ãã </text> <text name="edit_object"> ãªããžã§ã¯ãã®ç¹åŸŽãç·šéïŒ </text> - <check_box label="ãã¬ãã·ãã«ã»ãã¹" name="Flexible1D Checkbox Ctrl" tool_tip="Z 軞ãäžå¿ã«ãªããžã§ã¯ãã®å±æ²ãæå¹ã«ããŸãïŒã¯ã©ã€ã¢ã³ãåŽã®ã¿ïŒ"/> + <check_box label="ãã¬ãã·ãã«ãã¹" name="Flexible1D Checkbox Ctrl" tool_tip="Z 軞ãäžå¿ã«ãªããžã§ã¯ãã®å±æ²ãæå¹ã«ããŸãïŒã¯ã©ã€ã¢ã³ãåŽã®ã¿ïŒ"/> <spinner label="æè»æ§" label_width="72" name="FlexNumSections" width="135"/> <spinner label="éå" label_width="72" name="FlexGravity" width="135"/> <spinner label="ãã©ãã°" label_width="72" name="FlexFriction" width="135"/> <spinner label="颚" label_width="72" name="FlexWind" width="135"/> <spinner label="ç·åŒµ" label_width="72" name="FlexTension" width="135"/> - <spinner label="X軞æ¹åã®å" label_width="72" name="FlexForceX" width="135"/> - <spinner label="Y軞æ¹åã®å" label_width="72" name="FlexForceY" width="135"/> - <spinner label="Z軞æ¹åã®å" label_width="72" name="FlexForceZ" width="135"/> + <spinner label="X 軞æ¹åã®å" label_width="72" name="FlexForceX" width="135"/> + <spinner label="Y 軞æ¹åã®å" label_width="72" name="FlexForceY" width="135"/> + <spinner label="Z 軞æ¹åã®å" label_width="72" name="FlexForceZ" width="135"/> <check_box label="å
" name="Light Checkbox Ctrl" tool_tip="ãªããžã§ã¯ããçºå
ããŸã"/> <color_swatch label="" left_delta="74" name="colorswatch" tool_tip="ã¯ãªãã¯ããŠã«ã©ãŒããã«ãŒãéããŸã"/> <texture_picker label="" name="light texture control" tool_tip="ã¯ãªãã¯ã§æ圱ç»ãéžæããŸãïŒé
延ã¬ã³ããªã³ã°æå¹æã®ã¿ïŒ"/> @@ -456,7 +456,7 @@ <button name="add_media" tool_tip="ã¡ãã£ã¢ãè¿œå ããŸã"/> <button name="delete_media" tool_tip="ãã®ã¡ãã£ã¢ãã¯ã¹ãã£ãåé€ããŸã"/> <button name="edit_media" tool_tip="ãã®ã¡ãã£ã¢ãç·šéããŸã"/> - <button label="æãã" label_selected="ã¡ãã£ã¢ãäžåã«æãã" name="button align" tool_tip="ã¡ãã£ã¢ãã¯ã¹ãã£ãäžåã«æããŸãïŒæåã«èªã¿èŸŒãå¿
èŠããããŸãïŒ"/> + <button label="æãã" label_selected="ã¡ãã£ã¢ãäžåã«æããŸã" name="button align" tool_tip="ã¡ãã£ã¢ãã¯ã¹ãã£ãäžåã«æããŸãïŒæåã«èªã¿èŸŒãå¿
èŠããããŸãïŒ"/> </panel> </panel> <panel label="äžèº«" name="Contents"> diff --git a/indra/newview/skins/default/xui/ja/floater_world_map.xml b/indra/newview/skins/default/xui/ja/floater_world_map.xml index 4897c94ec4..c44c6b3fd3 100644 --- a/indra/newview/skins/default/xui/ja/floater_world_map.xml +++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml @@ -67,9 +67,9 @@ <scroll_list.columns label="" name="icon"/> <scroll_list.columns label="" name="sim_name"/> </scroll_list> - <button label="ãã¬ããŒã" label_selected="ãã¬ããŒã" name="Teleport" tool_tip="éžæããå Žæã«ã¬ããŒãããŸã"/> - <button label="SLurl ãã³ããŒ" name="copy_slurl" tool_tip="çŸåšå°ã SLurl ã§ã³ããŒããŠãWebã§äœ¿çšããŸãã"/> - <button label="éžæãããªãŒãžã§ã³ã衚瀺ãã" label_selected="ç®çå°ã衚瀺" name="Show Destination" tool_tip="éžæããå Žæãå°å³ã®äžå¿ã«è¡šç€ºããŸã"/> + <button label="ãã¬ããŒã" label_selected="ãã¬ããŒã" name="Teleport" tool_tip="éžæããå Žæã«ãã¬ããŒãããŸã"/> + <button label="SLurl ãã³ããŒ" name="copy_slurl" tool_tip="çŸåšå°ã SLurl ã§ã³ããŒã㊠Web ã§äœ¿çšããŸãã"/> + <button label="éžæãã衚瀺ãã" label_selected="ç®çå°ã衚瀺" name="Show Destination" tool_tip="éžæããå Žæãå°å³ã®äžå¿ã«è¡šç€ºããŸã"/> </panel> <panel> <text name="zoom_label"> diff --git a/indra/newview/skins/default/xui/ja/inspect_avatar.xml b/indra/newview/skins/default/xui/ja/inspect_avatar.xml index 9371b80af5..aeac0a8328 100644 --- a/indra/newview/skins/default/xui/ja/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/ja/inspect_avatar.xml @@ -18,7 +18,7 @@ <slider name="volume_slider" tool_tip="ãã€ã¹é³é" value="0.5"/> <button label="ãã¬ã³ãç»é²" name="add_friend_btn"/> <button label="IM" name="im_btn"/> - <button label="詳现" name="view_profile_btn"/> + <button label="ãããã£ãŒã«" name="view_profile_btn"/> <panel name="moderator_panel"> <button label="ãã€ã¹ãç¡å¹ã«ãã" name="disable_voice"/> <button label="ãã€ã¹ãæå¹ã«ãã" name="enable_voice"/> diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml index 3d5086c52a..93f75f3ce1 100644 --- a/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml @@ -15,4 +15,5 @@ <menu_item_call label="å°å³ã§æ¢ã" name="find_on_map"/> <menu_item_call label="ãºãŒã ã€ã³" name="zoom_in"/> <menu_item_call label="æ¯æã" name="pay"/> + <menu_item_call label="å
±æ" name="share"/> </menu> diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml index e4ccbf43ad..5eaad31898 100644 --- a/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="menu_group_plus"> <menu_item_check label="ååã§äžŠã¹æ¿ã" name="sort_name"/> - <menu_item_check label="ãªã³ã©ã€ã³ç¶æ³ã§äžŠã¹æ¿ã" name="sort_status"/> + <menu_item_check label="ãªã³ã©ã€ã³ç¶æ
ã§äžŠã¹æ¿ã" name="sort_status"/> <menu_item_check label="人ã®ã¢ã€ã³ã³è¡šç€º" name="view_icons"/> <menu_item_call label="ãããã¯ãããäœäººãšãªããžã§ã¯ãã衚瀺" name="show_blocked_list"/> </menu> 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 2c8a346d1a..4788803789 100644 --- a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml @@ -2,6 +2,7 @@ <context_menu name="Avatar Context Menu"> <menu_item_call label="ãããã£ãŒã«ã®è¡šç€º" name="View Profile"/> <menu_item_call label="ãã¬ã³ãç»é²" name="Add Friend"/> + <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="Share"/> diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml index bcd562e3ed..238bfc4af9 100644 --- a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml +++ b/indra/newview/skins/default/xui/ja/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="ãã¬ã³ãç»é²" name="Add Friends"/> + <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="Share"/> diff --git a/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml index dd0016c566..d7107dc153 100644 --- a/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml +++ b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml @@ -2,7 +2,8 @@ <toggleable_menu name="profile_overflow_menu"> <menu_item_call label="æ¯æã" name="pay"/> <menu_item_call label="å
±æ" name="share"/> - <menu_item_check label="ãããã¯ã»ãããã¯è§£é€" name="block_unblock"/> + <menu_item_call label="ãããã¯" name="block"/> + <menu_item_call label="ãããã¯è§£é€" name="unblock"/> <menu_item_call label="è¿œæŸ" name="kick"/> <menu_item_call label="ããªãŒãº" name="freeze"/> <menu_item_call label="ããªãŒãºè§£é€" name="unfreeze"/> diff --git a/indra/newview/skins/default/xui/ja/menu_slurl.xml b/indra/newview/skins/default/xui/ja/menu_slurl.xml index eb24cee7e0..61ba3085d9 100644 --- a/indra/newview/skins/default/xui/ja/menu_slurl.xml +++ b/indra/newview/skins/default/xui/ja/menu_slurl.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="Popup"> - <menu_item_call label="URLã«ã€ããŠ" name="about_url"/> - <menu_item_call label="URLã«ãã¬ããŒããã" name="teleport_to_url"/> + <menu_item_call label="URL ã«ã€ããŠ" name="about_url"/> + <menu_item_call label="URL ã«ãã¬ããŒããã" name="teleport_to_url"/> <menu_item_call label="å°å³" name="show_on_map"/> </menu> diff --git a/indra/newview/skins/default/xui/ja/menu_url_http.xml b/indra/newview/skins/default/xui/ja/menu_url_http.xml index c2f4f24db6..c3da8a8686 100644 --- a/indra/newview/skins/default/xui/ja/menu_url_http.xml +++ b/indra/newview/skins/default/xui/ja/menu_url_http.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> <menu_item_call label="Web ããŒãžãéã" name="url_open"/> - <menu_item_call label="ã€ã³ã¿ãŒããããã©ãŠã¶ã§éã" name="url_open_internal"/> + <menu_item_call label="å
èµãã©ãŠã¶ã§éã" name="url_open_internal"/> <menu_item_call label="å€éšãã©ãŠã¶ã§éã" name="url_open_external"/> <menu_item_call label="URLãã¯ãªããããŒãã«ã³ããŒ" name="url_copy"/> </context_menu> diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml index 57703e2183..85fb23d5b7 100644 --- a/indra/newview/skins/default/xui/ja/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml @@ -5,7 +5,7 @@ <menu_item_call label="ãã€ã¢ã«ãŠã³ã" name="Manage My Account"> <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="L$ ã®è³Œå
¥" name="Buy and Sell L$"/> <menu_item_call label="ã〠ãããã£ãŒã«" name="Profile"/> <menu_item_call label="ã〠容姿" name="Appearance"/> <menu_item_check label="ã〠æã¡ç©" name="Inventory"/> @@ -271,7 +271,7 @@ <menu_item_check label="ãã¯ã¹ãã£ã¢ãã©ã¹" name="Texture Atlas"/> <menu_item_check label="è£
çãããå
æºãæç»ãã" name="Render Attached Lights"/> <menu_item_check label="åãä»ããããããŒãã£ã¯ã«ãæç»ãã" name="Render Attached Particles"/> - <menu_item_check label="Hover Glow Objects" name="Hover Glow Objects"/> + <menu_item_check label="ããŠã¹ãªãŒããŒã§åŒ·èª¿è¡šç€º" name="Hover Glow Objects"/> </menu> <menu label="ãããã¯ãŒã¯" name="Network"> <menu_item_check label="ãšãŒãžã§ã³ããäžæåæ¢" name="AgentPause"/> diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index 58109e57f7..f4c46f82ac 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/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,16 +41,17 @@ <form> <button name="Yes" text="$yestext"/> <button name="No" text="$notext"/> + <button name="Cancel_yesnocancelbuttons" text="$canceltext"/> </form> </template> <notification functor="GenericAcknowledge" label="äžæã®éç¥ã¡ãã»ãŒãž" name="MissingAlert"> ããªãã® [APP_NAME] ã®ããŒãžã§ã³ã§ã¯ä»åãåã£ãéç¥ã¡ãã»ãŒãžã衚瀺ããããšãã§ããŸããã ææ°ãã¥ãŒã¯ãã€ã³ã¹ããŒã«ãããŠãããã確èªãã ããã -ãšã©ãŒè©³çŽ°ïŒ ã[_NAME]ããšããéç¥ã¯ notifications.xml ã«ãããŸããã§ããã +ãšã©ãŒè©³çŽ°ïŒ ã [_NAME] ããšããéç¥ã¯ notifications.xml ã«ãããŸããã§ããã <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="FloaterNotFound"> - ãããŒã¿ã»ãšã©ãŒïŒäžèšã®ã³ã³ãããŒã«ãèŠã€ãããŸããã§ããïŒ + ãããŒã¿ãšã©ãŒïŒäžèšã®ã³ã³ãããŒã«ãèŠã€ãããŸããã§ããïŒ [CONTROLS] <usetemplate name="okbutton" yestext="OK"/> </notification> @@ -69,31 +81,36 @@ <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="WearableSave"> - çŸåšã®è¡£æ/ããã£ãŒããŒãã®å€æŽãä¿åããŸããïŒ + çŸåšã®è¡£é¡ã身äœéšäœã®å€æŽãä¿åããŸããïŒ <usetemplate canceltext="ãã£ã³ã»ã«" name="yesnocancelbuttons" notext="ä¿åããªã" yestext="ä¿å"/> </notification> <notification name="CompileQueueSaveText"> - 次ã®çç±ã§ãã¹ã¯ãªããçšããã¹ãã®ã¢ããããŒãæã«åé¡ãèµ·ãããŸããã [REASON] åŸã§ããäžåºŠè©ŠããŠãã ããã + 次ã®çç±ã§ãã¹ã¯ãªããçšããã¹ãã®ã¢ããããŒãæã«åé¡ãèµ·ãããŸããã +[REASON] +åŸã§ããäžåºŠãè©Šããã ããã </notification> <notification name="CompileQueueSaveBytecode"> - 次ã®çç±ã§ãã³ã³ãã€ã«ããã¹ã¯ãªããã®ã¢ããããŒãæã«åé¡ãèµ·ãããŸããã [REASON]åŸã§ããäžåºŠè©ŠããŠãã ããã + 次ã®çç±ã§ãã³ã³ãã€ã«ããã¹ã¯ãªããã®ã¢ããããŒãæã«åé¡ãèµ·ãããŸããã +[REASON] +åŸã§ããäžåºŠãè©Šããã ããã </notification> <notification name="WriteAnimationFail"> ã¢ãã¡ãŒã·ã§ã³ããŒã¿ã®æžã蟌ã¿ã«åé¡ããããŸããåŸã§ããäžåºŠãè©Šããã ããã </notification> <notification name="UploadAuctionSnapshotFail"> - 次ã®çç±ã§ããªãŒã¯ã·ã§ã³ã®ã¹ãããã·ã§ããã®ã¢ããããŒãæã«åé¡ãèµ·ãããŸããã [REASON] + 次ã®çç±ã§ããªãŒã¯ã·ã§ã³ã®ã¹ãããã·ã§ããã®ã¢ããããŒãæã«åé¡ãèµ·ãããŸããã +[REASON] </notification> <notification name="UnableToViewContentsMoreThanOne"> - äžåºŠã«è€æ°ã®ã¢ã€ãã ã®ã³ã³ãã³ãã¯è¡šç€ºã§ããŸããã -éžæããã¢ã€ãã ã1ã€ã ãã«ããŠãããäžåºŠè©ŠããŠãã ããã + äžåºŠã«è€æ°ã®ã¢ã€ãã ã®äžèº«ã衚瀺ã§ããŸããã +ã¢ã€ãã ã 1 ã€ã ãéžæããŠãããäžåºŠãè©Šããã ããã </notification> <notification name="SaveClothingBodyChanges"> - è¡£æïŒèº«äœéšäœã«å¯Ÿããå€æŽããã¹ãŠä¿åããŸããïŒ + è¡£æã身äœéšäœã«å¯Ÿããå€æŽããã¹ãŠä¿åããŸããïŒ <usetemplate canceltext="åãæ¶ã" name="yesnocancelbuttons" notext="ä¿åããªã" yestext="ãã¹ãŠä¿å"/> </notification> <notification name="FriendsAndGroupsOnly"> - ãã¬ã³ã以å€ã®äººããã®ã³ãŒã«ããã€ã³ã¹ã¿ã³ãã¡ãã»ãŒãžãç¡èŠããèšå®ã«ããããšããçžæã«ç¥ãããããšã¯ãããŸããã + ãã¬ã³ã以å€ããã®ã³ãŒã«ãã€ã³ã¹ã¿ã³ãã¡ãã»ãŒãžãç¡èŠããèšå®ã«ããããšããçžæã«ç¥ãããããšã¯ãããŸããã <usetemplate name="okbutton" yestext="ã¯ã"/> </notification> <notification name="GrantModifyRights"> @@ -107,7 +124,7 @@ <usetemplate name="okcancelbuttons" notext="ããã" yestext="ã¯ã"/> </notification> <notification name="RevokeModifyRights"> - [FIRST_NAME] [LAST_NAME]ã«å¯ŸããŠå€æŽæš©éãåãæ¶ããŸããïŒ + [FIRST_NAME] [LAST_NAME] ã«å¯ŸããŠå€æŽæš©éãåãæ¶ããŸããïŒ <usetemplate name="okcancelbuttons" notext="ããã" yestext="ã¯ã"/> </notification> <notification name="RevokeModifyRightsMultiple"> @@ -129,28 +146,27 @@ <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AddGroupOwnerWarning"> - ããªã㯠[ROLE_NAME]ã®åœ¹å²ã«ã¡ã³ããŒãäžããããšããŠããŸãã + ããªã㯠[ROLE_NAME] ã®åœ¹å²ã«ã¡ã³ããŒãäžããããšããŠããŸãã ä»»åœãããã¡ã³ããŒãèªãéä»»ããªãéãã -圌ãã圹æããåé€ã§ããŸããã +圹æããåé€ã§ããŸããã æäœãç¶è¡ããŸããïŒ - <usetemplate ignoretext="ã°ã«ãŒããªãŒããŒãæ°ããè¿œå ããåã«ç¢ºèª" name="okcancelignore" notext="ããã" yestext="ã¯ã"/> + <usetemplate ignoretext="ã°ã«ãŒããªãŒããŒãæ°ããè¿œå ããåã®ç¢ºèª" name="okcancelignore" notext="ããã" yestext="ã¯ã"/> </notification> <notification name="AssignDangerousActionWarning"> - ããªãã¯[ROLE_NAME]ã« [ACTION_NAME]ã®èœåã + ããªã㯠[ROLE_NAME] ã« [ACTION_NAME] ã®èœåã äžããããšããŠããŸãã *èŠå* ãã®èœåãæã€åœ¹å²ã®ã¡ã³ããŒã¯ã èªåãšä»ã®ã¡ã³ããŒã«çŸåšãã匷åãªæš©éãå²ãåœãŠã -èªåããªãŒããŒãšã»ãŒåæ§ã®ç«å Žã« -ä»»åœããããšãã§ããããã«ãªããŸãã ãã®è¡çºã®æå³ãããç解ããŠãã -å®è¡ããŠãã ããã +èªåããªãŒããŒãšã»ãŒåæ§ã®ç«å Žã«ä»»åœããããšãã§ããããã«ãªããŸãã +ãã®è¡çºã®æå³ãããç解ããŠããå®è¡ããŠãã ããã -ãã®èœåã[ROLE_NAME]ã«å²ãåœãŠãŸããïŒ +ãã®èœåã [ROLE_NAME] ã«å²ãåœãŠãŸããïŒ <usetemplate name="okcancelbuttons" notext="ããã" yestext="ã¯ã"/> </notification> <notification name="AssignDangerousAbilityWarning"> - ããªãã¯[ROLE_NAME]ã« [ACTION_NAME]ã®èœåã + ããªã㯠[ROLE_NAME] ã« [ACTION_NAME] ã®èœåã äžããããšããŠããŸãã *èŠå* @@ -158,16 +174,16 @@ èªåãšä»ã®ã¡ã³ããŒã«ãã¹ãŠã®èœåãå²ãåœãŠã èªåããªãŒããŒãšã»ãŒåæ§ã®ç«å Žã«ä»»åœã§ããŸãã -ãã®èœåã[ROLE_NAME]ã«å²ãåœãŠãŸããïŒ +ãã®èœåã [ROLE_NAME] ã«å²ãåœãŠãŸããïŒ <usetemplate name="okcancelbuttons" notext="ããã" yestext="ã¯ã"/> </notification> <notification name="AttachmentDrop"> ã¢ã¿ããã¡ã³ããäžã«çœ®ãããšããŠããŸãã ç¶ããŸããïŒ - <usetemplate ignoretext="ã¢ã¿ããã¡ã³ããäžã«èœãšãåã«ç¢ºèªãã" name="okcancelignore" notext="ããã" yestext="ã¯ã"/> + <usetemplate ignoretext="ã¢ã¿ããã¡ã³ããäžã«èœãšãåã®ç¢ºèª" name="okcancelignore" notext="ããã" yestext="ã¯ã"/> </notification> <notification name="JoinGroupCanAfford"> - ãã®ã°ã«ãŒãã«åå ããã«ã¯ãL$[COST]ããããŸãã + ãã®ã°ã«ãŒãã«åå ããã«ã¯ãL$ [COST] ããããŸãã ç¶è¡ããŸããïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="åå "/> </notification> @@ -177,80 +193,80 @@ <usetemplate name="okcancelbuttons" notext="ãã£ã³ã»ã«" yestext="åå "/> </notification> <notification name="JoinGroupCannotAfford"> - ãã®ã°ã«ãŒãã«å å
¥ããã«ã¯ãL$[COST]å¿
èŠã§ãã -L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ããŸããã + ãã®ã°ã«ãŒãã«å å
¥ããã«ã¯ãL$ [COST] å¿
èŠã§ãã +L$ ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ããŸããã </notification> <notification name="CreateGroupCost"> - ãã®ã°ã«ãŒããäœãã«ã¯ L$100 ããããŸãã + ãã®ã°ã«ãŒããäœãã«ã¯ L$ 100 ããããŸãã äžäººã§ã¯ã°ã«ãŒãã«ãªããªãã®ã§ãæ°žä¹
ã«åé€ãããŠããŸããŸãã 48 æé以å
ã«ã¡ã³ããŒãå§èªããå
¥äŒããŠããã£ãŠãã ããã <usetemplate canceltext="ãã£ã³ã»ã«" name="okcancelbuttons" notext="ãã£ã³ã»ã«" yestext="L$100 ã§ã°ã«ãŒããäœæ"/> </notification> <notification name="LandBuyPass"> - L$[COST]㧠[TIME]æéãã®åå°[PARCEL_NAME]ã«å
¥ãããšãã§ããŸãã + L$ [COST] 㧠[TIME] æé [PARCEL_NAME] ã«å
¥ãããšãã§ããŸãã å
¥å Žèš±å¯ã賌å
¥ããŸããïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="SalePriceRestriction"> äžç¹å®ã®äººã«å£²åŽããå Žåã«ã¯ã -売åŽäŸ¡æ Œã¯L$0以äžã«èšå®ããå¿
èŠããããŸãã -売åŽäŸ¡æ ŒãL$0ã«èšå®ããå Žåã¯ã +売åŽäŸ¡æ Œã¯L$ 0 以äžã«èšå®ããå¿
èŠããããŸãã +売åŽäŸ¡æ ŒãL$ 0 ã«èšå®ããå Žåã¯ã 売åŽããå人ãéžæããŠãã ããã </notification> <notification name="ConfirmLandSaleChange"> - éžæããã[LAND_SIZE]å¹³æ¹ã¡ãŒãã«ã®åå°ã¯ã売ãåºãäžã«èšå®ãããŠããŸãã -売åŽäŸ¡æ ŒL$[SALE_PRICE]ã§ã[NAME]ã«å£²åŽãèªå¯ããŸãã + éžæãã [LAND_SIZE] å¹³æ¹ã¡ãŒãã«ã®åå°ã¯ã売ãåºãäžã«èšå®ãããŠããŸãã +売åŽäŸ¡æ Œ L$ [SALE_PRICE] ã§ã[NAME] ã«å£²åŽãèªå¯ããŸãã <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="ConfirmLandSaleToAnyoneChange"> 泚æïŒ ã誰ã«ã§ã販売ããã¯ãªãã¯ããããšã§ãããªãã®åå°ã¯ãã®ãªãŒãžã§ã³ã«ãã人ã«éãã [SECOND_LIFE] ã³ãã¥ããã£å
šäœã§å©çšå¯èœãšãªããŸãã éžæãã [LAND_SIZE] å¹³æ¹ã¡ãŒãã«ã®åå°ã¯ã販売察象ã«èšå®ãããŸããã -è²©å£²äŸ¡æ Œ L$[SALE_PRICE] ã§ã[NAME] ã販売察象è
ãšãªããŸãã +è²©å£²äŸ¡æ Œ L$ [SALE_PRICE] ã§ã[NAME] ã販売察象è
ãšãªããŸãã <usetemplate name="okcancelbuttons" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="ReturnObjectsDeededToGroup"> - ãã®åºç»ã®ã°ã«ãŒã[NAME]å
±æã®ãã¹ãŠã®ãªããžã§ã¯ããã以åã®ãªãŒããŒã®æã¡ç©ã«æ»ãããšããŠããŸãã + ãã®åºç»ã®ã°ã«ãŒã [NAME] å
±æã®ãã¹ãŠã®ãªããžã§ã¯ããã以åã®ææè
ã®ãæã¡ç©ãã«æ»ãããšããŠããŸãã æäœãç¶è¡ããŸããïŒ *èŠå* ããã«ããã -ã°ã«ãŒãã«è²æž¡ãããè²æž¡äžå¯èœãªãªããžã§ã¯ãã¯åé€ãããŸãïŒ +ã°ã«ãŒãã«è²æž¡ããããå販ã»ãã¬ãŒã³ãäžå¯ãã®ãªããžã§ã¯ãã¯åé€ãããŸãïŒ ãªããžã§ã¯ãïŒ [N] <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="ReturnObjectsOwnedByUser"> ãã®åºç»ã§ã -äœäºº[NAME]ãææããå
šãŠã®ãªããžã§ã¯ãã -圌ãã®æã¡ç©ã«æ¬åœã«è¿åŽããŠãããã§ããïŒ +äœäºº [NAME] ãææããå
šãŠã®ãªããžã§ã¯ãã +æ¬äººã®ãæã¡ç©ãã«æ¬åœã«è¿åŽããŠãããã§ããïŒ ãªããžã§ã¯ãïŒ [N] <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="ReturnObjectsOwnedBySelf"> ãã®åå°åºç»å
ã«ãããããªããææãããã¹ãŠã®ãªããžã§ã¯ããã -ããªãã®æã¡ç©ã«æ»ãããšããŠããŸããæäœãç¶è¡ããŸããïŒ +ããªãã®ãæã¡ç©ãã«æ»ãããšããŠããŸããç¶ããŸããïŒ ãªããžã§ã¯ãïŒ [N] <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="ReturnObjectsNotOwnedBySelf"> ãã®åå°åºç»å
ã«ãããããªã以å€ãææãããã¹ãŠã®ãªããžã§ã¯ããã -ããããã®ãªãŒããŒã®æã¡ç©ã«æ»ãããšããŠããŸãã +ããããã®ææè
ã®ãæã¡ç©ãã«æ»ãããšããŠããŸãã æäœãç¶è¡ããŸããïŒ -ã°ã«ãŒãã«è²æž¡ãããè²æž¡å¯èœãªããžã§ã¯ãã¯ã以åã®ãªãŒããŒã«è¿åŽãããŸãã +ã°ã«ãŒãã«è²æž¡ããããå販ã»ãã¬ãŒã³ãå¯ãã®ãªããžã§ã¯ãã¯ã以åã®ææè
ã«è¿åŽãããŸãã *èŠå* ããã«ããã -ã°ã«ãŒãã«è²æž¡ãããè²æž¡äžå¯èœãªãªããžã§ã¯ãã¯åé€ãããŸãïŒ +ã°ã«ãŒãã«è²æž¡ããããå販ã»ãã¬ãŒã³ãäžå¯ãã®ãªããžã§ã¯ãã¯åé€ãããŸãïŒ ãªããžã§ã¯ãïŒ [N] <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="ReturnObjectsNotOwnedByUser"> ãã®åå°åºç»å
ã«ããã -[NAME]以å€ã«ããææã®ãªããžã§ã¯ãããã¹ãŠããããã®ãªãŒããŒã®æã¡ç©ã«è¿åŽããããšããŠããŸãã -æäœãç¶è¡ããŸããïŒã°ã«ãŒãã«è²æž¡ãããè²æž¡å¯èœãªããžã§ã¯ãã¯ã以åã®ãªãŒããŒã«è¿åŽãããŸãã +[NAME]以å€ã«ããææã®ãªããžã§ã¯ãããã¹ãŠããããã®ææè
ã®ãæã¡ç©ãã«è¿åŽããããšããŠããŸãã +æäœãç¶è¡ããŸããïŒã°ã«ãŒãã«è²æž¡ããããå販ã»ãã¬ãŒã³ãå¯ãã®ãªããžã§ã¯ãã¯ã以åã®ææè
ã«è¿åŽãããŸãã *èŠå* ããã«ããã -ã°ã«ãŒãã«è²æž¡ãããè²æž¡äžå¯èœãªãªããžã§ã¯ãã¯åé€ãããŸãïŒ +ã°ã«ãŒãã«è²æž¡ããããå販ã»ãã¬ãŒã³ãäžå¯ãã®ãªããžã§ã¯ãã¯åé€ãããŸãïŒ ãªããžã§ã¯ãïŒ [N] <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> @@ -259,43 +275,42 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠<usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="DisableAllTopObjects"> - ãã®å°åå
ã®ãã¹ãŠã®ãªããžã§ã¯ããç¡å¹ã«ããããšããŠããŸããæäœãç¶è¡ããŸããïŒ + ãã®ãªãŒãžã§ã³ïŒå°åïŒå
ã®ãã¹ãŠã®ãªããžã§ã¯ããç¡å¹ã«ããããšããŠããŸããæäœãç¶è¡ããŸããïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="ReturnObjectsNotOwnedByGroup"> - ãã®åå°ã®åºç»äžã®ãªããžã§ã¯ãã®ãã¡ãã°ã«ãŒã[NAME] -ãšã®éã§å
±æããŠããªããªããžã§ã¯ãããªãŒããŒã«è¿åŽããŸããïŒ + ãã®åå°ã®åºç»äžã®ãªããžã§ã¯ãã®ãã¡ãã°ã«ãŒã [NAME] ãšã®éã§å
±æããŠããªããªããžã§ã¯ããææè
ã«è¿åŽããŸããïŒ ãªããžã§ã¯ãïŒ [N] <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="UnableToDisableOutsideScripts"> ã¹ã¯ãªãããç¡å¹ã«ã§ããŸããã -ãã®å°åå
šäœãããã¡ãŒãžæå¹ãã«èšå®ãããŠããŸãã +ãã®ãªãŒãžã§ã³ïŒå°åïŒå
šäœãããã¡ãŒãžæå¹ãã«èšå®ãããŠããŸãã æŠåšã䜿çšããã«ã¯ã¹ã¯ãªããã®å®è¡ãèš±å¯ããå¿
èŠããããŸãã </notification> <notification name="MultipleFacesSelected"> çŸåšè€æ°ã®é¢ãéžæãããŠããŸãã ãã®ãŸãŸç¶ããå Žåãã¡ãã£ã¢ã®å¥ã
ã®ã€ã³ã¹ã¿ã³ã¹ããªããžã§ã¯ãã®è€æ°ã®é¢ã«èšå®ãããŸãã ã¡ãã£ã¢ã 1 ã€ã®é¢ã ãã«åãä»ããã«ã¯ããé¢ãéžæããéžãã§ãªããžã§ã¯ãã®åžæããé¢ãã¯ãªãã¯ããããããè¿œå ããã¯ãªãã¯ããŠãã ããã - <usetemplate ignoretext="ã¡ãã£ã¢ã¯éžæããè€æ°ã®é¢ã«ã»ãããããŸãã" name="okcancelignore" notext="ãã£ã³ã»ã«" yestext="OK"/> + <usetemplate ignoretext="ã¡ãã£ã¢ãéžæããè€æ°ã®é¢ã«ã»ããããããšã" name="okcancelignore" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="MustBeInParcel"> çå°ç¹ãèšå®ããã«ã¯ããã®åºç»ã®å
åŽã« ç«ã£ãŠãã ããã </notification> <notification name="PromptRecipientEmail"> - åä¿¡è
ã®æå¹ãªEã¡ãŒã«ã¢ãã¬ã¹ãå
¥åããŠãã ããã + åä¿¡è
ã®æå¹ãªã¡ãŒã«ã¢ãã¬ã¹ãå
¥åããŠãã ããã </notification> <notification name="PromptSelfEmail"> - ããªãã®Eã¡ãŒã«ã»ã¢ãã¬ã¹ãå
¥åããŠãã ããã + ããªãã®ã¡ãŒã«ã¢ãã¬ã¹ãå
¥åããŠãã ããã </notification> <notification name="PromptMissingSubjMsg"> ããã©ã«ãã®ä»¶åãŸãã¯ã¡ãã»ãŒãžãä»ããŠãã¹ãããã·ã§ãããéä¿¡ããŸããïŒ <usetemplate name="okcancelbuttons" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="ErrorProcessingSnapshot"> - ã¹ãããã·ã§ããã»ããŒã¿ã®åŠçãšã©ãŒ + ã¹ãããã·ã§ããããŒã¿ã®åŠçãšã©ãŒ </notification> <notification name="ErrorEncodingSnapshot"> ã¹ãããã·ã§ããã®ãšã³ã³ãŒãåã§ãšã©ãŒãåºãŸããïŒ @@ -310,11 +325,11 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠[SECOND_LIFE] ãžã®ãã°ã€ã³ãç¶ããã«ã¯ãå©çšèŠçŽã«åæããŠãã ããã </notification> <notification name="CouldNotPutOnOutfit"> - æè£
ãè£
çã§ããŸããã -æè£
ãã©ã«ãã«è¡£æã身äœéšäœãä»å±åããããŸããã + ã¢ãŠããã£ãããè£
çã§ããŸããã +ã¢ãŠããã£ãããã©ã«ãã«è¡£é¡ã身äœéšäœãã¢ã¿ããã¡ã³ãããããŸããã </notification> <notification name="CannotWearTrash"> - ãŽãç®±ã«ããæãããã£ãŒããŒãã®ççšã¯ã§ããŸããã + ãã¿ç®±ã«ããè¡£é¡ã身äœéšäœã®ççšã¯ã§ããŸããã </notification> <notification name="MaxAttachmentsOnOutfit"> ãªããžã§ã¯ããä»ããããŸããã§ããã @@ -341,17 +356,17 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠<usetemplate ignoretext="æ°èŠã¯ã©ã·ãã¡ã€ãåºåäœææ¹æ³" name="okcancelignore" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="DeleteClassified"> - ã¯ã©ã·ãã¡ã€ãåºå[NAME]ã®åé€ãããŸããïŒ + ã¯ã©ã·ãã¡ã€ãåºå [NAME] ãåé€ããŸããïŒ æ¯æãæžã¿ã®æéã¯è¿éãããŸããã <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="DeleteMedia"> ãã®é¢ã«ããã¡ãã£ã¢ãåé€ããéžæãããŸããã ç¶ããŸããïŒ - <usetemplate ignoretext="ãªããžã§ã¯ãããã¡ãã£ã¢ãåé€ããåã«ç¢ºèªãã" name="okcancelignore" notext="ããã" yestext="ã¯ã"/> + <usetemplate ignoretext="ãªããžã§ã¯ãããã¡ãã£ã¢ãåé€ããåã®ç¢ºèª" name="okcancelignore" notext="ããã" yestext="ã¯ã"/> </notification> <notification name="ClassifiedSave"> - ã¯ã©ã·ãã¡ã€ãåºå[NAME]ãžã®å€æŽãä¿åããŸããïŒ + ã¯ã©ã·ãã¡ã€ãåºå [NAME] ãžã®å€æŽãä¿åããŸããïŒ <usetemplate canceltext="ãã£ã³ã»ã«" name="yesnocancelbuttons" notext="ä¿åããªã" yestext="ä¿å"/> </notification> <notification name="ClassifiedInsufficientFunds"> @@ -359,11 +374,11 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠<usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="DeleteAvatarPick"> - ããã¯[PICK]ãåé€ããŸããïŒ + ããã¯ã [PICK] ããåé€ããŸããïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="PromptGoToEventsPage"> - [SECOND_LIFE]ã€ãã³ãã»ãŠã§ãã»ããŒãžã«ç§»åããŸããïŒ + [SECOND_LIFE] ã€ãã³ã Web ããŒãžã«ç§»åããŸããïŒ <url name="url"> http://secondlife.com/events/?lang=ja-JP </url> @@ -389,7 +404,7 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠æ°ããã¹ãã³ã¯ [APP_NAME] ãåèµ·ååŸã«è¡šç€ºãããŸãã </notification> <notification name="GoToAuctionPage"> - [SECOND_LIFE]ãŠã§ãã»ããŒãžã«ç§»åãã å
¥æãããã¯ãªãŒã¯ã·ã§ã³ã®è©³çŽ°ã確èªããŸããïŒ + [SECOND_LIFE]ã® Web ããŒãžã«ç§»åããå
¥æãããã¯ãªãŒã¯ã·ã§ã³ã®è©³çŽ°ã確èªããŸããïŒ <url name="url"> http://secondlife.com/auctions/auction-detail.php?id=[AUCTION_ID] </url> @@ -439,7 +454,7 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠</notification> <notification name="StartRegionEmpty"> ãã°ã€ã³äœçœ®ãæå®ãããŠããŸããã -ãã°ã€ã³äœçœ®ã®æ¬ã«ãªãŒãžã§ã³åãå
¥åãããããæåŸã«ãã°ã¢ãŠãããå Žæãããèªå®
ïŒããŒã ïŒããéžæããŠãã ããã +ãã°ã€ã³äœçœ®ã®æ¬ã«ãªãŒãžã§ã³åãå
¥åãããããæåŸã«ãã°ã¢ãŠãããå ŽæãããããŒã ããéžæããŠãã ããã <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CouldNotStartStopScript"> @@ -450,7 +465,7 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠ãã¡ã€ã«ãããŠã³ããŒãã§ããŸããã </notification> <notification name="CannotWriteFile"> - ãã¡ã€ã«[[FILE]]ãæžã蟌ããŸããã + ãã¡ã€ã« [[FILE]] ãæžã蟌ããŸããã </notification> <notification name="UnsupportedHardware"> ã䜿ãã®ã³ã³ãã¥ãŒã¿ãŒã¯ [APP_NAME] ã®å¿
èŠæäœéã®åäœç°å¢ãæºãããŠããŸããã ããã©ãŒãã³ã¹ã®äœäžãæãããããããŸããã æãå
¥ããŸãã [SUPPORT_SITE] ã§ã¯ãµããŒã察象å€ã®ã·ã¹ãã ã«é¢ããæè¡çãµããŒãã¯è¡ã£ãŠãããŸããã @@ -460,30 +475,28 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠<url name="url" option="0"> http://secondlife.com/support/sysreqs.php?lang=ja </url> - <usetemplate ignoretext="䜿çšããŠããã³ã³ãã¥ãŒã¿ãŒã®ããŒããŠã§ã¢ããµããŒããããŠããŸãã" name="okcancelignore" notext="ããã" yestext="ã¯ã"/> + <usetemplate ignoretext="䜿çšäžã®ã³ã³ãã¥ãŒã¿ãŒã®ããŒããŠã§ã¢ããµããŒããããŠããªããšã" name="okcancelignore" notext="ããã" yestext="ã¯ã"/> </notification> <notification name="UnknownGPU"> ã䜿ãã®ã·ã¹ãã ã«ã¯ã[APP_NAME] ãèªèã§ããªãã°ã©ãã£ãã¯ã«ãŒããæèŒãããŠããŸãã [APP_NAME] ã§ãŸã ãã¹ããããŠããªãææ°ããŒããŠã§ã¢ã®ããã ãšèããããŸãã åé¡ãªããšã¯æããŸãããã°ã©ãã£ãã¯ã®èšå®ã調æŽããå¿
èŠããããããããŸããã ïŒããŒ ïŒ ç°å¢èšå® ïŒ ã°ã©ãã£ãã¯ïŒ <form name="form"> - <ignore name="ignore" text="䜿çšäžã®ã°ã©ããã¯ã«ãŒããèªèãããŸããã§ãã"/> + <ignore name="ignore" text="䜿çšäžã®ã°ã©ããã¯ã«ãŒããèªèãããªããšã"/> </form> </notification> <notification name="DisplaySettingsNoShaders"> ã°ã©ãã£ãã¯ãã©ã€ããåæåäžã« [APP_NAME] ãã¯ã©ãã·ã¥ããŸããã -ãã©ã€ãã®äžè¬çãªãšã©ãŒãé²ãããã«ãã°ã©ãã£ãã¯ã®ã¯ãªãªãã£ãäœã«èšå®ãããŸãã ãã®ãããäžéšã®ã°ã©ãã£ãã¯ç¹æ§ã«å¶éãåºãŸãã +ãã©ã€ãã®äžè¬çãªãšã©ãŒãé²ãããã«ãç»è³ªãäœã«èšå®ãããŸãã ãã®ãããäžéšã®ã°ã©ãã£ãã¯ç¹æ§ã«å¶éãåºãŸãã ã䜿ãã®ã°ã©ãã£ãã¯ã«ãŒãã®ãã©ã€ããã¢ããããŒãããããããããããŸãã -ã°ã©ãã£ãã¯ã®ã¯ãªãªãã£ã¯ãç°å¢èšå® ïŒ ã°ã©ãã£ã㯠ã§èšå®ã§ããŸãã +ç»è³ªã¯ãç°å¢èšå® ïŒ ã°ã©ãã£ã㯠ã§èšå®ã§ããŸãã </notification> <notification name="RegionNoTerraforming"> - ãã®å°å[REGION] ã¯ããã©ãã©ãŒãã³ã°ãã§ããŸããã + [REGION] ã§ã¯ãå°åœ¢ã®å€æŽãã§ããŸããã </notification> <notification name="CannotCopyWarning"> - ããªãã¯ãã®ã¢ã€ãã ã®ã³ããŒã -èš±ãããŠããªãã®ã§ã人ã«ããããš -æã¡ç©ãã倱ãããŸãã æ¬åœã« -ãããããããã§ããïŒ + ããªãã¯ãã®ã¢ã€ãã ã®ã³ããŒãèš±ãããŠããªãã®ã§ã人ã«ããããšãæã¡ç©ããããªããªããŸãã +æ¬åœã«ãããæž¡ããŸããïŒ <usetemplate name="okcancelbuttons" notext="ããã" yestext="ã¯ã"/> </notification> <notification name="CannotGiveItem"> @@ -493,34 +506,32 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠ååŒããã£ã³ã»ã«ãããŸããã </notification> <notification name="TooManyItems"> - äžåºŠã®ã€ã³ãã³ããªäº€æã§ã42以äžã®ã¢ã€ãã ã¯éããŸããã + äžåºŠã« 42 å以äžã®ã¢ã€ãã ã¯æž¡ããŸããã </notification> <notification name="NoItems"> - éžæããã¢ã€ãã ãè²æž¡ã§ããæš©éããããŸããã + éžæããã¢ã€ãã ãæž¡ãæš©éããããŸããã </notification> <notification name="CannotCopyCountItems"> - ããªãã¯éžæããã¢ã€ãã ã®[COUNT]ã®ã³ããŒã -èš±ãããŠããŸããã -ãããã®ã¢ã€ãã ã¯ããªãã®æã¡ç©ãã倱ãããŸãã -æ¬åœã«ã¢ã€ãã ãããããã§ããïŒ + ããªãã¯éžæãã [COUNT] åã®ã¢ã€ãã ã®ã®ã³ããŒãèš±ãããŠããŸããã +ãããã®ã¢ã€ãã ã¯ããªãã®ãæã¡ç©ããã倱ãããŸãã +æ¬åœã«ã¢ã€ãã ãæž¡ãããã§ããïŒ <usetemplate name="okcancelbuttons" notext="ããã" yestext="ã¯ã"/> </notification> <notification name="CannotGiveCategory"> - éžæãããã©ã«ããè²æž¡ã§ããæš©éããããŸãã + éžæãããã©ã«ããæž¡ãæš©éããããŸãã </notification> <notification name="FreezeAvatar"> ãã®ã¢ãã¿ãŒãããªãŒãºããŸããïŒ -ã¢ãã¿ãŒã¯äžæçã«åããªããªãã -ãã£ãããªã©ããã®äžçã«å¯Ÿããé¢ãããæã€ããšãã§ããªããªããŸãã - <usetemplate canceltext="åãæ¶ã" name="yesnocancelbuttons" notext="解å" yestext="ããªãŒãº"/> +ã¢ãã¿ãŒã¯äžæçã«åããªããªãããã£ãããå«ãã€ã³ã¯ãŒã«ãã§äœãã§ããªããªããŸãã + <usetemplate canceltext="åãæ¶ã" name="yesnocancelbuttons" notext="解é€" yestext="ããªãŒãº"/> </notification> <notification name="FreezeAvatarFullname"> [AVATAR_NAME]ãããªãŒãºããŸããïŒ ããªãŒãºããã人ã¯äžæçã«åããªããªãããã£ãããªã©ããã®äžçã«å¯Ÿããé¢ãããæã€ããšãã§ããªããªããŸãã - <usetemplate canceltext="ãã£ã³ã»ã«" name="yesnocancelbuttons" notext="解å" yestext="ããªãŒãº"/> + <usetemplate canceltext="ãã£ã³ã»ã«" name="yesnocancelbuttons" notext="解é€" yestext="ããªãŒãº"/> </notification> <notification name="EjectAvatarFullname"> - ããªãã®åå°ãã[AVATAR_NAME]ãè¿œæŸããŸããïŒ + ããªãã®åå°ãã [AVATAR_NAME] ãè¿œæŸããŸããïŒ <usetemplate canceltext="ãã£ã³ã»ã«" name="yesnocancelbuttons" notext="è¿œæŸãšçŠæ¢" yestext="è¿œæŸ"/> </notification> <notification name="EjectAvatarNoBan"> @@ -539,9 +550,8 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠</notification> <notification name="AcquireErrorObjectSpan"> ååŸãšã©ãŒïŒ -ãªããžã§ã¯ããè€æ°ã®å°åã«ãŸããã£ãŠååšããŠããŸãã -ååŸãããªããžã§ã¯ãã¯ã -ãã¹ãŠåãå°åå
ã«ç§»åãããŠãã ããã +ãªããžã§ã¯ããè€æ°ã®ãªãŒãžã§ã³ïŒå°åïŒã«ãŸããã£ãŠååšããŠããŸãã +ãã¹ãŠåããªãŒãžã§ã³å
ã«ç§»åãããŠããååŸããŠãã ããã </notification> <notification name="PromptGoToCurrencyPage"> [EXTRA] @@ -553,32 +563,30 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠<usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="UnableToLinkObjects"> - ãããã®[COUNT]ãªããžã§ã¯ãããªã³ã¯ã§ããŸããã -æ倧[MAX]ãªããžã§ã¯ãããªã³ã¯ããããšãã§ããŸãã + [COUNT] åã®ãªããžã§ã¯ãããªã³ã¯ã§ããŸããã +ãªã³ã¯ã§ããã®ã¯æ倧 [MAX] åã§ãã </notification> <notification name="CannotLinkIncompleteSet"> - ã»ãããšããŠæã£ãŠãããªããžã§ã¯ãã®ã¿ãªã³ã¯ã§ããŸããè€æ°ã® -ãªããžã§ã¯ããéžæããŠãã ããã + ã»ããã§æã£ãŠãããªããžã§ã¯ãã®ã¿ãªã³ã¯ã§ããŸãã +è€æ°ã®ãªããžã§ã¯ããéžæããŠãã ããã </notification> <notification name="CannotLinkModify"> - ãã¹ãŠã®ãªããžã§ã¯ãã«å¯Ÿããä¿®æ£èš±å¯ãããªãã«ãªãããã -ãªã³ã¯ã§ããŸããã + ãã¹ãŠã®ãªããžã§ã¯ãã®ä¿®æ£èš±å¯ããªããããªã³ã¯ã§ããŸããã -ãªããžã§ã¯ãããã¹ãŠããã¯ãããŠããããããªãã®ãã®ã§ããããšã確èªããŠãã ããã +ã©ã®ãªããžã§ã¯ããããã¯ãããŠããããããªãã®ãã®ã§ããããšã確èªããŠãã ããã </notification> <notification name="CannotLinkDifferentOwners"> - ææè
ãç°ãªãããããã¹ãŠã®ãªããžã§ã¯ãã -ãªã³ã¯ã§ããŸããã + ææè
ãç°ãªãããããªããžã§ã¯ãããªã³ã¯ã§ããŸããã èªåãææããŠãããªããžã§ã¯ãã ããéžæããŠãã ããã </notification> <notification name="NoFileExtension"> - ãã¡ã€ã«ã[FILE]ãã®æ¡åŒµåãç¡å¹ã§ãã + ã [FILE] ãã®æ¡åŒµåãç¡å¹ã§ãã ãã®ãã¡ã€ã«ã®æ¡åŒµåãæ£ãããã©ããã確èªããŠãã ããã </notification> <notification name="InvalidFileExtension"> - ãã¡ã€ã«æ¡åŒµå[EXTENSION]ã¯ç¡å¹ã§ã + [EXTENSION]ã¯ç¡å¹ã§ãã æ£ããæ¡åŒµåïŒ[VALIDS] <usetemplate name="okbutton" yestext="OK"/> </notification> @@ -587,11 +595,11 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠[FILE] </notification> <notification name="SoundFileNotRIFF"> - ãã¡ã€ã«ãRIFF WAVEãã¡ã€ã«ãšããŠèªèãããŸããïŒ + RIFF WAVE ãã¡ã€ã«ãšããŠèªèãããŸããïŒ [FILE] </notification> <notification name="SoundFileNotPCM"> - ãã¡ã€ã«ãPCM WAVEãªãŒãã£ãªã»ãã¡ã€ã«ãšããŠèªèãããŸããïŒ + PCM WAVE ãªãŒãã£ãªãã¡ã€ã«ãšããŠèªèãããŸããïŒ [FILE] </notification> <notification name="SoundFileInvalidChannelCount"> @@ -599,31 +607,31 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠[FILE] </notification> <notification name="SoundFileInvalidSampleRate"> - ãã¡ã€ã«ã®ãµã³ãã«ã»ã¬ãŒãããµããŒãå€ã§ãïŒ44.1kãæå®ããå¿
èŠããããŸãïŒïŒ + ãã¡ã€ã«ã®ãµã³ãã«ã¬ãŒãããµããŒããããŠããŸããïŒ44.1k ã§ããå¿
èŠããããŸãïŒïŒ [FILE] </notification> <notification name="SoundFileInvalidWordSize"> - ãã¡ã€ã«ã®ã¯ãŒãã»ãµã€ãºããµããŒãå€ã§ãïŒ8ãŸãã¯16ããããæå®ããå¿
èŠããããŸãïŒïŒ + ãã¡ã€ã«ã®ã¯ãŒããµã€ãºããµããŒããããŠããŸããïŒ8 ãŸã㯠16 ãããã§ããå¿
èŠããããŸãïŒïŒ [FILE] </notification> <notification name="SoundFileInvalidHeader"> - WAVããããŒã«ããŒã¿ã»ãã£ã³ã¯ãèŠã€ãããŸããïŒ + WAV ããããŒã«ããŒã¿ãã£ã³ã¯ãèŠã€ãããŸããïŒ [FILE] </notification> <notification name="SoundFileInvalidTooLong"> - ãªãŒãã£ãªã»ãã¡ã€ã«ãé·ãããŸããïŒæ倧10ç§ïŒïŒ + ãªãŒãã£ãªãã¡ã€ã«ãé·ãããŸããïŒæ倧 10 ç§ïŒïŒ [FILE] </notification> <notification name="ProblemWithFile"> - ãã¡ã€ã«[FILE]ã«ãšã©ãŒããããŸãã + ã [FILE] ãã«åé¡ããããŸãã [ERROR] </notification> <notification name="CannotOpenTemporarySoundFile"> - æžã蟌ã¿çšã®äžæå§çž®ãµãŠã³ãã»ãã¡ã€ã«ãéãããšãã§ããŸããïŒ[FILE] + æžã蟌ã¿çšã®äžæå§çž®ãµãŠã³ããã¡ã€ã«ãéãããšãã§ããŸããïŒ[FILE] </notification> <notification name="UnknownVorbisEncodeFailure"> - æªç¥ã®Vorbis æå·åã«å€±æïŒ [FILE] + äžæã® Vorbis ã®ãšã³ã³ãŒãã«å€±æïŒ [FILE] </notification> <notification name="CannotEncodeFile"> 次ã®ãã¡ã€ã«ã®ãšã³ã³ãŒããã§ããŸããïŒ [FILE] @@ -632,65 +640,62 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ããŸ ç ŽæãããªãœãŒã¹ãã¡ã€ã«ïŒ [FILE] </notification> <notification name="UnknownResourceFileVersion"> - æªç¥ã®lindenãªãœãŒã¹ãã¡ã€ã«ã®ããŒãžã§ã³ïŒ [FILE] + äžæã®ãªã³ãã³ãªãœãŒã¹ãã¡ã€ã«ã®ããŒãžã§ã³ïŒ [FILE] </notification> <notification name="UnableToCreateOutputFile"> - æè£
ãã¡ã€ã«ãäœæã§ããŸããïŒ [FILE] + åºåãã¡ã€ã«ãäœæã§ããŸããïŒ [FILE] </notification> <notification name="DoNotSupportBulkAnimationUpload"> çŸåš [APP_NAME] ã§ã¯ãã¢ãã¡ãŒã·ã§ã³ã®äžæ¬ã¢ããããŒãã¯ãµããŒããããŠããŸããã </notification> <notification name="CannotUploadReason"> - 次ã®çç±ã§ã[FILE] ãã¢ããããŒãã§ããŸããïŒ [REASON] + 次ã®çç±ã§ãã [FILE] ããã¢ããããŒãã§ããŸããïŒ [REASON] ããšã§ããäžåºŠè©ŠããŠãã ããã </notification> <notification name="LandmarkCreated"> ã [LANDMARK_NAME] ããã [FOLDER_NAME] ããã©ã«ãã«è¿œå ããŸããã </notification> <notification name="LandmarkAlreadyExists"> - ãã®äœçœ®ã®ã©ã³ãããŒã¯ãæ¢ã«æã£ãŠããŸãã + çŸåšå°ã®ã©ã³ãããŒã¯ãæ¢ã«æã£ãŠããŸãã <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CannotCreateLandmarkNotOwner"> - åå°ã®ææè
ãèš±å¯ããŠããªãããã -ã©ã³ãããŒã¯ãäœæããããšã¯ã§ããŸããã + åå°ã®ææè
ãèš±å¯ããŠããªããããã©ã³ãããŒã¯ãäœæããããšã¯ã§ããŸããã </notification> <notification name="CannotRecompileSelectObjectsNoScripts"> - åç·šéã¯äžå¯èœã§ãã -ã¹ã¯ãªããåããããªããžã§ã¯ããéžæããŠãã ããã + ããªã³ã³ãã€ã«ãã§ããŸããã +ã¹ã¯ãªããã®ãªããžã§ã¯ããéžæããŠãã ããã </notification> <notification name="CannotRecompileSelectObjectsNoPermission"> - ãåç·šéãã¯äžå¯èœã§ãã + ããªã³ã³ãã€ã«ãã§ããŸããã -å€æŽä¿®æ£æš©éã®ãã -ã¹ã¯ãªããåããããªããžã§ã¯ããéžæããŠãã ããã +ä¿®æ£ä¿®æ£æš©éã®ããã¹ã¯ãªããã®ãªããžã§ã¯ããéžæããŠãã ããã </notification> <notification name="CannotResetSelectObjectsNoScripts"> - ãåèšå®ããè¡ãããšãã§ããŸããã + ãåèšå®ããã§ããŸããã -ã¹ã¯ãªããåããããªããžã§ã¯ããéžæããŠãã ããã +ã¹ã¯ãªããã®ãªããžã§ã¯ããéžæããŠãã ããã </notification> <notification name="CannotResetSelectObjectsNoPermission"> - ãåèšå®ããè¡ãããšãã§ããŸããã + ãåèšå®ããã§ããŸããã -å€æŽä¿®æ£æš©éã®ãã -ã¹ã¯ãªããåããããªããžã§ã¯ããéžæããŠãã ããã +ä¿®æ£æš©éã®ããã¹ã¯ãªããã®ãªããžã§ã¯ããéžæããŠãã ããã </notification> <notification name="CannotOpenScriptObjectNoMod"> - ç·šéæš©éã®ãªããªããžã§ã¯ãã®ã¹ã¯ãªãããéãããšã¯ã§ããŸããã + ä¿®æ£æš©éã®ãªããªããžã§ã¯ãã®ã¹ã¯ãªããã¯éãããšã¯ã§ããŸããã </notification> <notification name="CannotSetRunningSelectObjectsNoScripts"> - ã¹ã¯ãªããã®ãå®è¡ãã®èšå®ãã§ããŸããã + ã¹ã¯ãªããã®ãå®è¡ããã§ããŸããã -ã¹ã¯ãªããåããããªããžã§ã¯ããéžæããŠãã ããã +ã¹ã¯ãªããã®ãªããžã§ã¯ããéžæããŠãã ããã </notification> <notification name="CannotSetRunningNotSelectObjectsNoScripts"> - ã¹ã¯ãªããããå®è¡ããªããã«èšå®ã§ããŸããã + ã¹ã¯ãªããããå®è¡ããªããèšå®ã«ã§ããŸããã -ã¹ã¯ãªããåããããªããžã§ã¯ããéžæããŠãã ããã +ã¹ã¯ãªããã®ãªããžã§ã¯ããéžæããŠãã ããã </notification> <notification name="NoFrontmostFloater"> - ä¿åãã¹ãfrontmostãããŒã¿ããããŸããã + ä¿åãã frontmost ãããŒã¿ããããŸããã </notification> <notification name="SeachFilteredOnShortWords"> æå®ããæ€çŽ¢ã¯ãšãªã¯å€æŽãããçãããèªå¥ã¯åãé€ãããŠããŸãã @@ -713,35 +718,35 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠ãã®ã¡ãã»ãŒãžãäœåºŠãåºãå Žåã¯ã[SUPPORT_SITE] ãã確èªãã ããã </notification> <notification name="blocked_tport"> - ç³ãèš³ããããŸããããã¬ããŒãã¯çŸåšããããã¯ãããŠããŸããããå°ãåŸã§ããçŽããŠãã ããã -ããçŽããŠããã¬ããŒãã§ããªãå Žåã¯ããã£ãããã°ã¢ãŠãããå床ãã°ã€ã³ããŠåé¡ã解決ããŠãã ããã + ç³ãèš³ããããŸããããã¬ããŒãã¯çŸåšããããã¯ãããŠããŸãããã°ããããŠããå床ãè©Šããã ããã +ããã§ããã¬ããŒãã§ããªãå Žåã¯ããã°ã¢ãŠããããã°ã€ã³ãçŽããŠåé¡ã解決ããŠãã ããã </notification> <notification name="nolandmark_tport"> - æ®å¿µãªãããã·ã¹ãã ã¯ã©ã³ãããŒã¯ç®çå°ãæ¢ããŸããã§ããã + ç³ãèš³ããããŸãããã©ã³ãããŒã¯ã®ç®çå°ãèŠã€ãããŸããã§ããã </notification> <notification name="timeout_tport"> - ç³ãèš³ããããŸãããã·ã¹ãã ã¯ãã¬ããŒãæ¥ç¶ãå®äºã§ããŸããã§ããã -ããå°ãåŸã§ããçŽããŠãã ããã + ç³ãèš³ããããŸãããã·ã¹ãã ã«ãããã¬ããŒãæ¥ç¶ãå®äºã§ããŸããã§ããã +ãã°ããããŠããå床ãè©Šããã ããã </notification> <notification name="noaccess_tport"> - æ®å¿µãªããããã®ãã¬ããŒãç®çå°ãžã®ã¢ã¯ã»ã¹ããããŸããã + æ®å¿µãªãããç®çå°ãžã¢ã¯ã»ã¹ãèš±å¯ãããŠããªãããããã¬ããŒãã§ããŸããã </notification> <notification name="missing_attach_tport"> - æ·»ä»ç©ã¯ããŸã å°çããŠããŸãããããšæ°ç§éãåŸ
ã¡ããã ããããã£ãããã°ã¢ãŠãããå床ãã°ã€ã³ããŠãããã¬ããŒããããçŽããŠã ããã + æ·»ä»ç©ããŸã å±ããŠããŸããããã¬ããŒããããåã«ããšæ°ç§éãåŸ
ã¡ããã ããããã£ãããã°ã¢ãŠãããå床ãã°ã€ã³ããŠãã ããã </notification> <notification name="too_many_uploads_tport"> - ãã®å°åã®è³ç£ãã¥ãŒãçŸåšèŸŒã¿åã£ãŠããããããã¬ããŒãã»ãªã¯ãšã¹ããæééãã«åŠçããããšãé£ããç¶æ³ã§ãã -æ°ååŸã«ããçŽããããŸãã¯æ··éããŠããªãä»ã®å°åããè©Šããã ããã + ãã®ãªãŒãžã§ã³ã®ã¢ã»ãããã¥ãŒãçŸåšæ··ã¿åã£ãŠããããããã¬ããŒãã®ãªã¯ãšã¹ããããã«åŠçããããšãé£ããç¶æ³ã§ãã +æ°ååŸã«ããçŽãããæ··éããŠããªãä»ã®ãªãŒãžã§ã³ã§ãè©Šããã ããã </notification> <notification name="expired_tport"> - ç³ãèš³ããããŸãããã·ã¹ãã ã¯ãã¬ããŒãã»ãªã¯ãšã¹ããæéã©ããã«å®äºã§ããŸããã§ãããæ°ååŸã«ããçŽããŠãã ããã + ç³ãèš³ããããŸãããã·ã¹ãã ã¯ãã¬ããŒãã®ãªã¯ãšã¹ããæéã©ããã«å®äºã§ããŸããã§ãããæ°ååŸã«ããçŽããŠãã ããã </notification> <notification name="expired_region_handoff"> - ç³ãèš³ããããŸãããã·ã¹ãã ã¯å°åéã®ç§»åãæéã©ããã«å®äºã§ããŸããã§ããã + ç³ãèš³ããããŸãããã·ã¹ãã ã¯ãªãŒãžã§ã³éã®ç§»åãæéã©ããã«å®äºã§ããŸããã§ããã æ°ååŸã«ããçŽããŠãã ããã </notification> <notification name="no_host"> - ãã¬ããŒãç®çå°ãèŠã€ããããŸãããç®çå°ãäžæçã«å©çšã§ããªãç¶æ
ãããŸãã¯ãã§ã«æ¶æ»
ããŠããå¯èœæ§ããããŸããæ°ååŸã«ããçŽããŠãã ããã + ãã¬ããŒãç®çå°ãèŠã€ããããŸãããç®çå°ãäžæçã«å©çšã§ããªãç¶æ
ãããã§ã«æ¶æ»
ããŠããå¯èœæ§ããããŸããæ°ååŸã«ããçŽããŠãã ããã </notification> <notification name="no_inventory_host"> æã¡ç©ã·ã¹ãã ã¯çŸåšå©çšã§ããŸããã @@ -751,9 +756,8 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠åºç»ãéžå®ãããŠããŸããã </notification> <notification name="CannotSetLandOwnerMultipleRegions"> - è€æ°ã®å°åãéžæãããããã -åå°ã®æææš©ãååŸã§ããŸããã -éžæããé¢ç©ãå°ããããŠãããäžåºŠè©ŠããŠãã ããã + è€æ°ã®ãªãŒãžã§ã³ãéžæããããããåå°ã®æææš©ãååŸã§ããŸããã +éžæããé¢ç©ãå°ããããŠãããäžåºŠãè©Šããã ããã </notification> <notification name="ForceOwnerAuctionWarning"> ãã®åºç»ã¯ãªãŒã¯ã·ã§ã³ã«åºãããŠããŸãã æææš©ãå€æŽãããšãªãŒã¯ã·ã§ã³ã¯ãã£ã³ã»ã«ãšãªããæ¢ã«ãªãŒã¯ã·ã§ã³ã«åå ããŠããäœäººãããã°ãã®äººã«è¿·æããããŠããŸããŸãã @@ -769,12 +773,12 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠åå°ãéžæãããŠããŸããã </notification> <notification name="CannotReleaseLandNothingSelected"> - åå°ãç Žæ£ããããšãã§ããŸããïŒ + åå°ãç Žæ£ã§ããŸããïŒ åºç»ãéžå®ãããŠããŸããã </notification> <notification name="CannotReleaseLandNoRegion"> åå°ãç Žæ£ã§ããŸããïŒ -å°åãèŠã€ãããŸããã +ãªãŒãžã§ã³ãèŠã€ãããŸããã </notification> <notification name="CannotBuyLandNothingSelected"> åå°ã賌å
¥ã§ããŸããïŒ @@ -782,7 +786,7 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠</notification> <notification name="CannotBuyLandNoRegion"> åå°ã賌å
¥ã§ããŸããïŒ -ãã®åå°ãããå°åãèŠã€ããããšãã§ããŸãã +ãã®åå°ããããªãŒãžã§ã³ãèŠã€ããããšãã§ããŸãã </notification> <notification name="CannotCloseFloaterBuyLand"> [APP_NAME] ããã®ååŒäŸ¡æ ŒãèŠç©ãããŸã§ã¯ãåå°ã®è³Œå
¥ãŠã£ã³ããŠãéããããšã¯ã§ããŸããã @@ -803,7 +807,7 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠åå°ãè²æž¡ã§ããŸããïŒ è€æ°ã®åºç»ãéžæãããŠããŸãã -ãããã1ã€ã®åºç»ãéžæããŠãã ããã +åºç»ã 1 ã€éžæããŠãã ããã </notification> <notification name="CannotDeedLandWaitingForServer"> åå°ãè²æž¡ã§ããŸããïŒ @@ -813,7 +817,7 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠</notification> <notification name="CannotDeedLandNoTransfer"> åå°ãè²æž¡ã§ããŸããïŒ -ãã®å°å [REGION] ã§ã¯åå°ã®è²æž¡ãèš±ãããŠããŸããã +[REGION] ã§ã¯åå°ã®è²æž¡ãèš±ãããŠããŸããã </notification> <notification name="CannotReleaseLandWatingForServer"> åå°ãç Žæ£ã§ããŸããïŒ @@ -823,9 +827,9 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠</notification> <notification name="CannotReleaseLandSelected"> åå°ãç Žæ£ã§ããŸããïŒ -ããªãã¯ãéžæãããã¹ãŠã®åºç»ãææããŠããŸããã +ããªãã¯ãéžæããåºç»ã®ãã¹ãŠãææããŠããŸããã -1ã€ã®åºç»ãéžæããŠãã ããã +åºç»ã 1 ã€éžæããŠãã ããã </notification> <notification name="CannotReleaseLandDontOwn"> åå°ãç Žæ£ã§ããŸããïŒ @@ -838,7 +842,7 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠</notification> <notification name="CannotReleaseLandNoTransfer"> åå°ãç Žæ£ã§ããŸããïŒ -ãã® [REGION] ã§ã¯åå°ã®è²æž¡ãèš±ãããŠããŸããã +[REGION] ã§ã¯åå°ã®è²æž¡ãèš±ãããŠããŸããã </notification> <notification name="CannotReleaseLandPartialSelection"> åå°ãç Žæ£ã§ããŸããïŒ @@ -847,9 +851,9 @@ L$ãäžè¶³ããŠããã®ã§ãã®ã°ã«ãŒãã«åå ããããšãã§ã㟠åºç»å
šäœãéžæãããããŸãã¯ããŸãæåã«åºç»ãåå²ããŠãã ããã </notification> <notification name="ReleaseLandWarning"> - ããªãã¯ã[AREA]å¹³æ¹ã¡ãŒãã«ã®åå°ãç Žæ£ããããšããŠããŸãã + ããªãã¯ã[AREA] å¹³æ¹ã¡ãŒãã«ã®åå°ãç Žæ£ããããšããŠããŸãã ãã®åºç»ãç Žæ£ãããšããªãã®åå°ã§ã¯ãªããªããŸããã -L$ã¯è¿éãããŸããã +L$ ã¯è¿éãããŸããã åå°ãç Žæ£ããŸããïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> @@ -866,7 +870,7 @@ L$ã¯è¿éãããŸããã åºç»ã®äžéšãéžæããŠãã ããã </notification> <notification name="LandDivideWarning"> - ãã®åå°ãåå²ãããšã2ã€ã®åºç»ã«å¥ããŸãã + ãã®åå°ãåå²ãããšã2 ã€ã®åºç»ã«å¥ããŸãã åºç»ããšã®èšå®ãå¯èœã«ãªããŸãã ãã®æäœãè¡ããšãäžéšã®èšå®ãããã©ã«ãã«ãªã»ãããããŸãã åå°ã®åå²æäœãç¶è¡ããŸããïŒ @@ -886,19 +890,18 @@ L$ã¯è¿éãããŸããã </notification> <notification name="CannotJoinLandEntireParcelSelected"> åå°ãçµ±åã§ããŸããïŒ -1ã€ã®åºç»ããéžæãããŠããŸããã +åºç»ã 1 ã€ããéžæãããŠããŸããã äž¡æ¹ã®åºç»ããŸããã§åå°ãéžæããŠãã ããã </notification> <notification name="CannotJoinLandSelection"> åå°ãçµ±åã§ããŸããïŒ -1ã€ä»¥äžã®åºç»ãéžæããå¿
èŠããããŸãã +åºç»ã 1 ã€ä»¥äžéžæããå¿
èŠããããŸãã äž¡æ¹ã®åºç»ããŸããã§åå°ãéžæããŠãã ããã </notification> <notification name="JoinLandWarning"> - ãã®åå°ãçµ±åãããšãéžæãããé·æ¹åœ¢ã«äº€å·®ãã -å
šãŠã®åºç»ãåºã«ããŠ1ã€ã®å€§ããªåºç»ãäœæãããŸãã + ãã®åå°ãçµ±åãããšãéžæãããé·æ¹åœ¢ã«äº€å·®ããå
šãŠã®åºç»ãåºã«ããŠã倧ããªåºç»ã 1 ã€äœæãããŸãã æ°ããåºç»ã®ååãšãªãã·ã§ã³ãåèšå®ããå¿
èŠããããŸãã åå°ãçµ±åããŸããïŒ @@ -913,7 +916,7 @@ L$ã¯è¿éãããŸããã <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="ã³ããŒ"/> </notification> <notification name="ResolutionSwitchFail"> - 解å床ã [RESX]x[RESY]ã«åãæ¿ããããšãã§ããŸããã§ããã + 解å床ã [RESX]x[RESY] ã«åãæ¿ããããšãã§ããŸããã§ããã </notification> <notification name="ErrorUndefinedGrasses"> ãšã©ãŒïŒæªå®çŸ©ã®æ€ç©ïŒ[SPECIES] @@ -922,16 +925,15 @@ L$ã¯è¿éãããŸããã ãšã©ãŒïŒæªå®çŸ©ã®æš¹æšïŒ[SPECIES] </notification> <notification name="CannotSaveWearableOutOfSpace"> - ã[NAME]ããæã®ãã¡ã€ã«ã«ä¿åã§ããŸããã ã³ã³ãã¥ãŒã¿ãŒã® -ãã£ã¹ã¯ã¹ããŒã¹ãå°ãå¢ãããŠãããããäžåºŠ -ä¿åããŠã¿ãŠãã ããã + ã [NAME] ããè¡£é¡ã®ãã¡ã€ã«ã«ä¿åã§ããŸããã +ã³ã³ãã¥ãŒã¿ãŒã®ãã£ã¹ã¯ã¹ããŒã¹ãå°ãå¢ãããŠãããããäžåºŠä¿åããŠã¿ãŠãã ããã </notification> <notification name="CannotSaveToAssetStore"> - [NAME] ãä¿åã§ããŸããã + ã [NAME] ããä¿åã§ããŸããã éåžžããã¯äžæçãªãšã©ãŒã§ãã æ°ååŸã«ããäžåºŠççšç©ãã«ã¹ã¿ãã€ãºã»ä¿åããŠãã ããã </notification> <notification name="YouHaveBeenLoggedOut"> - ããŸã£ãã [SECOND_LIFE] ãããã°ã¢ãŠããããŠããŸããŸãã + ããŸã£ãã [SECOND_LIFE] ãããã°ã¢ãŠããããŠããŸããŸããã [MESSAGE] <usetemplate name="okcancelbuttons" notext="çµäº" yestext="IMãšãã£ããã衚瀺"/> </notification> @@ -939,26 +941,26 @@ L$ã¯è¿éãããŸããã ã°ã«ãŒãçšã®åå°ã®è³Œå
¥ãã§ããŸããïŒ ããªãã«ã¯ã¢ã¯ãã£ããªã°ã«ãŒãã®ããã«åå°ã賌å
¥ããæš©éããããŸããã </notification> - <notification label="ãã¬ã³ããè¿œå " name="AddFriend"> - ãã¬ã³ããšããŠè¿œå ãããšããäºãã®çŸåšå°ã®å°å³ãžã®è¡šç€ºèš±å¯ããªã³ã©ã€ã³ã¹ããŒã¿ã¹è¡šç€ºã®èšå®ãããããšãã§ããŸãã + <notification label="ãã¬ã³ãç»é²" name="AddFriend"> + ãã¬ã³ãç»é²ãããšããäºãã®çŸåšå°ã®å°å³ãžã®è¡šç€ºèš±å¯ããªã³ã©ã€ã³ç¶æ
ã®è¡šç€ºèšå®ãã§ããŸãã [NAME] ã«ãã¬ã³ãã·ãããéããŸããïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> - <notification label="ãã¬ã³ããè¿œå " name="AddFriendWithMessage"> - ãã¬ã³ããšããŠè¿œå ãããšããäºãã®çŸåšå°ã®å°å³ãžã®è¡šç€ºèš±å¯ããªã³ã©ã€ã³ã¹ããŒã¿ã¹è¡šç€ºã®èšå®ãããããšãã§ããŸãã + <notification label="ãã¬ã³ãç»é²" name="AddFriendWithMessage"> + ãã¬ã³ãç»é²ãããšããäºãã®çŸåšå°ã®å°å³ãžã®è¡šç€ºèš±å¯ããªã³ã©ã€ã³ç¶æ
ã®è¡šç€ºèšå®ãã§ããŸãã -[NAME] ã«ãã¬ã³ãã·ããã®ãªãã¡ãŒãããŸããïŒ +[NAME] ã«ãã¬ã³ãã·ãããç³ãåºãŸããïŒ <form name="form"> <input name="message"> - ãã¬ã³ããšããŠç»é²ããŠãããŸããïŒ + ãã¬ã³ãç»é²ããŠãããŸããïŒ </input> <button name="Offer" text="OK"/> <button name="Cancel" text="ãã£ã³ã»ã«"/> </form> </notification> <notification name="RemoveFromFriends"> - [FIRST_NAME] [LAST_NAME]ããã¬ã³ããªã¹ãããåé€ããŸããïŒ + [FIRST_NAME] [LAST_NAME] ããã¬ã³ããªã¹ãããåé€ããŸããïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="RemoveMultipleFromFriends"> @@ -967,135 +969,134 @@ L$ã¯è¿éãããŸããã </notification> <notification name="GodDeleteAllScriptedPublicObjectsByUser"> **[AVATAR_NAME]** -ææã®ãã¹ãŠã®ã¹ã¯ãªããã»ãªããžã§ã¯ãããã®ã·ã å
ã®ä»ã®ãã¹ãŠã®åå°ããåé€ããããšããŠããŸããæäœãç¶è¡ããŸããïŒ +ææã®ãã¹ãŠã®ã¹ã¯ãªãããªããžã§ã¯ãããã®ã·ã å
ã®ä»ã®ãã¹ãŠã®åå°ããåé€ããããšããŠããŸããæäœãç¶è¡ããŸããïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="GodDeleteAllScriptedObjectsByUser"> **[AVATAR_NAME]** -ææã®ãã¹ãŠã®ã¹ã¯ãªããã»ãªããžã§ã¯ãããã®ã·ã å
ã®ãã¹ãŠã®åå°ããåé€ããããšããŠããŸããæäœãç¶è¡ããŸããïŒ +ææã®ãã¹ãŠã®ã¹ã¯ãªãããªããžã§ã¯ãããã®ã·ã å
ã®ãã¹ãŠã®åå°ããåé€ããããšããŠããŸããæäœãç¶è¡ããŸããïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="GodDeleteAllObjectsByUser"> **[AVATAR_NAME]** -ææã®ãã¹ãŠã®ãªããžã§ã¯ãïŒã¹ã¯ãªããã»ãªããžã§ã¯ããšéã¹ã¯ãªããã»ãªããžã§ã¯ãïŒã +ææã®ãã¹ãŠã®ãªããžã§ã¯ãïŒã¹ã¯ãªãããªããžã§ã¯ããšéã¹ã¯ãªãããªããžã§ã¯ãïŒã ãã®ã·ã å
ã®ãã¹ãŠã®åå°ããåé€ããããšããŠããŸããæäœãç¶è¡ããŸããïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="BlankClassifiedName"> - ã¯ã©ã·ãã¡ã€ãã«ååãæå®ããŠãã ããã + ã¯ã©ã·ãã¡ã€ãã®ååãæå®ããŠãã ããã </notification> <notification name="MinClassifiedPrice"> - åºåæã®æ¯æãéé¡ã¯ãLãš[MIN_PRICE]ãäžéã§ãã + åºåæã¯æäœ L$ [MIN_PRICE] å¿
èŠã§ãã éé¡ãå¢ãããŠãã ããã </notification> <notification name="ConfirmObjectDeleteLock"> - éžæããã¢ã€ãã ã®1ã€ä»¥äžãããã¯ãããŠããŸãã + éžæããã¢ã€ãã ã®ãã¡ãå°ãªããšã 1 ã€ãããã¯ãããŠããŸãã -æ¬åœã«ãããã®ã¢ã€ãã ã®åé€ãç¶ããŸããïŒ +æ¬åœã«åé€ããŸããïŒ <usetemplate name="okcancelbuttons" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="ConfirmObjectDeleteNoCopy"> - éžæããã¢ã€ãã ã®1ã€ä»¥äžãã³ããŒã§ããŸããã + éžæããã¢ã€ãã ã®ãã¡ãå°ãªããšã 1 ã€ãã³ããŒã§ããŸããã -æ¬åœã«ãããã®ã¢ã€ãã ã®åé€ãç¶ããŸããïŒ +æ¬åœã«åé€ããŸããïŒ <usetemplate name="okcancelbuttons" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="ConfirmObjectDeleteNoOwn"> - éžæããã¢ã€ãã ã®1ã€ä»¥äžããããªãã¯ææããŠããŸããã + éžæããã¢ã€ãã ã®ãã¡ãå°ãªããšã 1 ã€ãããªãã®ææç©ã§ã¯ãããŸããã -æ¬åœã«ãããã®ã¢ã€ãã ã®åé€ãç¶ããŸããïŒ +æ¬åœã«åé€ããŸããïŒ <usetemplate name="okcancelbuttons" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="ConfirmObjectDeleteLockNoCopy"> - äžã€ä»¥äžã®ãªããžã§ã¯ããããã¯ãããŠããŸãã -äžã€ä»¥äžã®ãªããžã§ã¯ããã³ããŒã§ããŸããã + å°ãªããšã 1 ã€ã®ãªããžã§ã¯ããããã¯ãããŠããŸãã +å°ãªããšã 1 ã€ã®ãªããžã§ã¯ããã³ããŒã§ããŸããã -æ¬åœã«ãããã®ã¢ã€ãã ã®åé€ãç¶ããŸããïŒ +æ¬åœã«åé€ããŸããïŒ <usetemplate name="okcancelbuttons" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="ConfirmObjectDeleteLockNoOwn"> - äžã€ä»¥äžã®ãªããžã§ã¯ããããã¯ãããŠããŸãã -1ã€ä»¥äžã®ãªããžã§ã¯ãããããªãã¯ææããŠããŸããã + å°ãªããšã 1 ã€ã®ãªããžã§ã¯ããããã¯ãããŠããŸãã +å°ãªããšã 1 ã€ã®ãªããžã§ã¯ãããããªãã®ææç©ã§ã¯ãããŸããã -æ¬åœã«ãããã®ã¢ã€ãã ã®åé€ãç¶ããŸããïŒ +æ¬åœã«åé€ããŸããïŒ <usetemplate name="okcancelbuttons" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="ConfirmObjectDeleteNoCopyNoOwn"> - äžã€ä»¥äžã®ãªããžã§ã¯ããã³ããŒã§ããŸããã -1ã€ä»¥äžã®ãªããžã§ã¯ãããããªãã¯ææããŠããŸããã + å°ãªããšã 1 ã€ã®ãªããžã§ã¯ããã³ããŒã§ããŸããã +å°ãªããšã 1 ã€ã®ãªããžã§ã¯ãããããªãã®ææç©ã§ã¯ãããŸããã -æ¬åœã«ãããã®ã¢ã€ãã ã®åé€ãç¶ããŸããïŒ +æ¬åœã«åé€ããŸããïŒ <usetemplate name="okcancelbuttons" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="ConfirmObjectDeleteLockNoCopyNoOwn"> - äžã€ä»¥äžã®ãªããžã§ã¯ããããã¯ãããŠããŸãã -äžã€ä»¥äžã®ãªããžã§ã¯ããã³ããŒã§ããŸããã -1ã€ä»¥äžã®ãªããžã§ã¯ãããããªãã¯ææããŠããŸããã + å°ãªããšã 1 ã€ã®ãªããžã§ã¯ããããã¯ãããŠããŸãã +å°ãªããšã 1 ã€ã®ãªããžã§ã¯ããã³ããŒã§ããŸããã +å°ãªããšã 1 ã€ã®ãªããžã§ã¯ãããããªãã®ææç©ã§ã¯ãããŸããã -æ¬åœã«ãããã®ã¢ã€ãã ã®åé€ãç¶ããŸããïŒ +æ¬åœã«åé€ããŸããïŒ <usetemplate name="okcancelbuttons" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="ConfirmObjectTakeLock"> - äžã€ä»¥äžã®ãªããžã§ã¯ããããã¯ãããŠããŸãã + å°ãªããšã 1 ã€ã®ãªããžã§ã¯ããããã¯ãããŠããŸãã -ãããã®ã¢ã€ãã ã®ååŸãç¶ããŸããïŒ +æ¬åœã«ãã®ãŸãŸååŸãç¶ããŸããïŒ <usetemplate name="okcancelbuttons" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="ConfirmObjectTakeNoOwn"> - ååŸããããšããŠãããªããžã§ã¯ãã«ã¯ãããªãã®ææç©ã§ãªããªããžã§ã¯ããå«ãŸããŠããŸãã -ããªãã®ææç©ã§ã¯ãªããªããžã§ã¯ããååŸãããšã次ã®ãªãŒããŒã®æš©éããã®ãªããžã§ã¯ãã«é©çšãããŸãã -ãã®ãããå°æ¥ãå€æŽãã³ããŒã®èœåãå¶éãããå¯èœæ§ããããŸãã + ååŸããããšããŠãããªããžã§ã¯ãã«ã¯ãããªãã®ææç©ã§ã¯ãªããªããžã§ã¯ããå«ãŸããŠããŸãã +ããªãã®ææç©ã§ã¯ãªããªããžã§ã¯ããååŸãããšã次ã®ææè
ã®æš©éããã®ãªããžã§ã¯ãã«é©çšãããŸãã +ãã®ãããå°æ¥ãä¿®æ£ãã³ããŒã®èœåãå¶éãããå¯èœæ§ããããŸãã -ãããã®ã¢ã€ãã ã®ååŸãç¶ããŸããïŒ +æ¬åœã«ãã®ãŸãŸååŸãç¶ããŸããïŒ <usetemplate name="okcancelbuttons" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="ConfirmObjectTakeLockNoOwn"> - 1ã€ä»¥äžã®ãªããžã§ã¯ããããã¯ãããŠããŸãã -ååŸããããšããŠãããªããžã§ã¯ãã«ã¯ãããªãã®ææç©ã§ãªããªããžã§ã¯ããå«ãŸããŠããŸãã -ããªãã®ææç©ã§ã¯ãªããªããžã§ã¯ããååŸãããšã次ã®ãªãŒããŒã®æš©éããã®ãªããžã§ã¯ãã«é©çšãããŸãã -ãã®ãããå°æ¥ãå€æŽãã³ããŒã®èœåãå¶éãããå¯èœæ§ããããŸãã + å°ãªããšã 1 ã€ã®ãªããžã§ã¯ããããã¯ãããŠããŸãã +ååŸããããšããŠãããªããžã§ã¯ãã«ã¯ãããªãã®ææç©ã§ã¯ãªããªããžã§ã¯ããå«ãŸããŠããŸãã +ããªãã®ææç©ã§ã¯ãªããªããžã§ã¯ããååŸãããšã次ã®ææè
ã®æš©éããã®ãªããžã§ã¯ãã«é©çšãããŸãã +ãã®ãããå°æ¥ãç·šéãã³ããŒã®èœåãå¶éãããå¯èœæ§ããããŸãã ãã®éžæå
容ã®ãŸãŸã§ç¶è¡ããããšã¯å¯èœã§ããã -ãããã®ã¢ã€ãã ã®ååŸãç¶ããŸããïŒ +æ¬åœã«ãã®ãŸãŸååŸãç¶ããŸããïŒ <usetemplate name="okcancelbuttons" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="CantBuyLandAcrossMultipleRegions"> - è€æ°ã®å°åãéžæããããããåå°ã賌å
¥ã§ããŸããã + è€æ°ã®ãªãŒãžã§ã³ãéžæããããããåå°ã賌å
¥ã§ããŸããã éžæããé¢ç©ãå°ããããŠããäžåºŠè©ŠããŠãã ããã </notification> <notification name="DeedLandToGroup"> ãã®åºç»ã®è²æž¡ã«éããŠã¯ã -ãã®ã°ã«ãŒããååãªåå°ã¯ã¬ãžãããä¿æããã³ç¶æããŠããããšãå¿
èŠã§ãã -åå°ã®è³Œå
¥äŸ¡æ Œã¯ããªãŒããŒã«è¿éãããŸãããè²æž¡ãããåºç»ã売ãããšãè²©å£²äŸ¡æ Œã¯ã°ã«ãŒãã»ã¡ã³ããŒã«åçã«åé
ãããŸãã +ãã®ã°ã«ãŒããååãªåå°ã¯ã¬ãžãããä¿æããã³ç¶æããŠããå¿
èŠããããŸãã +åå°ã®è³Œå
¥äŸ¡æ Œã¯ãææè
ã«è¿éãããŸãããè²æž¡ãããåºç»ã売ãããšã売äžéé¡ã¯ã°ã«ãŒãã¡ã³ããŒã«åçã«åé
ãããŸãã -ãã®[AREA]å¹³æ¹ã¡ãŒãã«ã®åå°ããã°ã«ãŒã -ã[GROUP_NAME]ãã«è²æž¡ããŸããïŒ +ãã® [AREA] å¹³æ¹ã¡ãŒãã«ã®åå°ããã°ã«ãŒã +ã [GROUP_NAME] ãã«è²æž¡ããŸããïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="DeedLandToGroupWithContribution"> - ãã®åºç»ã®è²æž¡ã«éããŠã¯ããã®ã°ã«ãŒãã -ååãªåå°ã¯ã¬ãžãããä¿æããã³ç¶æããŠããããšãå¿
èŠã§ãã + ãã®åºç»ã®è²æž¡ã«éããŠã¯ããã®ã°ã«ãŒããååãªåå°ã¯ã¬ãžãããä¿æããã³ç¶æããŠããå¿
èŠããããŸãã ãã®è²æž¡ã«ããã -ã[FIRST_NAME] [LAST_NAME]ããã +ã [FIRST_NAME] [LAST_NAME] ããã ã°ã«ãŒãã«å¯ŸããŠåå°ãåæã«æäŸãããŸãã -åå°ã®è³Œå
¥äŸ¡æ Œã¯ããªãŒããŒã«è¿éãããŸããã -è²æž¡ãããåºç»ã売ãããšã販売æéã¯ã°ã«ãŒãã»ã¡ã³ããŒã«åçã«åé
ãããŸãã +åå°ã®è³Œå
¥äŸ¡æ Œã¯ãææè
ã«ã¯è¿éãããŸããã +è²æž¡ãããåºç»ã売ãããšã売äžéé¡ã¯ã°ã«ãŒãã¡ã³ããŒã«åçã«åé
ãããŸãã -ãã®[AREA]å¹³æ¹ã¡ãŒãã«ã®åå°ããã°ã«ãŒãã[GROUP_NAME]ãã«è²æž¡ããŸããïŒ +ãã® [AREA] å¹³æ¹ã¡ãŒãã«ã®åå°ããã [GROUP_NAME] ãã«è²æž¡ããŸããïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="DisplaySetToSafe"> - -safeãªãã·ã§ã³ãæå®ããã®ã§ã -衚瀺èšå®ã¯ã»ãŒãã»ã¬ãã«ã«èšå®ãããŠããŸãã + -safe ãªãã·ã§ã³ãæå®ããã®ã§ã +衚瀺èšå®ã¯ã»ãŒãã¬ãã«ã«èšå®ãããŠããŸãã </notification> <notification name="DisplaySetToRecommended"> - 衚瀺èšå®ã¯ãããªãã®ã·ã¹ãã æ§æã« -åºã¥ããŠæšå¥šãããã¬ãã«ã«èšå®ãããŠããŸãã + 衚瀺èšå®ã¯ãããªãã®ã·ã¹ãã æ§æã«åºã¥ããŠæšå¥šãããã¬ãã«ã«èšå®ãããŠããŸãã </notification> <notification name="ErrorMessage"> [ERROR_MESSAGE] + <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AvatarMovedDesired"> ç®çå°ã¯çŸåšãå©çšããã ããŸããã @@ -1108,13 +1109,13 @@ L$ã¯è¿éãããŸããã <notification name="AvatarMovedHome"> ããŒã ãã±ãŒã·ã§ã³ã¯çŸåšãå©çšããã ããŸããã è¿ãã®ãªãŒãžã§ã³ã«ç§»åããŸããã -æ°ãã«ããŒã ãèšå®ããªãããã»ãããããããããŸããã +æ°ãã«ããŒã ãèšå®ãçŽãå¿
èŠããããããããŸããã </notification> <notification name="ClothingLoading"> çŸåšè¡£é¡ãããŠã³ããŒãäžã§ãã ãã®ãŸãŸ [SECOND_LIFE] ãéåžžéãã䜿çšããã ããŸããä»äººããã¯ããªãã¯æ£ãã衚瀺ãããŸãã <form name="form"> - <ignore name="ignore" text="è¡£é¡ãããŠã³ããŒãããããŸã§æéãããã£ãŠããŸã"/> + <ignore name="ignore" text="è¡£é¡ãããŠã³ããŒãããããŸã§æéãããã£ãŠãããšã"/> </form> </notification> <notification name="FirstRun"> @@ -1141,8 +1142,8 @@ L$ã¯è¿éãããŸããã ãŸããªãããªãã®ã¢ãã¿ãŒã衚瀺ãããŸãã ç¢å°ããŒã䜿çšããŠæ©ããŸãã -ãã«ããå¿
èŠãªãšãã[SECOND_LIFE]ã«ã€ããŠç¥ããããšãã¯ã -F1ããŒãæŒããŠãã ããã +ãã«ããå¿
èŠãªãšãã [SECOND_LIFE] ã«ã€ããŠç¥ããããšãã¯ã +F1 ããŒãæŒããŠãã ããã ç·æ§ãããã¯å¥³æ§ã®ã¢ãã¿ãŒãéžæããŠãã ããã ããªãã®æ±ºå®ã¯åŸã§å€æŽã§ããŸãã <usetemplate name="okcancelbuttons" notext="女æ§" yestext="ç·æ§"/> @@ -1154,29 +1155,28 @@ F1ããŒãæŒããŠãã ããã [NAME] ã¯ãããªãã«ãªããžã§ã¯ãã®ç·šéæš©éãäžããŸããã </notification> <notification name="RevokedModifyRights"> - [NAME] ã®ãªããžã§ã¯ããç·šéããæš©éã¯åãæ¶ãããŸãã + [NAME] ã®ãªããžã§ã¯ããç·šéããæš©éã¯åãæ¶ãããŸããã </notification> <notification name="FlushMapVisibilityCaches"> - ãã®æé ã¯ããã®å°åã®å°å³ã®ãã£ãã·ã¥ãæ¶å»ããŸãã -ããã䟿å©ãªã®ã¯ãããã°æã®ã¿ã§ãã -ïŒäœæäžã¯5åéçµã€ãšãå
šå¡ã®å°å³ãå床ãã°ã€ã³åŸã« -æŽæ°ãããŸãïŒ + ãã®ãªãŒãžã§ã³ã®å°å³ã®ãã£ãã·ã¥ãæ¶å»ããŸãã +ãããã°ç®çã®ã¿ã«äŸ¿å©ãªæäœã§ãã +ïŒäœæäžã¯ 5 åéçµã€ãšãå
šå¡ã®å°å³ãå床ãã°ã€ã³åŸã«æŽæ°ãããŸãïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="BuyOneObjectOnly"> - äžåºŠã«äžã€ä»¥äžã®ãªããžã§ã¯ãããšè²·ãããšã¯ã§ããŸããã ãªããžã§ã¯ããäžã€ã ãéžãã§ããäžåºŠãè©Šããã ããã + äžåºŠã« 1 ã€ä»¥äžã®ãªããžã§ã¯ããè²·ãããšã¯ã§ããŸããã ãªããžã§ã¯ãã 1 ã€ã ãéžãã§ããäžåºŠãè©Šããã ããã </notification> <notification name="OnlyCopyContentsOfSingleItem"> - äžåºŠã«è€æ°ã®ã¢ã€ãã ã®ã³ã³ãã³ãã¯ã³ããŒã§ããŸããã -éžæãããªããžã§ã¯ãã1ã€ã ãã«ããŠãããäžåºŠè©ŠããŠãã ããã + äžåºŠã«è€æ°ã®ã¢ã€ãã ã®äžèº«ãã³ããŒã§ããŸããã +ãªããžã§ã¯ãã 1 ã€ã ãéžæããŠãããäžåºŠãè©Šããã ããã <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="KickUsersFromRegion"> - ãã®å°åã®å
šãŠã®äœäººãããŒã ã«ãã¬ããŒãããŸããïŒ + ãã®ãªãŒãžã§ã³ã«ããå
šãŠã®äœäººãããŒã ã«ãã¬ããŒãããŸããïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="EstateObjectReturn"> - [USER_NAME]ãææããŠãããªããžã§ã¯ããè¿åŽããŸããïŒ + [USER_NAME] ãææããŠãããªããžã§ã¯ããè¿åŽããŸããïŒ <usetemplate name="okcancelbuttons" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="InvalidTerrainBitDepth"> @@ -1187,17 +1187,16 @@ F1ããŒãæŒããŠãã ããã </notification> <notification name="InvalidTerrainSize"> å°åãã¯ã¹ãã£ãèšå®ã§ããŸããã§ããïŒ -å°åœ¢ãã¯ã¹ãã£[TEXTURE_NUM]ã¯ã[TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]ã§ã¯å€§ããããŸãã +å°åœ¢ãã¯ã¹ãã£ã [TEXTURE_NUM] ãã¯ã[TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y] ã§ã¯å€§ããããŸãã -ãã¯ã¹ãã£[TEXTURE_NUM]ã24ããã512x512ããã以äžã®ã€ã¡ãŒãžãšäº€æãããé©çšããå床ã¯ãªãã¯ããŠãã ããã +ã [TEXTURE_NUM] ãã 24 ããã 512x512 ããã以äžã®ã€ã¡ãŒãžãšäº€æãããé©çšããå床ã¯ãªãã¯ããŠãã ããã </notification> <notification name="RawUploadStarted"> - ã¢ããããŒãéå§ã æ¥ç¶é床ã«ãã£ãŠã¯ã -æ倧2åéããããŸãã + ã¢ããããŒããéå§ããŸããã æ¥ç¶é床ã«ãã£ãŠã¯ãæ倧 2 åéããããŸãã </notification> <notification name="ConfirmBakeTerrain"> çŸåšã®å°åœ¢ãæ§ç¯ããããšããŠããŸãã -ãã®æäœãè¡ããšãçŸåšã®å°åœ¢ãäžæïŒäžéã®å¶éç¯å²ã®äžå¿ã«ãªããã埩垰ãããŒã«ã®ããã©ã«ãã«ãªããŸãã +ãã®æäœãè¡ããšãçŸåšã®å°åœ¢ãäžæã»äžéã®å¶éç¯å²ã®äžå¿ãšãªããã埩å
ãããŒã«ã®ããã©ã«ãã«ãªããŸãã æäœãç¶è¡ããŸããïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> @@ -1205,35 +1204,34 @@ F1ããŒãæŒããŠãã ããã èš±å¯äœäººã¯ [MAX_AGENTS] 人ãŸã§ã§ãã </notification> <notification name="MaxBannedAgentsOnRegion"> - çŠæ¢äœäººã¯[MAX_BANNED]人ãŸã§ã§ãã + çŠæ¢äœäººã¯ [MAX_BANNED] 人ãŸã§ã§ãã </notification> <notification name="MaxAgentOnRegionBatch"> [NUM_ADDED] åã®ãšãŒãžã§ã³ããè¿œå ããããšããŠå€±æããŸããïŒ [MAX_AGENTS] [LIST_TYPE] å¶éã [NUM_EXCESS] åè¶
éããŠããŸãã </notification> <notification name="MaxAllowedGroupsOnRegion"> - èš±å¯ã°ã«ãŒãã¯[MAX_GROUPS]ã°ã«ãŒããŸã§ã§ãã + èš±å¯ã°ã«ãŒã㯠[MAX_GROUPS] ã°ã«ãŒããŸã§ã§ãã <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="æ§ç¯ãã"/> </notification> <notification name="MaxManagersOnRegion"> - äžåç£ãããŒãžã£ãŒã¯[MAX_MANAGER]人ãŸã§ã§ãã + äžåç£ãããŒãžã£ãŒã¯ [MAX_MANAGER] 人ãŸã§ã§ãã </notification> <notification name="OwnerCanNotBeDenied"> - äžåç£ãªãŒããŒãäžåç£ãçŠæ¢äœäººããªã¹ãã«è¿œå ã§ããŸããã + äžåç£ãªãŒããŒãäžåç£ã®ãçŠæ¢äœäººããªã¹ãã«è¿œå ã§ããŸããã </notification> <notification name="CanNotChangeAppearanceUntilLoaded"> - æããã³åœ¢ãããŒãããããŸã§ã容姿ã®å€æŽã¯ã§ããŸããã + è¡£é¡ããã³ã·ã§ã€ããèªã¿èŸŒãŸãããŸã§ã¯ã容姿ã®å€æŽã¯ã§ããŸããã </notification> <notification name="ClassifiedMustBeAlphanumeric"> - ã¯ã©ã·ãã¡ã€ãåºåã®ååã¯ãã¢ã«ãã¡ãããã -æ°åã§å§ããŸãã å¥èªç¹ã§ã¯å§ããããŸããã + ã¯ã©ã·ãã¡ã€ãåºåã®ååã¯ãã¢ã«ãã¡ããããæ°åã§å§ããŸããå¥èªç¹ã§ã¯å§ããããŸããã </notification> <notification name="CantSetBuyObject"> - ãªããžã§ã¯ãã販売察象ã§ã¯ãªãããããªããžã§ã¯ãã®è³Œå
¥ãèšå®ã§ããŸããã -販売察象ã®ãªããžã§ã¯ããèšå®ããããäžåºŠè©ŠããŠãã ããã + ãªããžã§ã¯ãã販売察象ã§ã¯ãªãããããªããžã§ã¯ãã®è³Œå
¥ãã§ããŸããã +販売察象ã®ãªããžã§ã¯ããæå®ããŠããäžåºŠè©ŠããŠãã ããã </notification> <notification name="FinishedRawDownload"> - æªå å·¥ã®å°åœ¢ãã¡ã€ã«ã次ãžãšããŠã³ããŒãããŸããïŒ -[DOWNLOAD_PATH]ã + æªå å·¥ã®å°åœ¢ãã¡ã€ã«ãããŠã³ããŒãããŸããïŒ +[DOWNLOAD_PATH] </notification> <notification name="DownloadWindowsMandatory"> [APP_NAME] ã®ææ°ããŒãžã§ã³ããå©çšå¯èœã§ãã @@ -1297,58 +1295,56 @@ F1ããŒãæŒããŠãã ããã </notification> <notification name="DeedObjectToGroup"> ãã®ãªããžã§ã¯ããè²æž¡ãããšã°ã«ãŒãã¯ä»¥äžã®ããšãå¯èœã§ãïŒ -* ãªããžã§ã¯ãã«æ¯æãããL$ãåé ããŸãã - <usetemplate ignoretext="ãªããžã§ã¯ããã°ã«ãŒãã«è²æž¡ããåã«ç¢ºèªãã" name="okcancelignore" notext="åãæ¶ã" yestext="è²æž¡"/> +* ãªããžã§ã¯ãã«æ¯æããã L$ ãåé ããŸãã + <usetemplate ignoretext="ãªããžã§ã¯ããã°ã«ãŒãã«è²æž¡ããåã®ç¢ºèª" name="okcancelignore" notext="åãæ¶ã" yestext="è²æž¡"/> </notification> <notification name="WebLaunchExternalTarget"> Web ãã©ãŠã¶ãéããŠãã®ã³ã³ãã³ãã衚瀺ããŸããïŒ - <usetemplate ignoretext="ãã©ãŠã¶ãèµ·åã㊠Web ããŒãžãèŠã" name="okcancelignore" notext="ãã£ã³ã»ã«" yestext="OK"/> + <usetemplate ignoretext="ãã©ãŠã¶ãèµ·åã㊠Web ããŒãžãèŠããšã" name="okcancelignore" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="WebLaunchJoinNow"> [http://jp.secondlife.com/account/ ãã€ã¢ã«ãŠã³ã] ããŒãžã«ç§»åããŠã¢ã«ãŠã³ãã管çããŸããïŒ - <usetemplate ignoretext="ãã©ãŠã¶ãèµ·åããŠã¢ã«ãŠã³ãã管çãã" name="okcancelignore" notext="åãæ¶ã" yestext="OK"/> + <usetemplate ignoretext="ãã©ãŠã¶ãèµ·åããŠã¢ã«ãŠã³ãã管çãããšã" name="okcancelignore" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="WebLaunchSecurityIssues"> - [SECOND_LIFE] Wikiã§ã -ã»ãã¥ãªãã£åé¡ãå ±åããæ¹æ³ãã芧ãã ããã - <usetemplate ignoretext="ãã©ãŠã¶ãèµ·åããŠã»ãã¥ãªãã£åé¡ã®å ±åã®ä»æ¹ã確èªãã" name="okcancelignore" notext="ãã£ã³ã»ã«" yestext="OK"/> + [SECOND_LIFE] Wiki ã§ãã»ãã¥ãªãã£åé¡ãå ±åããæ¹æ³ãã芧ãã ããã + <usetemplate ignoretext="ãã©ãŠã¶ãèµ·åããŠã»ãã¥ãªãã£åé¡ã®å ±åã®ä»æ¹ã確èªãããšã" name="okcancelignore" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="WebLaunchQAWiki"> - [SECOND_LIFE] å質ä¿èšŒé¢é£Wikiãã芧ãã ããã - <usetemplate ignoretext="ãã©ãŠã¶ãèµ·åã㊠QA Wiki ãèŠã" name="okcancelignore" notext="ãã£ã³ã»ã«" yestext="OK"/> + [SECOND_LIFE] å質ä¿èšŒé¢é£ Wiki ãã芧ãã ããã + <usetemplate ignoretext="ãã©ãŠã¶ãèµ·åã㊠QA Wiki ãèŠããšã" name="okcancelignore" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="WebLaunchPublicIssue"> - [SECOND_LIFE]ã®ãããªãã¯åé¡ãã©ãã«ãŒã§ã + [SECOND_LIFE] ã®ãããªãã¯åé¡ãã©ãã«ãŒã§ã ãã°ããã®ä»ã®åé¡ãå ±åã§ããŸãã - <usetemplate ignoretext="ãã©ãŠã¶ã確èªããŠãããªãã¯åé¡ãã©ãã«ãŒã䜿çšãã" name="okcancelignore" notext="ãã£ã³ã»ã«" yestext="ããŒãžãžè¡ã"/> + <usetemplate ignoretext="ãã©ãŠã¶ãèµ·åããŠãããªãã¯åé¡ãã©ãã«ãŒã䜿çšãããšã" name="okcancelignore" notext="ãã£ã³ã»ã«" yestext="ããŒãžãžè¡ã"/> </notification> <notification name="WebLaunchSupportWiki"> - Lindenå
¬åŒããã°ã§ãææ°ã®ãã¥ãŒã¹ãæ
å ±ãå
¥æããŠãã ããã - <usetemplate ignoretext="ãã©ãŠã¶ãèµ·åããŠå
¬åŒããã°ãèŠã" name="okcancelignore" notext="åãæ¶ã" yestext="OK"/> + Linden å
¬åŒããã°ã§ãææ°ã®ãã¥ãŒã¹ãæ
å ±ãå
¥æããŠãã ããã + <usetemplate ignoretext="ãã©ãŠã¶ãèµ·åããŠå
¬åŒããã°ãèŠããšã" name="okcancelignore" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="WebLaunchLSLGuide"> ã¹ã¯ãªããã¬ã€ããéããŸããïŒ - <usetemplate ignoretext="ãã©ãŠã¶ãèµ·åããŠã¹ã¯ãªããã¬ã€ããèŠã" name="okcancelignore" notext="åãæ¶ã" yestext="OK"/> + <usetemplate ignoretext="ãã©ãŠã¶ãèµ·åããŠã¹ã¯ãªããã¬ã€ããèŠããšã" name="okcancelignore" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="WebLaunchLSLWiki"> LSL ããŒã¿ã«ã§ã¹ã¯ãªããã«é¢ããæ
å ±ã確èªããŸããïŒ - <usetemplate ignoretext="ãã©ãŠã¶ãèµ·åã㊠LSL ããŒã¿ã«ãèŠã" name="okcancelignore" notext="åãæ¶ã" yestext="ããŒãžã«ç§»å"/> + <usetemplate ignoretext="ãã©ãŠã¶ãèµ·åã㊠LSL ããŒã¿ã«ãèŠããšã" name="okcancelignore" notext="åãæ¶ã" yestext="ããŒãžã«ç§»å"/> </notification> <notification name="ReturnToOwner"> éžæãããªããžã§ã¯ãããææè
ã«è¿åŽããŸããïŒ -è²æž¡å¯èœãªãªããžã§ã¯ã㯠-以åã®ææè
ã«è¿åŽãããŸãã +ãå販ã»ãã¬ãŒã³ãå¯ãã®è²æž¡ããããªããžã§ã¯ãã¯ã以åã®ææè
ã«è¿åŽãããŸãã -*èŠå*ã移転ãäžå¯èœã®è²æž¡ããããªããžã§ã¯ãã¯åé€ãããŸãïŒ - <usetemplate ignoretext="ãªããžã§ã¯ããææè
ã«è¿åŽããåã«ç¢ºèªãã" name="okcancelignore" notext="åãæ¶ã" yestext="OK"/> +*èŠå*ããå販ã»ãã¬ãŒã³ãäžå¯ãã®è²æž¡ããããªããžã§ã¯ãã¯ãåé€ãããŸãïŒ + <usetemplate ignoretext="ãªããžã§ã¯ããææè
ã«è¿åŽããåã®ç¢ºèª" name="okcancelignore" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="GroupLeaveConfirmMember"> - çŸåšããªã㯠[GROUP]ã®ã¡ã³ããŒã§ãã -ããããæããŸããïŒ + çŸåšããªã㯠[GROUP] ã®ã¡ã³ããŒã§ãã +ãã®ã°ã«ãŒããæããŸããïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="ConfirmKick"> - ãã¹ãŠã®ãŠãŒã¶ãŒãã°ãªããå€ã«ããã¯ããããšããŠããŸããæäœãç¶è¡ããŸããïŒ + ãã¹ãŠã®ãŠãŒã¶ãŒãã°ãªããã®å€ã«ããã¯ããããšããŠããŸããæäœãç¶è¡ããŸããïŒ <usetemplate name="okcancelbuttons" notext="ãã£ã³ã»ã«" yestext="å
šãŠã®ãŠãŒã¶ãè¿œãåºã"/> </notification> <notification name="MuteLinden"> @@ -1363,22 +1359,22 @@ F1ããŒãæŒããŠãã ããã <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="RemoveItemWarn"> - ã³ã³ãã³ããåé€ãããšãèš±å¯ããã£ãŠãããªããžã§ã¯ãã«ãã¡ãŒãžãäžããããšããããŸãã -ãã®ã¢ã€ãã ã®åé€ãç¶ããŸããïŒ + ã³ã³ãã³ããåé€ãããšãèš±å¯ããã£ãŠããªããžã§ã¯ãã«æå·ãäžããããšããããŸãã +åé€ãç¶ããŸããïŒ <usetemplate name="okcancelbuttons" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="CantOfferCallingCard"> - çŸåšã³ãŒãªã³ã°ã«ãŒããéããŸãããæ°ååŸã«ããäžåºŠè©ŠããŠãã ããã + çŸåšã³ãŒãªã³ã°ã«ãŒããéããŸãããæ°ååŸã«ããäžåºŠãè©Šããã ããã <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CantOfferFriendship"> - çŸåšãã¬ã³ãã·ãããéããŸãããæ°ååŸã«è©ŠããŠãã ããã + çŸåšãã¬ã³ãã·ãããéããŸãããæ°ååŸã«ããäžåºŠãè©Šããã ããã <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="BusyModeSet"> åã蟌ã¿äžã¢ãŒãã«ãªããŸããã ãã£ãããšã€ã³ã¹ã¿ã³ãã¡ãã»ãŒãžã¯è¡šç€ºãããŸããã åä¿¡ããã€ã³ã¹ã¿ã³ãã¡ãã»ãŒãžã«ã¯åã蟌ã¿äžè¿çã¡ãã»ãŒãžã衚瀺ãããŸãã ãã¬ããŒãã®ãªãã¡ãŒã¯åãåãæåŠãšãªããŸãã ã¢ã€ãã ã®ãªãã¡ãŒã¯ãã¹ãŠãã¿ç®±ã«å
¥ããŸãã - <usetemplate ignoretext="ãã°ã€ã³ç¶æ
ãåã蟌ã¿äžã¢ãŒãã«å€æŽãã" name="okignore" yestext="OK"/> + <usetemplate ignoretext="ãã°ã€ã³ç¶æ
ãåã蟌ã¿äžã¢ãŒãã«å€æŽãããšã" name="okignore" yestext="OK"/> </notification> <notification name="JoinedTooManyGroupsMember"> å å
¥ã§ããã°ã«ãŒãã®æ倧éã«éããŸããã ãã®ã°ã«ãŒãã«å å
¥ããããã«ä»ã®ã°ã«ãŒããè±éãããããã®ç³ãå
¥ããæã£ãŠãã ããã @@ -1390,7 +1386,7 @@ F1ããŒãæŒããŠãã ããã <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="KickUser"> - ã©ããªã¡ãã»ãŒãžã衚瀺ããŠããã®ãŠãŒã¶ãŒãè¿œãåºããŸããïŒ + ã©ã®ãããªã¡ãã»ãŒãžãã€ããŠãã®ãŠãŒã¶ãŒãè¿œãåºããŸããïŒ <form name="form"> <input name="message"> ããªãã¯ç®¡çè
ã«ãããã°ãªããããŸããã @@ -1400,7 +1396,7 @@ F1ããŒãæŒããŠãã ããã </form> </notification> <notification name="KickAllUsers"> - ã©ããªã¡ãã»ãŒãžã衚瀺ããŠãã°ãªããã«ããå
šå¡ãè¿œãåºããŸããïŒ + ã©ã®ãããªã¡ãã»ãŒãžãã€ããŠã°ãªããã«ããå
šå¡ãè¿œãåºããŸããïŒ <form name="form"> <input name="message"> ããªãã¯ç®¡çè
ã«ãããã°ãªããããŸããã @@ -1410,17 +1406,17 @@ F1ããŒãæŒããŠãã ããã </form> </notification> <notification name="FreezeUser"> - ã©ããªã¡ãã»ãŒãžã衚瀺ããŠããã®ãŠãŒã¶ãŒãããªãŒãºããŸããïŒ + ã©ã®ãããªã¡ãã»ãŒãžãã€ããŠãã®ãŠãŒã¶ãŒãããªãŒãºããŸããïŒ <form name="form"> <input name="message"> - ããªãã¯ããªãŒãºãããŠããŸãã åãããšããã£ããããããšãã§ããŸããã 管çè
ãIMãéããŠããªãã«é£çµ¡ããŸãã + ããªãã¯ããªãŒãºãããŠããŸãã åãããšããã£ããããããšãã§ããŸããã 管çè
ã IM ã§ããªãã«é£çµ¡ããŸãã </input> <button name="OK" text="OK"/> <button name="Cancel" text="åãæ¶ã"/> </form> </notification> <notification name="UnFreezeUser"> - ã©ããªã¡ãã»ãŒãžã衚瀺ããŠããã®ãŠãŒã¶ãŒã®ããªãŒãºã解é€ããŸããïŒ + ã©ã®ãããªã¡ãã»ãŒãžãã€ããŠãã®ãŠãŒã¶ãŒã®ããªãŒãºã解é€ããŸããïŒ <form name="form"> <input name="message"> ããããªãŒãºãããŠããŸããã @@ -1430,20 +1426,20 @@ F1ããŒãæŒããŠãã ããã </form> </notification> <notification name="OfferTeleport"> - 次ã®ã¡ãã»ãŒãžãæ·»ããŠããªããä»ããå Žæãžã®ãã¬ããŒããéããŸããïŒ + 次ã®ã¡ãã»ãŒãžãæ·»ããŠçŸåšå°ã«ãã¬ããŒããéããŸããïŒ <form name="form"> <input name="message"> - [REGION]ã«æ¥ãŸãããïŒ + [REGION] ã«æ¥ãŸãããïŒ </input> <button name="OK" text="OK"/> <button name="Cancel" text="åãæ¶ã"/> </form> </notification> <notification name="OfferTeleportFromGod"> - ãŠãŒã¶ãŒããŽããã»ã³ãŒã«ã§åŒã³å¯ããŸããïŒ + ãŠãŒã¶ãŒããŽãããµã¢ã³ã§åŒã³å¯ããŸããïŒ <form name="form"> <input name="message"> - [REGION]ã«æ¥ãŸãããïŒ + [REGION] ã«æ¥ãŸãããïŒ </input> <button name="OK" text="OK"/> <button name="Cancel" text="åãæ¶ã"/> @@ -1451,19 +1447,18 @@ 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"> - ä»ããªãã®äžåç£ã«ãã人å
šå¡ã«éã -çãã¡ãã»ãŒãžãå
¥åããŠãã ããã + ä»ããªãã®äžåç£ã«ãã人å
šå¡ã«éããçãã¡ãã»ãŒãžãå
¥åããŠãã ããã <form name="form"> <input name="message"/> <button name="OK" text="OK"/> @@ -1471,86 +1466,86 @@ F1ããŒãæŒããŠãã ããã </form> </notification> <notification label="Lindenã®äžåç£ãå€æŽ" name="ChangeLindenEstate"> - ããªãã¯Lindenææã®äžåç£ïŒã¡ã€ã³ã©ã³ãããã£ãŒã³ã°ãªããããªãªãšã³ããŒã·ã§ã³ãªã©ïŒãå€æŽããããšããŠããŸãã + ããªãã¯ãªã³ãã³ææã®äžåç£ïŒã¡ã€ã³ã©ã³ãããã£ãŒã³ã°ãªããããªãªãšã³ããŒã·ã§ã³ãªã©ïŒãå€æŽããããšããŠããŸãã -ããã¯ãŠãŒã¶ãŒã®çµéšãæ ¹æ¬ããæºããããããªããéåžžã«å±éºãªè¡çºãã§ããããã«ãããã¡ã€ã³ã©ã³ãã§å€æ°ã®å°åãå€æŽãããã¹ããŒã¹ãµãŒããŒã«æªåœ±é¿ãçããŸãã +ããã¯ãŠãŒã¶ãŒã®çµéšãæ ¹æ¬ããæºããããããªããéåžžã«å±éºãªè¡çºãã§ããããã«ãããã¡ã€ã³ã©ã³ãã§å€æ°ã®ãªãŒãžã§ã³ïŒå°åïŒãå€æŽãããã¹ããŒã¹ãµãŒããŒã«æªåœ±é¿ãçããŸãã æäœãç¶è¡ããŸããïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification label="Lindenã®äžåç£ãžã®ã¢ã¯ã»ã¹ãå€æŽ" name="ChangeLindenAccess"> - ããªãã¯Lindenææã®äžåç£ïŒã¡ã€ã³ã©ã³ãããã£ãŒã³ã°ãªããããªãªãšã³ããŒã·ã§ã³ãªã©ïŒãžã®ã¢ã¯ã»ã¹ãªã¹ããå€æŽããããšããŠããŸãã + ããªãã¯ãªã³ãã³ææã®äžåç£ïŒã¡ã€ã³ã©ã³ãããã£ãŒã³ã°ãªããããªãªãšã³ããŒã·ã§ã³ãªã©ïŒãžã®ã¢ã¯ã»ã¹ãªã¹ããå€æŽããããšããŠããŸãã ãã®è¡çºã¯ãå±éºãã§ãããã°ãªãããããªããžã§ã¯ãããéã®è»¢éããããããããã³ã°ãåŒãèµ·ããå¯èœæ§ããããããå®å
šã«ãããæå³ããå Žåã®ã¿è¡ãã¹ããã®ã§ãã -ããã«ããå€æ°ã®å°åãå€æŽãããã¹ããŒã¹ãµãŒããŒã«æªåœ±é¿ãçããŸãã +ããã«ããå€æ°ã®ãªãŒãžã§ã³ïŒå°åïŒãå€æŽãããã¹ããŒã¹ãµãŒããŒã«æªåœ±é¿ãçããŸãã <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification label="äžåç£ãéžæ" name="EstateAllowedAgentAdd"> - ãã®äžåç£ã®èš±å¯ãªã¹ãã ãã«è¿œå ããŸããïŒ ãããšã[ALL_ESTATES]ã®ãã¹ãŠã®èš±å¯ãªã¹ãã«è¿œå ããŸããïŒ + ãã®äžåç£éå®ã®èš±å¯ãªã¹ãã«è¿œå ããŸããïŒ ãããšã [ALL_ESTATES] ã®èš±å¯ãªã¹ãã«è¿œå ããŸããïŒ <usetemplate canceltext="åãæ¶ã" name="yesnocancelbuttons" notext="ãã¹ãŠã®äžåç£" yestext="ãã®äžåç£"/> </notification> <notification label="äžåç£ãéžæ" name="EstateAllowedAgentRemove"> - èš±å¯ãªã¹ãããã®åé€ããã®äžåç£ã«ã€ããŠã®ã¿è¡ããŸããïŒ ãããšãã[ALL_ESTATES]ã«ã€ããŠè¡ããŸããïŒ + ãã®äžåç£éå®ã®èš±å¯ãªã¹ãããåé€ããŸããïŒ ãããšãã[ALL_ESTATES] ããåé€ããŸããïŒ <usetemplate canceltext="åãæ¶ã" name="yesnocancelbuttons" notext="ãã¹ãŠã®äžåç£" yestext="ãã®äžåç£"/> </notification> <notification label="äžåç£ãéžæ" name="EstateAllowedGroupAdd"> - ãã®äžåç£ã®ã°ã«ãŒãèš±å¯ãªã¹ãã ãã«è¿œå ããŸããïŒ ãããšã[ALL_ESTATES]ã®ã°ã«ãŒãèš±å¯ãªã¹ãã«è¿œå ããŸããïŒ + ãã®äžåç£éå®ã®ã°ã«ãŒãèš±å¯ãªã¹ãã«è¿œå ããŸããïŒ ãããšã [ALL_ESTATES] ã®ã°ã«ãŒãèš±å¯ãªã¹ãã«è¿œå ããŸããïŒ <usetemplate canceltext="åãæ¶ã" name="yesnocancelbuttons" notext="ãã¹ãŠã®äžåç£" yestext="ãã®äžåç£"/> </notification> <notification label="äžåç£ãéžæ" name="EstateAllowedGroupRemove"> - èš±å¯ãªã¹ãããã®åé€ããã®äžåç£ã«ã€ããŠã®ã¿è¡ããŸããïŒ ãããšãã[ALL_ESTATES]ã«ã€ããŠè¡ããŸããïŒ + ãã®äžåç£éå®ã®èš±å¯ãªã¹ãããåé€ããŸããïŒ ãããšãã[ALL_ESTATES] ããåé€ããŸããïŒ <usetemplate canceltext="åãæ¶ã" name="yesnocancelbuttons" notext="ãã¹ãŠã®äžåç£" yestext="ãã®äžåç£"/> </notification> <notification label="äžåç£ãéžæ" name="EstateBannedAgentAdd"> - ãã®äžåç£ã«ã€ããŠã®ã¿ã¢ã¯ã»ã¹ãæåŠããŸããïŒ ãããšã[ALL_ESTATE]ãžã®ã¢ã¯ã»ã¹ãæåŠããŸããïŒ + ãã®äžåç£éå®ã§ã¢ã¯ã»ã¹ãæåŠããŸããïŒ ãããšã [ALL_ESTATE] ãžã®ã¢ã¯ã»ã¹ãæåŠããŸããïŒ <usetemplate canceltext="åãæ¶ã" name="yesnocancelbuttons" notext="ãã¹ãŠã®äžåç£" yestext="ãã®äžåç£"/> </notification> <notification label="äžåç£ãéžæ" name="EstateBannedAgentRemove"> - ãã®äœäººãããã®äžåç£ã®ã¿ããŸãã¯[ALL_ESTATES]ãžãšã¢ã¯ã»ã¹ã§ããããã«ãçŠæ¢ãªã¹ãããåé€ããŸããïŒ + ãã®äœäººãããã®äžåç£éå®ããŸã㯠[ALL_ESTATES] ã«ã¢ã¯ã»ã¹ã§ããããã«ãçŠæ¢ãªã¹ãããåé€ããŸããïŒ <usetemplate canceltext="åãæ¶ã" name="yesnocancelbuttons" notext="ãã¹ãŠã®äžåç£" yestext="ãã®äžåç£"/> </notification> <notification label="äžåç£ãéžæ" name="EstateManagerAdd"> - ãã®äžåç£ã®ã¿ããŸãã¯[ALL_ESTATES]ã«å¯ŸããŠãäžåç£ãããŒãžã£ãŒãè¿œå ããŸããïŒ + ãã®äžåç£éå®ããŸã㯠[ALL_ESTATES] ã®äžåç£ãããŒãžã£ãŒãè¿œå ããŸããïŒ <usetemplate canceltext="åãæ¶ã" name="yesnocancelbuttons" notext="ãã¹ãŠã®äžåç£" yestext="ãã®äžåç£"/> </notification> <notification label="äžåç£ãéžæ" name="EstateManagerRemove"> - äžåç£ãããŒãžã£ãŒãããã®äžåç£ã®ã¿ããŸãã¯[ALL_ESTATES]ãããåé€ããŸããïŒ + äžåç£ãããŒãžã£ãŒãããã®äžåç£éå®ããŸã㯠[ALL_ESTATES] ãããåé€ããŸããïŒ <usetemplate canceltext="åãæ¶ã" name="yesnocancelbuttons" notext="ãã¹ãŠã®äžåç£" yestext="ãã®äžåç£"/> </notification> <notification label="ããã¯ã確èª" name="EstateKickUser"> - ãã®äžåç£ãã[EVIL_USER]ãè¿œãåºããŸããïŒ + ãã®äžåç£ãã [EVIL_USER] ãè¿œãåºããŸããïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="EstateChangeCovenant"> - äžåç£çŽæ¬Ÿãå€æŽããããšããŠããŸããæäœãç¶è¡ããŸããïŒ + äžåç£çŽæ¬Ÿãå€æŽããããšããŠããŸããç¶ããŸããïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="RegionEntryAccessBlocked"> - ããªãã®ã¬ãŒãã£ã³ã°åºåã«ããããã®å°åïŒãªãŒãžã§ã³ïŒãžã¯å
¥ãããšãã§ããŸããã 幎霢ã確èªããéã®æ
å ±ã«äžè¶³ããã£ããããšèããããŸãã + ããªãã®ã¬ãŒãã£ã³ã°åºåã«ããããã®ãªãŒãžã§ã³ïŒå°åïŒãžã¯å
¥ãããšãã§ããŸããã 幎霢ã確èªããéã®æ
å ±ã«äžè¶³ããã£ããããšèããããŸãã ææ°ãã¥ãŒã¯ãã€ã³ã¹ããŒã«ãããŠããããã確èªãã ããããã®ã¬ãŒãã£ã³ã°åºåã§ã®ã¢ã¯ã»ã¹ã«é¢ãã詳现ã¯ãã¬ããžããŒã¹ãã芧ãã ããã <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="RegionEntryAccessBlocked_KB"> - ããªãã®ã¬ãŒãã£ã³ã°åºåã«ããããã®å°åïŒãªãŒãžã§ã³ïŒãžã¯å
¥ãããšãã§ããŸããã + ããªãã®ã¬ãŒãã£ã³ã°åºåã«ããããã®ãªãŒãžã§ã³ïŒå°åïŒãžã¯å
¥ãããšãã§ããŸããã ãã¬ããžããŒã¹ãéãã¬ãŒãã£ã³ã°åºåã«ã€ããŠåŠã³ãŸããïŒ <url name="url"> http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/ja </url> - <usetemplate ignoretext="ã¬ãŒãã£ã³ã°åºåã®å¶éã®ããããã®ãªãŒãžã§ã³ã«å
¥ãããšãã§ããŸãã" name="okcancelignore" notext="éãã" yestext="ãã¬ããžããŒã¹ãéã"/> + <usetemplate ignoretext="ã¬ãŒãã£ã³ã°åºåã®å¶éã®ããããªãŒãžã§ã³ã«å
¥ãããšãã§ããªããšã" name="okcancelignore" notext="éãã" yestext="ãã¬ããžããŒã¹ãéã"/> </notification> <notification name="RegionEntryAccessBlocked_Notify"> - ããªãã®ã¬ãŒãã£ã³ã°åºåã«ããããã®å°åïŒãªãŒãžã§ã³ïŒãžã¯å
¥ãããšãã§ããŸããã + ããªãã®ã¬ãŒãã£ã³ã°åºåã«ããããã®ãªãŒãžã§ã³ïŒå°åïŒãžã¯å
¥ãããšãã§ããŸããã </notification> <notification name="RegionEntryAccessBlocked_Change"> - ããªãã®ã¬ãŒãã£ã³ã°åºåèšå®ã«ããããã®å°åïŒãªãŒãžã§ã³ïŒãžã¯å
¥ãããšãã§ããŸããã + ããªãã®ã¬ãŒãã£ã³ã°åºåèšå®ã«ããããã®ãªãŒãžã§ã³ïŒå°åïŒãžã¯å
¥ãããšãã§ããŸããã ãèšå®ãå€æŽããã¯ãªãã¯ããŠããªãã®ã¬ãŒãã£ã³ã°åºåãäžãããšãå
¥ããããã«ãªããŸãã ããªãã¯ä»åŸ [REGIONMATURITY] ã³ã³ãã³ãã®æ€çŽ¢åã³ã¢ã¯ã»ã¹ãå¯èœãšãªããŸãã ããšã§èšå®ãå
ã«æ»ãããå Žåã¯ããç·šéãïŒãç°å¢èšå®ããã芧ãã ããã <form name="form"> <button name="OK" text="ç°å¢èšå®ã®å€æŽ"/> <button default="true" name="Cancel" text="éãã"/> - <ignore name="ignore" text="éžæããã¬ãŒãã£ã³ã°åºåãåå ã§ããªãŒãžã§ã³ã«å
¥ãããšãã§ããŸãã"/> + <ignore name="ignore" text="éžæããã¬ãŒãã£ã³ã°åºåãåå ã§ããªãŒãžã§ã³ã«å
¥ããªããšã"/> </form> </notification> <notification name="LandClaimAccessBlocked"> @@ -1575,7 +1570,7 @@ F1ããŒãæŒããŠãã ããã ããªãã®ã¬ãŒãã£ã³ã°åºåèšå®ã«ããããã®åå°ãååŸããããšã¯ã§ããŸããã ãèšå®ãå€æŽããã¯ãªãã¯ããŠããªãã®ã¬ãŒãã£ã³ã°åºåãäžãããšãå
¥ããããã«ãªããŸãã ããªãã¯ä»åŸ [REGIONMATURITY] ã³ã³ãã³ãã®æ€çŽ¢åã³ã¢ã¯ã»ã¹ãå¯èœãšãªããŸãã ããšã§èšå®ãå
ã«æ»ãããå Žåã¯ããç·šéãïŒãç°å¢èšå®ããã芧ãã ããã - <usetemplate ignoretext="éžæããã¬ãŒãã£ã³ã°åºåãåå ã§ãåå°ãååŸã§ããŸãã" name="okcancelignore" notext="éãã" yestext="èšå®ã®å€æŽ"/> + <usetemplate ignoretext="éžæããã¬ãŒãã£ã³ã°åºåãåå ã§ãåå°ãååŸã§ããªããšã" name="okcancelignore" notext="éãã" yestext="èšå®ã®å€æŽ"/> </notification> <notification name="LandBuyAccessBlocked"> ããªãã®ã¬ãŒãã£ã³ã°åºåã«ããããã®åå°ã賌å
¥ããããšã¯ã§ããŸããã 幎霢ã確èªããéã®æ
å ±ã«äžè¶³ããã£ããããšèããããŸãã @@ -1599,40 +1594,40 @@ F1ããŒãæŒããŠãã ããã ããªãã®ã¬ãŒãã£ã³ã°åºåèšå®ã«ããããã®åå°ã賌å
¥ããããšãã§ããŸããã ãèšå®ãå€æŽããã¯ãªãã¯ããŠããªãã®ã¬ãŒãã£ã³ã°åºåãäžãããšãå
¥ããããã«ãªããŸãã ããªãã¯ä»åŸ [REGIONMATURITY] ã³ã³ãã³ãã®æ€çŽ¢åã³ã¢ã¯ã»ã¹ãå¯èœãšãªããŸãã ããšã§èšå®ãå
ã«æ»ãããå Žåã¯ããç·šéãïŒãç°å¢èšå®ããã芧ãã ããã - <usetemplate ignoretext="éžæããã¬ãŒãã£ã³ã°åºåãåå ã§ãåå°ã賌å
¥ã§ããŸãã" name="okcancelignore" notext="éãã" yestext="èšå®ã®å€æŽ"/> + <usetemplate ignoretext="éžæããã¬ãŒãã£ã³ã°åºåãåå ã§ãåå°ã賌å
¥ã§ããªããšã" name="okcancelignore" notext="éãã" yestext="èšå®ã®å€æŽ"/> </notification> <notification name="TooManyPrimsSelected"> éžæããããªã ãå€ãããŸãã [MAX_PRIM_COUNT] åéžæããããããªã æ°ãæžãããŠããäžåºŠãè©Šããã ããã <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="ProblemImportingEstateCovenant"> - äžåç£çŽæ¬Ÿã®ã€ã³ããŒãæã«åé¡çºçã + äžåç£çŽæ¬Ÿã®ã€ã³ããŒãæã«åé¡ãçºçããŸããã <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="ProblemAddingEstateManager"> æ°ããäžåç£ãããŒãžã£ãŒã®è¿œå ã«é¢ããåé¡ïŒ -1ã€ä»¥äžã®äžåç£ã§ããããŒãžã£ãŒãªã¹ããæºæ¯ã«ãªã£ãŠããŸãã +ããããã®äžåç£ã®ãããŒãžã£ãŒãªã¹ããæºæ¯ã«ãªã£ãŠããŸãã </notification> <notification name="ProblemAddingEstateGeneric"> äžåç£ãªã¹ãã®è¿œå ã«é¢ããåé¡ïŒ -1ã€ä»¥äžã®äžåç£ã§ããªã¹ããæºæ¯ã«ãªã£ãŠããŸãã +ããããã®äžåç£ã®ãªã¹ããæºæ¯ã«ãªã£ãŠããŸãã </notification> <notification name="UnableToLoadNotecardAsset"> - çŸåšããŒãã«ãŒãã®è³ç£IDãèªã¿èŸŒãããšãã§ããŸããã + çŸåšããŒãã«ãŒãã®ã¢ã»ãã ID ãèªã¿èŸŒãããšãã§ããŸããã <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="NotAllowedToViewNotecard"> - èŠæ±ãããè³ç£IDã«é¢ããããŒãã«ãŒããé²èŠ§ããã«ã¯æš©éãäžååã§ãã + èŠæ±ããã¢ã»ãã ID ã«é¢ããããŒãã«ãŒããé²èŠ§ããã«ã¯ãæš©éãäžååã§ãã <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="MissingNotecardAssetID"> - ããŒãã«ãŒãçšè³ç£IDãããŒã¿ããŒã¹ã«ç»é²ãããŠããŸããã + ããŒãã«ãŒãçšã®ã¢ã»ãã ID ãããŒã¿ããŒã¹ã«ç»é²ãããŠããŸããã <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="PublishClassified"> 泚æïŒã¯ã©ã·ãã¡ã€ãåºåã®æéã¯æãæ»ããããŸããã -L$[AMOUNT]ã§ããã®ã¯ã©ã·ãã¡ã€ãåºåãä»ããå
¬éããŸããïŒ +L$ [AMOUNT] ã§ããã®ã¯ã©ã·ãã¡ã€ãåºåãä»ããå
¬éããŸããïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="SetClassifiedMature"> @@ -1644,13 +1639,12 @@ L$[AMOUNT]ã§ããã®ã¯ã©ã·ãã¡ã€ãåºåãä»ããå
¬éããŸããï <usetemplate canceltext="ãã£ã³ã»ã«" name="yesnocancelbuttons" notext="ããã" yestext="ã¯ã"/> </notification> <notification label="åèµ·åã確èª" name="ConfirmRestart"> - ãã®å°åã2ååŸã«åèµ·åããããšããŠããŸãã -æäœãç¶è¡ããŸããïŒ + ãã®ãªãŒãžã§ã³ã 2 ååŸã«åèµ·åããããšããŠããŸãã +ç¶ããŸããïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> - <notification label="ãã®å°åå
ã®å
šå¡ã«ã¡ãã»ãŒãžãéä¿¡" name="MessageRegion"> - ãã®å°åã«ãã人å
šå¡ã«éã -çãã¡ãã»ãŒãžãå
¥åããŠãã ããã + <notification label="ãã®ãªãŒãžã§ã³ã«ã¡ãã»ãŒãžãéä¿¡" name="MessageRegion"> + ãã®ãªãŒãžã§ã³ã«ãã人å
šå¡ã«éãçãã¡ãã»ãŒãžãå
¥åããŠãã ããã <form name="form"> <input name="message"/> <button name="OK" text="OK"/> @@ -1658,7 +1652,7 @@ L$[AMOUNT]ã§ããã®ã¯ã©ã·ãã¡ã€ãåºåãä»ããå
¬éããŸããï </form> </notification> <notification label="å°åã®ã¬ãŒãã£ã³ã°åºåæå®å€æŽæžã¿" name="RegionMaturityChange"> - ãã®ãªãŒãžã§ã³ã®ã¬ãŒãã£ã³ã°åºåãã¢ããããŒããããŸããã + ãã®ãªãŒãžã§ã³ïŒå°åïŒã®ã¬ãŒãã£ã³ã°åºåãã¢ããããŒããããŸããã å°å³ã«å€æŽãåæ ããããŸã§æ°åãããããšããããŸãã ã¢ãã«ãå°çšãªãŒãžã§ã³ã«å
¥ãã«ã¯ãäœäººã®ã¢ã«ãŠã³ãã幎霢確èªãæ¯ææ¹æ³ã®ããããã§ã確èªæžã¿ãã§ãªããã°ãªããŸããã @@ -1667,7 +1661,7 @@ L$[AMOUNT]ã§ããã®ã¯ã©ã·ãã¡ã€ãåºåãä»ããå
¬éããŸããï [APP_NAME] ã®ãã®ããŒãžã§ã³ã¯ããã®ãªãŒãžã§ã³ã«ããããã€ã¹ãã£ããã®äºææ§ããããŸããã ãã€ã¹ãã£ãããæ£åžžã«è¡ãããã«ã¯ã[APP_NAME] ã®ã¢ããããŒããå¿
èŠã§ãã </notification> <notification label="ãªããžã§ã¯ãã賌å
¥ã§ããŸãã" name="BuyObjectOneOwner"> - è€æ°ã®ãªãŒããŒããåæã«ãªããžã§ã¯ãã賌å
¥ããããšã¯ã§ããŸããã + è€æ°ã®ææè
ããåæã«ãªããžã§ã¯ãã賌å
¥ããããšã¯ã§ããŸããã åäžã®ãªããžã§ã¯ããéžæããããäžåºŠè©ŠããŠãã ããã </notification> <notification label="ã³ã³ãã³ãã賌å
¥ã§ããŸãã" name="BuyContentsOneOnly"> @@ -1675,62 +1669,64 @@ L$[AMOUNT]ã§ããã®ã¯ã©ã·ãã¡ã€ãåºåãä»ããå
¬éããŸããï éžæãããªããžã§ã¯ãã1ã€ã ãã«ããŠãããäžåºŠè©ŠããŠãã ããã </notification> <notification label="ã³ã³ãã³ãã賌å
¥ã§ããŸãã" name="BuyContentsOneOwner"> - è€æ°ã®ãªãŒããŒããåæã«ãªããžã§ã¯ãã賌å
¥ããããšã¯ã§ããŸããã + è€æ°ã®ææè
ããåæã«ãªããžã§ã¯ãã賌å
¥ããããšã¯ã§ããŸããã åäžã®ãªããžã§ã¯ããéžæããããäžåºŠè©ŠããŠãã ããã </notification> <notification name="BuyOriginal"> - ãªãªãžãã«ã®ãªããžã§ã¯ãã[OWNER]ããL$[PRICE]ã§è³Œå
¥ããŸããïŒ -ããã«ãããããªãããªããžã§ã¯ãã®ãªãŒããŒã«ãªããŸãã + ãªãªãžãã«ã®ãªããžã§ã¯ãã [OWNER] ãã L$ [PRICE] ã§è³Œå
¥ããŸããïŒ +賌å
¥ãããšãããªãããªããžã§ã¯ãã®ææè
ãšãªããŸãã å¯èœãªæäœã¯ã -å€æŽïŒ[MODIFYPERM]ãã³ããŒïŒ[COPYPERM]ã -å販ïŒãã¬ãŒã³ã[RESELLPERM]ã§ãã +ä¿®æ£ïŒ[MODIFYPERM]ãã³ããŒïŒ[COPYPERM]ã +å販ã»ãã¬ãŒã³ãïŒ[RESELLPERM] ã§ãã <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="BuyOriginalNoOwner"> - L$[PRICE]ã§ãªãªãžãã«ã®ãªããžã§ã¯ãã賌å
¥ããŸããïŒ -ããã«ãããããªãããªããžã§ã¯ãã®ãªãŒããŒã«ãªããŸãã + L$ [PRICE] ã§ãªãªãžãã«ã®ãªããžã§ã¯ãã賌å
¥ããŸããïŒ +賌å
¥ãããšãããªãããªããžã§ã¯ãã®ææè
ãšãªããŸãã å¯èœãªæäœã¯ã -å€æŽïŒ[MODIFYPERM]ãã³ããŒïŒ[COPYPERM]ã -å販ïŒãã¬ãŒã³ã[RESELLPERM]ã§ãã +ä¿®æ£ïŒ[MODIFYPERM]ãã³ããŒïŒ[COPYPERM]ã +å販ã»ãã¬ãŒã³ãïŒ[RESELLPERM] ã§ãã <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="BuyCopy"> - ã³ããŒã[OWNER]ããL$[PRICE]ã§è³Œå
¥ããŸããïŒ -賌å
¥ãããªããžã§ã¯ãã¯ãããªãã®æã¡ç©ã«ã³ããŒãããŸãã -å¯èœãªæäœã¯ãå€æŽïŒ[MODIFYPERM]ãã³ããŒïŒ[COPYPERM]ã -å販ïŒãã¬ãŒã³ã[RESELLPERM]ã§ãã + ã³ããŒã [OWNER] ãã L$ [PRICE] ã§è³Œå
¥ããŸããïŒ +賌å
¥ãããªããžã§ã¯ãã¯ãããªãã®ãæã¡ç©ãã«ã³ããŒãããŸãã +å¯èœãªæäœã¯ã +ä¿®æ£ïŒ[MODIFYPERM]ãã³ããŒïŒ[COPYPERM]ã +å販ã»ãã¬ãŒã³ãïŒ[RESELLPERM] ã§ãã <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="BuyCopyNoOwner"> - L$[PRICE]ã§ã³ããŒã賌å
¥ããŸããïŒ -賌å
¥ãããªããžã§ã¯ãã¯ãããªãã®æã¡ç©ã«ã³ããŒãããŸãã -å¯èœãªæäœã¯ãå€æŽïŒ[MODIFYPERM]ãã³ããŒïŒ[COPYPERM]ã -å販ïŒãã¬ãŒã³ã[RESELLPERM]ã§ãã + L$ [PRICE] ã§ã³ããŒã賌å
¥ããŸããïŒ +賌å
¥ãããªããžã§ã¯ãã¯ãããªãã®ãæã¡ç©ãã«ã³ããŒãããŸãã +å¯èœãªæäœã¯ã +ä¿®æ£ïŒ[MODIFYPERM]ãã³ããŒïŒ[COPYPERM]ã +å販ã»ãã¬ãŒã³ãïŒ[RESELLPERM] ã§ãã <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="BuyContents"> - ã³ã³ãã³ãã[OWNER]ããL$[PRICE]ã§è³Œå
¥ããŸããïŒ -賌å
¥ããã³ã³ãã³ãã¯ãããªãã®æã¡ç©ã«ã³ããŒãããŸãã + äžèº«ã [OWNER] ãã L$ [PRICE] ã§è³Œå
¥ããŸããïŒ +賌å
¥ããäžèº«ã¯ãããªãã®ãæã¡ç©ãã«ã³ããŒãããŸãã <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="BuyContentsNoOwner"> - LïŒ[PRICE]ã§ã³ã³ãã³ãã賌å
¥ããŸããïŒ -賌å
¥ããã³ã³ãã³ãã¯ãããªãã®æã¡ç©ã«ã³ããŒãããŸãã + LïŒ [PRICE] ã§äžèº«ã賌å
¥ããŸããïŒ +賌å
¥ããäžèº«ã¯ãããªãã®ãæã¡ç©ãã«ã³ããŒãããŸãã <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="ConfirmPurchase"> ãã®ååŒã¯ä»¥äžã®ãšããè¡ãããŸãïŒ [ACTION] -ãã®è³Œå
¥ãç¶è¡ããŸããïŒ +賌å
¥ãç¶ããŸããïŒ <usetemplate name="okcancelbuttons" notext="åãæ¶ã" yestext="OK"/> </notification> <notification name="ConfirmPurchasePassword"> ãã®ååŒã¯ä»¥äžã®ãšããè¡ãããŸãïŒ [ACTION] -ãã®è³Œå
¥ãç¶è¡ããŸããïŒ -ãã¹ã¯ãŒããåå
¥åãããOKããã¯ãªãã¯ããŠãã ããã +賌å
¥ãç¶ããŸããïŒ +ãã¹ã¯ãŒããåå
¥åããã OK ããã¯ãªãã¯ããŠãã ããã <form name="form"> <input name="message"/> <button name="ConfirmPurchase" text="OK"/> @@ -1739,31 +1735,31 @@ L$[AMOUNT]ã§ããã®ã¯ã©ã·ãã¡ã€ãåºåãä»ããå
¬éããŸããï </notification> <notification name="SetPickLocation"> ã¡ã¢ïŒ -æ¬ããã¯ã®ãã±ãŒã·ã§ã³ãæŽæ°ããŸãããã +æ¬ããã¯ã®äœçœ®ãæŽæ°ããŸãããã ä»ã®è©³çŽ°ã¯å
ã®å€ã®ãŸãŸã«ãªããŸãã <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="MoveInventoryFromObject"> - ãã³ããŒçŠæ¢ãã®æã¡ç©ã¢ã€ãã ãéžæãããŸããã -ãããã®ã¢ã€ãã ã¯ã³ããŒãããªããŸãŸãããªãã®æã¡ç©ã«ç§»åãããŸãã + ãã³ããŒäžå¯ãã®æã¡ç©ã¢ã€ãã ãéžæããŸããã +ãããã®ã¢ã€ãã ã¯ã³ããŒãããªããŸãŸãããªãã®ãæã¡ç©ãã«ç§»åãããŸãã ã¢ã€ãã ãåãããŸããïŒ - <usetemplate ignoretext="ãã³ããŒäžå¯ãã®ã¢ã€ãã ããªããžã§ã¯ãããåããåã«èŠåãã" name="okcancelignore" notext="ãã£ã³ã»ã«" yestext="OK"/> + <usetemplate ignoretext="ãã³ããŒäžå¯ãã®ã¢ã€ãã ããªããžã§ã¯ãããåããåã®èŠå" name="okcancelignore" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="MoveInventoryFromScriptedObject"> - ãã³ããŒçŠæ¢ãã®æã¡ç©ã¢ã€ãã ãéžæãããŸããã -ãããã®ã¢ã€ãã ã¯ã³ããŒãããã®ã§ã¯ãªããããªãã®æã¡ç©ã«ç§»åãããŸãã -ãã®ãªããžã§ã¯ãã¯ã¹ã¯ãªããä»ããªã®ã§ãæã¡ç©ã«ç§»åããããš + ãã³ããŒäžå¯ãã®æã¡ç©ã¢ã€ãã ãéžæããŸããã +ãããã®ã¢ã€ãã ã¯ã³ããŒãããã«ãããªãã®ãæã¡ç©ãã«ç§»åãããŸãã +ãã®ãªããžã§ã¯ãã¯ã¹ã¯ãªããä»ããªã®ã§ããæã¡ç©ãã«ç§»åããããš ã¹ã¯ãªããã«èª€åäœãèµ·ããå¯èœæ§ããããŸãã æã¡ç©ã¢ã€ãã ã移åããŸããïŒ - <usetemplate ignoretext="ã¹ã¯ãªããå
¥ãã®ãªããžã§ã¯ããå£ãæãã®ãããã³ããŒäžå¯ãã®ã¢ã€ãã ãåããåã«èŠåãã" name="okcancelignore" notext="ãã£ã³ã»ã«" yestext="OK"/> + <usetemplate ignoretext="ã¹ã¯ãªããå
¥ãã®ãªããžã§ã¯ããå£ãæãã®ãããã³ããŒäžå¯ãã®ã¢ã€ãã ãåããåã®èŠå" name="okcancelignore" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="ClickActionNotPayable"> èŠåïŒ ã¯ãªãã¯ã§ããªããžã§ã¯ãã«æ¯æããèšå®ãããŸãããã¹ã¯ãªããã« money()ã€ãã³ããè¿œå ããããšåäœããŸãã <form name="form"> - <ignore name="ignore" text="money() ã¹ã¯ãªãããå
¥ããã«ãªããžã§ã¯ããå¶äœäžã«ãããªããžã§ã¯ãã«æ¯æããã¢ã¯ã·ã§ã³ãèšå®"/> + <ignore name="ignore" text="ãªããžã§ã¯ããäœæäžã«ãmoney() ã¹ã¯ãªãããå
¥ããã«ããªããžã§ã¯ãã«æ¯æããã¢ã¯ã·ã§ã³ãèšå®ãããšã"/> </form> </notification> <notification name="OpenObjectCannotCopy"> @@ -1771,11 +1767,11 @@ L$[AMOUNT]ã§ããã®ã¯ã©ã·ãã¡ã€ãåºåãä»ããå
¬éããŸããï </notification> <notification name="WebLaunchAccountHistory"> [http://jp.secondlife.com/account/ ãã€ã¢ã«ãŠã³ã] ããŒãžã«ç§»åããŠã¢ã«ãŠã³ãå±¥æŽã確èªããŸããïŒ - <usetemplate ignoretext="ãã©ãŠã¶ãèµ·åããŠã¢ã«ãŠã³ãå±¥æŽãèŠã" name="okcancelignore" notext="åãæ¶ã" yestext="ããŒãžã«ç§»å"/> + <usetemplate ignoretext="ãã©ãŠã¶ãèµ·åããŠã¢ã«ãŠã³ãå±¥æŽãèŠããšã" name="okcancelignore" notext="åãæ¶ã" yestext="ããŒãžã«ç§»å"/> </notification> <notification name="ConfirmQuit"> - çµäºããããšããŠããŸããæäœãç¶è¡ããŸããïŒ - <usetemplate ignoretext="çµäºæã«ç¢ºèªãã" name="okcancelignore" notext="çµäºããªã" yestext="çµäº"/> + çµäºããããšããŠããŸããç¶ããŸããïŒ + <usetemplate ignoretext="çµäºæã®ç¢ºèª" name="okcancelignore" notext="çµäºããªã" yestext="çµäº"/> </notification> <notification name="HelpReportAbuseEmailLL"> ãã®ããŒã«ãå©çšã㊠[http://secondlife.com/corporate/tos.php å©çšèŠçŽ] ã [http://jp.secondlife.com/corporate/cs.php ã³ãã¥ããã£ã¹ã¿ã³ããŒã] ã®éåãå ±åããŠãã ããã @@ -1815,44 +1811,42 @@ L$[AMOUNT]ã§ããã®ã¯ã©ã·ãã¡ã€ãåºåãä»ããå
¬éããŸããï (2) DMCA ãŸãã¯ã³ã³ãã³ãã®æ€å»ã®æé ã³ã³ãã³ãã [SECOND_LIFE] ããåé€ããŠæ¬²ãããšãããªã¯ãšã¹ããããã«ã¯ãåŒç€Ÿ [http://secondlife.com/corporate/dmca.php DMCA ããªã·ãŒ] ã§æ瀺ãããŠãããšãããæå¹ãªäŸµå®³ã®éç¥ãæåºããªããã°ãªããŸããã. -ãã®ãŸãŸå«ãããã®å ±åãç¶ãããå Žåã¯ããã®ãŠã£ã³ããŠãéããŠå ±åãéã£ãŠãã ããã ãã³ããŒBotåã³æš©éã®æªçšãã®ã«ããŽãªãéžãã æ¹ãé©åã®å ŽåããããŸãã +ãã®ãŸãŸå«ãããã®å ±åãç¶ãããå Žåã¯ããã®ãŠã£ã³ããŠãéããŠå ±åãéã£ãŠãã ããã ãã³ã㌠Bot åã³æš©éã®æªçšãã®ã«ããŽãªãéžãã æ¹ãé©åã®å ŽåããããŸãã ãååããããšãããããŸãã Linden Lab </notification> <notification name="FailedRequirementsCheck"> - 以äžã®å¿
èŠãªã³ã³ããŒãã³ããã[FLOATER]ããæãèœã¡ãŠããŸã + 以äžã®å¿
èŠãªã³ã³ããŒãã³ããã[FLOATER] ããæãèœã¡ãŠããŸã [COMPONENTS] </notification> <notification label="æ¢åã®ä»å±åã眮æ" name="ReplaceAttachment"> - äœã®ãã®éšäœã«ã¯ãªããžã§ã¯ããè£
çãããŠããŸãã + äœã®ãã®éšäœã«ã¯æ¢ã«ãªããžã§ã¯ããè£
çãããŠããŸãã éžæããããªããžã§ã¯ããšçœ®ãæããŸããïŒ <form name="form"> - <ignore name="ignore" save_option="true" text="è£
çããŠããã¢ã€ãã ãšéžæããã¢ã€ãã ãå
¥ãæ¿ãã"/> + <ignore name="ignore" save_option="true" text="è£
çããŠããã¢ã€ãã ãšéžæããã¢ã€ãã ãå
¥ãæ¿ãããšã"/> <button ignore="èªåçã«äº€æ" name="Yes" text="OK"/> <button ignore="亀æããªã" name="No" text="ãã£ã³ã»ã«"/> </form> </notification> <notification label="åã蟌ã¿äžã®èŠå" name="BusyModePay"> - çŸåšãåã蟌ã¿äžã®ããããã®æ¯æããš -åŒãæãã®ã¢ã€ãã ãåãåãããšã -ã§ããŸããã + çŸåšããåã蟌ã¿äžãã¢ãŒãã®ãããæ¯æããšåŒãæãã«ã¢ã€ãã ãåãåãããšãã§ããŸããã -ãã®ååŒãå®äºããåã«ãåã蟌ã¿äžã®èšå®ã解é€ããŸããïŒ +ãã®ååŒãè¡ãããã«ãåã蟌ã¿äžãã®èšå®ã解é€ããŸããïŒ <form name="form"> - <ignore name="ignore" save_option="true" text="åã蟌ã¿äžã¢ãŒãã®æã«æ¯æããã"/> - <button ignore="åžžã«åã蟌ã¿äžã®èšå®" name="Yes" text="OK"/> - <button ignore="åã蟌ã¿äžã®èšå®ã«ããªã" name="No" text="ãã£ã³ã»ã«"/> + <ignore name="ignore" save_option="true" text="åã蟌ã¿äžã¢ãŒãæã«æ¯æããããšã"/> + <button ignore="åžžã«ãåã蟌ã¿äžãã®èšå®ã解é€" name="Yes" text="OK"/> + <button ignore="åžžã«ãåã蟌ã¿äžãã®èšå®ãç¶ç¶" name="No" text="ãã£ã³ã»ã«"/> </form> </notification> <notification name="ConfirmDeleteProtectedCategory"> ã [FOLDERNAME] ã ã¯ãã·ã¹ãã ãã©ã«ãã§ãã ã·ã¹ãã ãã©ã«ããåé€ãããšäžå®å®ã«ãªãããšããããŸãã ç¶ããŸããïŒ - <usetemplate ignoretext="ã·ã¹ãã ãã©ã«ããåé€ããåã«ç¢ºèªãã" name="okcancelignore" notext="ãã£ã³ã»ã«" yestext="OK"/> + <usetemplate ignoretext="ã·ã¹ãã ãã©ã«ããåé€ããåã®ç¢ºèª" name="okcancelignore" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="ConfirmEmptyTrash"> - ãã¿ç®±ã®é
ç®ããã¹ãŠåé€ããŸããïŒ - <usetemplate ignoretext="æã¡ç©ã®ãã¿ç®±ãã©ã«ãã空ã«ããåã«ç¢ºèªãã" name="okcancelignore" notext="ãã£ã³ã»ã«" yestext="OK"/> + ãã¿ç®±ã®äžèº«ããã¹ãŠåé€ããŸããïŒ + <usetemplate ignoretext="æã¡ç©ã®ãã¿ç®±ãã©ã«ãã空ã«ããåã®ç¢ºèª" name="okcancelignore" notext="ãã£ã³ã»ã«" yestext="OK"/> </notification> <notification name="ConfirmClearBrowserCache"> ãã©ãã«ãWebãæ€çŽ¢ã®å±¥æŽããã¹ãŠåé€ããŸããïŒ @@ -1867,16 +1861,16 @@ Linden Lab <usetemplate name="okcancelbuttons" notext="ãã£ã³ã»ã«" yestext="ã¯ã"/> </notification> <notification name="ConfirmEmptyLostAndFound"> - çŽå€±ç©ã®é
ç®ããã¹ãŠåé€ããŸããïŒ - <usetemplate ignoretext="çŽå€±ç©ãã©ã«ãã空ã«ããåã«ç¢ºèªãã" name="okcancelignore" notext="ããã" yestext="ã¯ã"/> + çŽå€±ç©ã®äžèº«ããã¹ãŠåé€ããŸããïŒ + <usetemplate ignoretext="çŽå€±ç©ãã©ã«ãã空ã«ããåã®ç¢ºèª" name="okcancelignore" notext="ããã" yestext="ã¯ã"/> </notification> <notification name="CopySLURL"> 次㮠SLurl ãã¯ãªããããŒãã«ã³ããŒãããŸããïŒ [SLURL] -WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã¢ã¯ã»ã¹ã§ããŸããWebãã©ãŠã¶ã®ã¢ãã¬ã¹ããŒã«è²Œãä»ããŠè©ŠããŠã¿ãŠãã ããã +Web ããŒãžã«ãªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã¢ã¯ã»ã¹ã§ããŸããWeb ãã©ãŠã¶ã®ã¢ãã¬ã¹ããŒã«è²Œãä»ããŠè©ŠããŠã¿ãŠãã ããã <form name="form"> - <ignore name="ignore" text="ã¯ãªããããŒãã« SLurl ãã³ããŒããã"/> + <ignore name="ignore" text="ã¯ãªããããŒãã« SLurl ãã³ããŒãããšã"/> </form> </notification> <notification name="WLSavePresetAlert"> @@ -1884,14 +1878,14 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã <usetemplate name="okcancelbuttons" notext="ããã" yestext="ã¯ã"/> </notification> <notification name="WLDeletePresetAlert"> - [SKY] ãåé€ããŸããïŒ + ã [SKY] ããåé€ããŸããïŒ <usetemplate name="okcancelbuttons" notext="ããã" yestext="ã¯ã"/> </notification> <notification name="WLNoEditDefault"> ããã©ã«ãã®èšå®ãç·šéãããåé€ãããããããšã¯ã§ããŸããã </notification> <notification name="WLMissingSky"> - ãã®ãã€ã»ãµã€ã¯ã«ã®ãã¡ã€ã«ã¯æ¬¡ã®ååšããªãã空ããã¡ã€ã«ãåç
§ããŠããŸãïŒ [SKY]ã + ãã®ãã€ãµã€ã¯ã«ã®ãã¡ã€ã«ã¯æ¬¡ã®ååšããªãã空ããã¡ã€ã«ãåç
§ããŠããŸãïŒ [SKY]ã </notification> <notification name="PPSaveEffectAlert"> ãã¹ãããã»ã¹å¹æãååšããŸãã äžæžãããŸããïŒ @@ -1927,7 +1921,7 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã ããã©ã«ãã®èšå®ãç·šéãããåé€ãããããããšã¯ã§ããŸããã </notification> <notification name="ChatterBoxSessionStartError"> - [RECIPIENT]ãšã®æ°ãããã£ãããéå§ããããšãã§ããŸãã + [RECIPIENT] ãšæ°ãããã£ãããéå§ããããšãã§ããŸããã [REASON] <usetemplate name="okbutton" yestext="OK"/> </notification> @@ -1942,16 +1936,16 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="Cannot_Purchase_an_Attachment"> - ãªããžã§ã¯ããåãä»ããããŠãããšãã¯è³Œå
¥ããããšãã§ããŸããã + ãªããžã§ã¯ããåãä»ããããŠãããŸãŸã§ã¯è³Œå
¥ã§ããŸããã </notification> - <notification label="ããããèš±å¯ã®ãªã¯ãšã¹ãã«ã€ããŠ" name="DebitPermissionDetails"> - ãã®èŠæ±ãèš±å¯ãããšãã¹ã¯ãªããããããªãã®ã¢ã«ãŠã³ãã«ãªã³ãã³ãã«ã課éã§ããããã«ãªããŸãã -ãã®èš±å¯ãåãæ¶ãã«ã¯ããªããžã§ã¯ãã®ãªãŒããŒã¯ãªããžã§ã¯ããåé€ãããããªããžã§ã¯ãã®ã¹ã¯ãªããããªã»ããããªããã°ãªããŸããã + <notification label="åŒãåºãèš±å¯ã®ãªã¯ãšã¹ãã«ã€ããŠ" name="DebitPermissionDetails"> + ãã®ãªã¯ãšã¹ããèš±å¯ãããšãã¹ã¯ãªããã§ããªãã®ã¢ã«ãŠã³ããããªã³ãã³ãã«ãåŒãåºããããã«ãªããŸãã +ãã®èš±å¯ãåãæ¶ãã«ã¯ããªããžã§ã¯ãã®ææè
ããªããžã§ã¯ããåé€ãããããªããžã§ã¯ãã®ã¹ã¯ãªããããªã»ããããªããã°ãªããŸããã <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] ãµã€ãã§å¹Žéœ¢ã®ç¢ºèªãè¡ããŸããïŒ @@ -1960,7 +1954,7 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã <url name="url" option="0"> https://secondlife.com/account/verification.php?lang=ja </url> - <usetemplate ignoretext="幎霢ã®ç¢ºèªãæžãŸããŠããŸãã" name="okcancelignore" notext="ããã" yestext="ã¯ã"/> + <usetemplate ignoretext="幎霢ã®ç¢ºèªãæžãŸããŠããªããšã" name="okcancelignore" notext="ããã" yestext="ã¯ã"/> </notification> <notification name="Cannot enter parcel: no payment info on file"> æ¯ææ
å ±ãç»é²ãããŠããªããšãã®ãšãªã¢ã蚪ããããšãã§ããŸããã [SECOND_LIFE] ãµã€ãã§ç»é²ãè¡ããŸããïŒ @@ -1969,53 +1963,53 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã <url name="url" option="0"> https://secondlife.com/account/index.php?lang=ja </url> - <usetemplate ignoretext="æ¯ææ
å ±ãç»é²ãããŠããŸãã" name="okcancelignore" notext="ããã" yestext="ã¯ã"/> + <usetemplate ignoretext="æ¯ææ
å ±ãç»é²ãããŠããªããšã" name="okcancelignore" notext="ããã" yestext="ã¯ã"/> </notification> <notification name="MissingString"> - æåå[STRING_NAME]ãstrings.xmlã«å«ãŸããŠããŸãã + æåå [STRING_NAME] ã strings.xml ã«å«ãŸããŠããŸããã </notification> <notification name="SystemMessageTip"> [MESSAGE] </notification> <notification name="Cancelled"> - åãæ¶ãããŸãã + åãæ¶ãããŸããã </notification> <notification name="CancelledSit"> - 座ãã®ãåãæ¶ãããŸãã + 座ãã®ããããŸããã </notification> <notification name="CancelledAttach"> - æ·»ä»ã¯åãæ¶ãããŸãã + æ·»ä»ãåãæ¶ãããŸããã </notification> <notification name="ReplacedMissingWearable"> - æ¬ èœããŠããæïŒèº«äœéšäœãããã©ã«ãã«çœ®æããŸãã + æ¬ èœããŠããè¡£é¡ã身äœéšäœãããã©ã«ãã«çœ®ãæããŸãã </notification> <notification name="GroupNotice"> - 件åïŒ [SUBJECT], ïŸïœ¯ïœŸïœ°ïœŒïŸïŒ [MESSAGE] + 件åïŒ [SUBJECT]ãã¡ãã»ãŒãžïŒ [MESSAGE] </notification> <notification name="FriendOnline"> - [NAME_SLURL] ã¯ãªã³ã©ã€ã³ã§ã + [FIRST] [LAST] ã¯ãªã³ã©ã€ã³ã§ã </notification> <notification name="FriendOffline"> - [NAME_SLURL] ã¯ãªãã©ã€ã³ã§ã + [FIRST] [LAST] ã¯ãªãã©ã€ã³ã§ã </notification> <notification name="AddSelfFriend"> æ®å¿µãªããèªåèªèº«ããã¬ã³ãç»é²ããããšã¯ã§ããŸããã </notification> <notification name="UploadingAuctionSnapshot"> - ã€ã³ã¯ãŒã«ããšãŠã§ãã»ãµã€ãã®ã¹ãããã·ã§ãããã¢ããããŒãäžã§ã... -ïŒæèŠæéïŒçŽ5åïŒ + ã€ã³ã¯ãŒã«ããš Web ãµã€ãã®ã¹ãããã·ã§ãããã¢ããããŒãäžã§ã... +ïŒæèŠæéïŒçŽ 5 åïŒ </notification> <notification name="UploadPayment"> - ã¢ããããŒãã« L$[AMOUNT] æ¯æããŸããã + ã¢ããããŒãã« L$ [AMOUNT] æ¯æããŸããã </notification> <notification name="UploadWebSnapshotDone"> - Webãµã€ãã®ã¹ãããã·ã§ãããã¢ããããŒããããŸããã + Web ãµã€ãã®ã¹ãããã·ã§ãããã¢ããããŒããããŸããã </notification> <notification name="UploadSnapshotDone"> ã€ã³ã¯ãŒã«ãã§ã®ã¹ãããã·ã§ããã®ã¢ããããŒããå®äºããŸããã </notification> <notification name="TerrainDownloaded"> - rawå°åœ¢ãããŠã³ããŒããããŸãã + raw å°åœ¢ãããŠã³ããŒããããŸãã </notification> <notification name="GestureMissing"> ãžã§ã¹ãã£ãŒã® [NAME] ãããŒã¿ããŒã¹ã«èŠã€ãããŸããã @@ -2027,11 +2021,11 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã ããŒã¿ããŒã¹ã«ã©ã³ãããŒã¯ããããŸããã </notification> <notification name="UnableToLoadLandmark"> - ã©ã³ãããŒã¯ãããŒãã§ããŸããã ããäžåºŠè©ŠããŠãã ããã + ã©ã³ãããŒã¯ãèªã¿èŸŒããŸããã ããäžåºŠãè©Šããã ããã </notification> <notification name="CapsKeyOn"> CapsLock ããŒãæå¹ã«ãªã£ãŠããŸãã -ãã¹ã¯ãŒãã«åœ±é¿ããããããããŸããã +ãã¹ã¯ãŒãã«åœ±é¿ãããããããŸããã </notification> <notification name="NotecardMissing"> ããŒãã«ãŒããããŒã¿ããŒã¹ã«ãããŸããã @@ -2040,10 +2034,10 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã ãã®ããŒãã«ãŒããèŠãæš©éããããŸããã </notification> <notification name="RezItemNoPermissions"> - ãªããžã§ã¯ããrezããã«ã¯ããŒããã·ã§ã³ïŒæ¿èªïŒãäžè¶³ããŠãŸãã + ãªããžã§ã¯ãã Rez ããã«ã¯æš©éãäžè¶³ããŠããŸãã </notification> <notification name="UnableToLoadNotecard"> - çŸåšããŒãã«ãŒãã®è³ç£ãããŒãã§ããŸããã + ããŒãã«ãŒããèªã¿èŸŒããŸãããããšã§å床ãè©Šããã ããã </notification> <notification name="ScriptMissing"> ããŒã¿ããŒã¹ã«ã¹ã¯ãªããããããŸããã @@ -2055,36 +2049,35 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã ã¹ã¯ãªãããããŒãã§ããŸããã ããäžåºŠè©ŠããŠãã ããã </notification> <notification name="IncompleteInventory"> - ããªãã®æäŸããã³ã³ãã³ãã¯ããã®å Žæã§ã¯ãŸã å
šéšæããŸããã -å°ãããŠããããäžåºŠè©ŠããŠãã ããã + ããªãã®æäŸããã³ã³ãã³ãã¯ãããŒã«ã«ã§ã¯ãŸã å
šéšæã£ãŠããŸããã +ãã°ããããŠããããäžåºŠãè©Šããã ããã </notification> <notification name="CannotModifyProtectedCategories"> - ä¿è·ãããã«ããŽãªãŒã¯ä¿®æ£ã§ããŸããã + ä¿è·ãããã«ããŽãªã¯ä¿®æ£ã§ããŸããã </notification> <notification name="CannotRemoveProtectedCategories"> - ä¿è·ãããã«ããŽãªãŒã¯åé€ã§ããŸããã + ä¿è·ãããã«ããŽãªã¯åé€ã§ããŸããã </notification> <notification name="OfferedCard"> - ããªãã¯[FIRST] [LAST] ã« -ã³ãŒãªã³ã°ã»ã«ãŒããéããŸããã + [FIRST] [LAST] ã«ã³ãŒãªã³ã°ã«ãŒããéããŸããã </notification> <notification name="UnableToBuyWhileDownloading"> ãªããžã§ã¯ãããŒã¿ã®ããŠã³ããŒãäžã¯è³Œå
¥ã§ããŸããã -ããäžåºŠè©ŠããŠãã ããã +ããäžåºŠãè©Šããã ããã </notification> <notification name="UnableToLinkWhileDownloading"> ãªããžã§ã¯ãããŒã¿ã®ãŠã³ããŒãäžã¯ãªã³ã¯ã§ããŸããã -ããäžåºŠè©ŠããŠãã ããã +ããäžåºŠãè©Šããã ããã </notification> <notification name="CannotBuyObjectsFromDifferentOwners"> - ãªããžã§ã¯ãã¯äžåºŠã«ã€ãäžäººã®ææè
ãã賌å
¥ã§ããŸãã + ãªããžã§ã¯ãã¯äžåºŠã«äžäººã®ææè
ãã賌å
¥ã§ããŸãã ãªããžã§ã¯ãã 1 ã€ã ãéžãã§ãã ããã </notification> <notification name="ObjectNotForSale"> ãã®ãªããžã§ã¯ãã¯è²©å£²å¯Ÿè±¡ã§ã¯ãããŸããã </notification> <notification name="EnteringGodMode"> - ã¬ãã«[LEVEL]ã®ãŽããã»ã¢ãŒãã«å
¥ããŸã + ã¬ãã« [LEVEL] ã®ãŽããã¢ãŒãã«å
¥ããŸã </notification> <notification name="LeavingGodMode"> ã¬ãã« [LEVEL] ã®ãŽããã¢ãŒãã解é€ããŸã @@ -2093,19 +2086,19 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã ãããã³ããŒããæš©éããããŸããã </notification> <notification name="InventoryAccepted"> - [NAME] ãããªããæž¡ããã¢ã€ãã ãåãåããŸããã + [NAME] ã¯ãããªããæž¡ããã¢ã€ãã ãåãåããŸããã </notification> <notification name="InventoryDeclined"> - [NAME]ã¯ãæã¡ç©ã®æäŸãæããŸããã + [NAME] ã¯ãæã¡ç©ã®æäŸãæããŸããã </notification> <notification name="ObjectMessage"> [NAME]ïŒ [MESSAGE] </notification> <notification name="CallingCardAccepted"> - ã³ãŒãªã³ã°ã»ã«ãŒããåçãããŸããã + ã³ãŒãªã³ã°ã«ãŒããåçãããŸããã </notification> <notification name="CallingCardDeclined"> - ã³ãŒãªã³ã°ã»ã«ãŒããæåŠãããŸããã + ã³ãŒãªã³ã°ã«ãŒããæåŠãããŸããã </notification> <notification name="TeleportToLandmark"> ç»é¢å³ã®ãå Žæãããã«ãéããŠããã©ã³ãããŒã¯ãã¿ããéžã¶ãšã[NAME] ãšãã£ãå Žæã«ãã¬ããŒãã§ããŸãã @@ -2153,10 +2146,10 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã </form> </notification> <notification name="TransferObjectsHighlighted"> - ãã®åºç»äžã«ååšãããªããžã§ã¯ãã®ãã¡ããã®åºç»ã®è³Œå
¥è
ã«è²æž¡ããããªããžã§ã¯ãããã¹ãŠåŒ·èª¿è¡šç€ºãããŸãã + ãã®åºç»ã®è³Œå
¥è
ã«åãæž¡ããããªããžã§ã¯ãã¯ããã¹ãŠåºç»äžã§åŒ·èª¿è¡šç€ºãããŠããŸãã -*è²æž¡ãããæš¹æšãæ€ç©ã¯ã匷調衚瀺ãããŸããã +*åãæž¡ãããæš¹æšãæ€ç©ã¯ã匷調衚瀺ãããŠããŸããã <form name="form"> <button name="Done" text="å®äº"/> </form> @@ -2178,27 +2171,27 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã ãã©ã°ã€ã³ãã€ã³ã¹ããŒã«ããªããããåé¡ã解決ããªãå Žåã¯ã¡ãŒã«ãŒã«ãåãåãããã ããã <form name="form"> - <ignore name="ignore" text="ã¡ãã£ã¢ãã©ã°ã€ã³ã®å®è¡ã«å€±æ"/> + <ignore name="ignore" text="ã¡ãã£ã¢ãã©ã°ã€ã³ã®å®è¡ã«å€±æãããšã"/> </form> </notification> <notification name="OwnedObjectsReturned"> - éžæããåå°ã®åºç»äžã«ãã£ãããªãã®ãªããžã§ã¯ãã¯ãããªãã®æã¡ç©ã«è¿åŽãããŸããã + éžæããåå°ã®åºç»äžã«ãã£ãããªãã®ãªããžã§ã¯ãã¯ããã¹ãŠããªãã®ãæã¡ç©ãã«è¿åŽãããŸããã </notification> <notification name="OtherObjectsReturned"> - éžæãããŠããåå°ã®åºç»äžã«ãã£ã + éžæããåå°ã®åºç»äžã«ãã£ã [FIRST] [LAST] - ãææãããªããžã§ã¯ãã¯ããªãŒããŒã®æã¡ç©ã«è¿åŽãããŸããã + ãææãããªããžã§ã¯ãã¯ããã¹ãŠææè
ã®ãæã¡ç©ãã«è¿åŽãããŸããã </notification> <notification name="OtherObjectsReturned2"> - ã[NAME]ããšããååã®äœäººãææãããéžæããåºç»ã«ãããªããžã§ã¯ãã¯ãææè
ã«è¿åŽãããŸããã + ã [NAME] ããšããååã®äœäººãææãããéžæããåºç»äžã®ãªããžã§ã¯ãã¯ãæ¬äººã«è¿åŽãããŸããã </notification> <notification name="GroupObjectsReturned"> - éžæãããŠããåºç»äžã«ããã[GROUPNAME] ãšããã°ã«ãŒããšå
±æã ã£ããªããžã§ã¯ãã¯ããªãŒããŒã®æã¡ç©ã«è¿åŽãããŸããã -è²æž¡ãããŠããè²æž¡å¯èœãªãªããžã§ã¯ãã¯ãåã®ãªãŒããŒã«è¿åŽãããŸããã -ã°ã«ãŒãã«è²æž¡ãããŠããè²æž¡äžå¯èœãªãªããžã§ã¯ãã¯ãåé€ãããŸããã + éžæããåºç»äžã®ã[GROUPNAME] ãšããã°ã«ãŒããšå
±æããŠãããªããžã§ã¯ãã¯ãããããã®ææè
ã®ãæã¡ç©ãã«è¿åŽãããŸããã +è²æž¡ãããŠãããå販ã»ãã¬ãŒã³ãå¯ãã®ãªããžã§ã¯ãã¯ã以åã®ææè
ã«è¿åŽãããŸããã +ã°ã«ãŒãã«è²æž¡ãããŠãããå販ã»ãã¬ãŒã³ãäžå¯ãã®ãªããžã§ã¯ãã¯ãåé€ãããŸããã </notification> <notification name="UnOwnedObjectsReturned"> - éžæãããåå°ã®åºç»äžã«ãããããªãã®ææã§ããªãã£ãããªããžã§ã¯ãã¯ãæ¬æ¥ã®ãªãŒããŒã«è¿åŽãããŸããã + éžæããåå°ã®åºç»äžã®ãããªãã®ææç©ã§ã¯ããªãã£ãããªããžã§ã¯ãã¯ãæ¬æ¥ã®ææè
ã«è¿åŽãããŸããã </notification> <notification name="ServerObjectMessage"> [NAME] ããã®ã¡ãã»ãŒãžïŒ @@ -2206,7 +2199,7 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã </notification> <notification name="NotSafe"> ãã®åå°ã§ã¯ãã¡ãŒãžãæå¹ã§ãã -ã±ã¬ããããããããŸããã æ»ãã§ããŸã£ãå Žåã¯ããŒã ã«ãã¬ããŒããããŸãã +ã±ã¬ããããããããŸããã æ»ãã§ããŸã£ãå Žåã¯ãããŒã ãã«ãã¬ããŒããããŸãã </notification> <notification name="NoFly"> ãã®ãšãªã¢ã§ã¯é£è¡ãçŠæ¢ãããŠããŸãã @@ -2222,41 +2215,41 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã ãã®ãšãªã¢ã§ã¯å¶äœãçŠæ¢ãããŠããŸãã ãªããžã§ã¯ããå¶äœããã Rez ããããšã¯ã§ããŸããã </notification> <notification name="ScriptsStopped"> - 管çè
ããã®å°åå
ã®ã¹ã¯ãªãããäžæåæ¢ãããŸããã + 管çè
ããã®ãªãŒãžã§ã³ã®ã¹ã¯ãªãããäžæåæ¢ããŸããã </notification> <notification name="ScriptsNotRunning"> - ãã®å°åã§ã¯ã¹ã¯ãªããã®äœ¿çšãçŠæ¢ãããŠããŸã + ãã®ãªãŒãžã§ã³ã§ã¯ã¹ã¯ãªããã®äœ¿çšãçŠæ¢ãããŠããŸãã </notification> <notification name="NoOutsideScripts"> ãã®åå°ã§ã¯ãå€éšã®ã¹ã¯ãªãããçŠæ¢ãããŠããŸãã -åå°ææè
ã®ãã®ä»¥å€ã¯ã¹ã¯ãªããã¯å®è¡ãããŸããã +åå°ææè
ã®ãã®ä»¥å€ã¯ã¹ã¯ãªãããå®è¡ãããŸããã </notification> <notification name="ClaimPublicLand"> ãã®ãªãŒãžã§ã³ã«ããªããšå
Œ
±ã®åå°ãååŸããããšã¯ã§ããŸããã </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"> ç®çå°ã«å
¥ãèš±å¯ããããŸããã @@ -2274,20 +2267,20 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã ãã¬ããŒãããã£ã³ã»ã«ãããŸããã </notification> <notification name="FullRegionTryAgain"> - å
¥ãããšããŠããå°åïŒãªãŒãžã§ã³ïŒã¯çŸåšæºå¡ã§ãã + å
¥ãããšããŠãããªãŒãžã§ã³ïŒå°åïŒã¯çŸåšæºå¡ã§ãã ãã°ããããŠããå床ãè©Šããã ããã </notification> <notification name="GeneralFailure"> ãããã倱æ </notification> <notification name="RoutedWrongRegion"> - ç°ãªãå°åïŒãªãŒãžã§ã³ïŒã«è¿åãããŸããã ããäžåºŠãè©Šããã ããã + ç°ãªããªãŒãžã§ã³ïŒå°åïŒã«è¿åãããŸããã ããäžåºŠãè©Šããã ããã </notification> <notification name="NoValidAgentID"> - ãšãŒãžã§ã³ãIDãç¡å¹ã§ãã + ãšãŒãžã§ã³ã ID ãç¡å¹ã§ãã </notification> <notification name="NoValidSession"> - ã»ãã·ã§ã³IDãç¡å¹ã§ãã + ã»ãã·ã§ã³ ID ãç¡å¹ã§ãã </notification> <notification name="NoValidCircuit"> åè·¯ã³ãŒããç¡å¹ã§ãã @@ -2302,7 +2295,7 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã å
éšãšã©ãŒãçºçããŸããã </notification> <notification name="NoGoodTPDestination"> - ãã®å°åïŒãªãŒãžã§ã³ïŒã§ã¯é©åãªãã¬ããŒãç®çå°ãèŠã€ãããŸããã§ããã + ãã®ãªãŒãžã§ã³ïŒå°åïŒã§ã¯é©åãªãã¬ããŒãç®çå°ãèŠã€ãããŸããã§ããã </notification> <notification name="InternalErrorRegionResolver"> å
éšãšã©ãŒãçºçããŸããã @@ -2314,7 +2307,7 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã æå¹ãªåºç»ãèŠã€ãããŸããã§ããã </notification> <notification name="ObjectGiveItem"> - [NAME_SLURL] ãææãã [OBJECTFROMNAME] ãšããååã®ãªããžã§ã¯ãããããªãã«ãã® [OBJECTTYPE] ãæž¡ããŸããïŒ + [NAME_SLURL] ãææãã [OBJECTFROMNAME] ãšããååã®ãªããžã§ã¯ãããããªãã« [OBJECTTYPE] ãæž¡ããŸããïŒ [ITEM_SLURL] <form name="form"> <button name="Keep" text="åãåã"/> @@ -2323,7 +2316,7 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã </form> </notification> <notification name="ObjectGiveItemUnknownUser"> - ïŒäžæã®äœäººïŒãææãã [OBJECTFROMNAME] ãšããååã®ãªããžã§ã¯ãããããªãã«ãã® [OBJECTTYPE] ãæž¡ããŸããïŒ + ïŒäžæã®äœäººïŒãææãã [OBJECTFROMNAME] ãšããååã®ãªããžã§ã¯ãããããªãã« [OBJECTTYPE] ãæž¡ããŸããïŒ [ITEM_SLURL] <form name="form"> <button name="Keep" text="åãåã"/> @@ -2332,7 +2325,7 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã </form> </notification> <notification name="UserGiveItem"> - [NAME_SLURL] ãããªãã«ãã® [OBJECTTYPE] ãæž¡ããŸããïŒ + [NAME_SLURL] ãããªãã« [OBJECTTYPE] ãæž¡ããŸããïŒ [ITEM_SLURL] <form name="form"> <button name="Show" text="衚瀺"/> @@ -2379,7 +2372,7 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã [MESSAGE] -ïŒããã©ã«ãã§ãäºãã®ãªã³ã©ã€ã³ã»ã¹ããŒã¿ã¹ãèŠãããšãã§ããããã«ãªããŸããïŒ +ïŒããã©ã«ãã§ãäºãã®ãªã³ã©ã€ã³ç¶æ
ãèŠãããšãã§ããããã«ãªããŸããïŒ <form name="form"> <button name="Accept" text="åãå
¥ãã"/> <button name="Decline" text="èŸé"/> @@ -2392,21 +2385,21 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã [NAME]ã¯ã ãã¬ã³ãç»é²ãç³ã蟌ãã§ããŸãã -ïŒããã©ã«ãã§ãäºãã®ãªã³ã©ã€ã³ã»ã¹ããŒã¿ã¹ãèŠãããšãã§ããããã«ãªããŸããïŒ +ïŒããã©ã«ãã§ãäºãã®ãªã³ã©ã€ã³ç¶æ
ãèŠãããšãã§ããããã«ãªããŸããïŒ <form name="form"> <button name="Accept" text="åãå
¥ãã"/> <button name="Decline" text="æåŠ"/> </form> </notification> <notification name="FriendshipAccepted"> - [NAME]ã¯ããã¬ã³ã ç»é²ãåãå
¥ããŸããã + [NAME]ã¯ããã¬ã³ãç»é²ãåãå
¥ããŸããã </notification> <notification name="FriendshipDeclined"> - [NAME]ã¯ããã¬ã³ã ç»é²ãæããŸããã + [NAME]ã¯ããã¬ã³ãç»é²ãæããŸããã </notification> <notification name="OfferCallingCard"> [FIRST] [LAST] ãã³ãŒãªã³ã°ã«ãŒããæž¡ãããšããŠããŸãã -ããªãã®æã¡ç©ã«ããã¯ããŒã¯ãè¿œå ããããã®äœäººã«çŽ æ©ã IM ãéãããšãã§ããŸãã +ããªãã®ãæã¡ç©ãã«ããã¯ããŒã¯ãè¿œå ããããã®äœäººã«çŽ æ©ã IM ãéãããšãã§ããŸãã <form name="form"> <button name="Accept" text="åãå
¥ãã"/> <button name="Decline" text="èŸé"/> @@ -2421,27 +2414,27 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã ãã®ãŸãŸããã«ãããšãã°ã¢ãŠããããŸãã </notification> <notification name="LoadWebPage"> - ãŠã§ãã»ããŒãž[URL]ãããŒãããŸããïŒ + Web ããŒãž [URL] ãèªã¿èŸŒã¿ãŸããïŒ [MESSAGE] -ããŒãå
ã®ãªããžã§ã¯ãïŒ[OBJECTNAME]ããªãŒããŒïŒ[NAME]ïŒ +èªã¿èŸŒã¿å
ã®ãªããžã§ã¯ãïŒ[OBJECTNAME]ãææè
ïŒ[NAME]ïŒ <form name="form"> <button name="Gotopage" text="移å"/> <button name="Cancel" text="åãæ¶ã"/> </form> </notification> <notification name="FailedToFindWearableUnnamed"> - ããŒã¿ããŒã¹ã«[TYPE]ãèŠã€ãããŸããã§ãã + ããŒã¿ããŒã¹ã« [TYPE] ãèŠã€ãããŸããã§ãã </notification> <notification name="FailedToFindWearable"> - ããŒã¿ããŒã¹ã«[DESC]ãšããååã®[TYPE]ãèŠã€ãããŸããã§ããã + ããŒã¿ããŒã¹ã« [DESC] ãšããååã® [TYPE] ãèŠã€ãããŸããã§ããã </notification> <notification name="InvalidWearable"> ççšããããšããŠããã¢ã€ãã ã¯ããªãã®ãã¥ãŒã¯ã§ã¯èªã¿èŸŒãããšãã§ããŸããã [APP_NAME] ã®ããŒãžã§ã³ãã¢ããã°ã¬ãŒãããŠãããã®ã¢ã€ãã ãççšããŠãã ããã </notification> <notification name="ScriptQuestion"> - ã[NAME]ããææãããªããžã§ã¯ãã[OBJECTNAME]ããïŒ + [NAME] ãææãããªããžã§ã¯ãã [OBJECTNAME] ããïŒ [QUESTIONS] ããããã§ããïŒ @@ -2465,14 +2458,14 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã </form> </notification> <notification name="ScriptDialog"> - [FIRST] [LAST]ã®ã[TITLE]ã + [FIRST] [LAST] ã®ã [TITLE] ã [MESSAGE] <form name="form"> <button name="Ignore" text="ç¡èŠãã"/> </form> </notification> <notification name="ScriptDialogGroup"> - [GROUPNAME]ã®ã[TITLE]ã + [GROUPNAME] ã®ã [TITLE] ã [MESSAGE] <form name="form"> <button name="Ignore" text="ç¡èŠãã"/> @@ -2495,9 +2488,9 @@ WebããŒãžã«ããããªã³ã¯ãããšãä»äººããã®å Žæã«ç°¡åã«ã </notification> <notification name="FirstOverrideKeys"> ããªãã®ç§»åããŒããªããžã§ã¯ããæäœããŠããŸãã -ç¢å°ãAWSDã®ããŒã§åäœã確èªããŠãã ããã -éãªã©ã®ãªããžã§ã¯ãã ãšãäžäººç§°èŠç¹ïŒããŠã¹ã«ãã¯ïŒã«å€æŽããå¿
èŠããããŸãã -MããŒãæŒããŠå€æŽããŸãã +ç¢å°ã AWSD ã®ããŒã§åäœã確èªããŠãã ããã +éãªã©ã®ãªããžã§ã¯ãã ãšãäžäººç§°èŠç¹ã«å€æŽããå¿
èŠããããŸãã +M ããŒãæŒããŠå€æŽããŸãã </notification> <notification name="FirstSandbox"> ããã¯ãµã³ãããã¯ã¹ãšãªã¢ã§ããäœäººãå¶äœãåŠã¶ããšãã§ããŸãã @@ -2505,7 +2498,7 @@ MããŒãæŒããŠå€æŽããŸãã ããã§å¶äœããããã®ã¯æéãçµã€ãšåé€ãããŸããå¶äœããã¢ã€ãã ãå³ã¯ãªãã¯ããŠãåãããéžã³ãæã¡ç©ã«å
¥ããŠãæã¡åž°ãããã®ããå¿ããªãã </notification> <notification name="MaxListSelectMessage"> - ãã®ãªã¹ããã[MAX_SELECT]åãŸã§ã®ã¢ã€ãã ãéžæã§ããŸãã + ãã®ãªã¹ããã [MAX_SELECT] åãŸã§ã®ã¢ã€ãã ãéžæã§ããŸãã </notification> <notification name="VoiceInviteP2P"> [NAME] ãããªãããã€ã¹ãã£ããã³ãŒã«ã«æåŸ
ããŠããŸãã @@ -2526,7 +2519,7 @@ MããŒãæŒããŠå€æŽããŸãã [FIRST] [LAST] ã¯ã¢ã€ãã ãåãåããèªåçã«ãããã¯ã解é€ãããŸããã </notification> <notification name="VoiceInviteGroup"> - [NAME] 㯠[GROUP]. ã®ãã€ã¹ãã£ããã³ãŒã«ã«åå ããŸããã + [NAME] 㯠[GROUP] ã®ãã€ã¹ãã£ããã³ãŒã«ã«åå ããŸããã åãå
¥ãããã¯ãªãã¯ããããæãå Žåã¯æåŠãã¯ãªãã¯ããŠãã ããã ãããã¯ãã¯ãªãã¯ãããšããã®çºä¿¡è
ããããã¯ããŸãã <form name="form"> <button name="Accept" text="åãå
¥ãã"/> @@ -2553,7 +2546,7 @@ MããŒãæŒããŠå€æŽããŸãã </form> </notification> <notification name="VoiceChannelFull"> - ããªããåå ããããšããŠãããã€ã¹ã³ãŒã«[VOICE_CHANNEL_NAME]ã¯ãåå è
ãæ倧éã«éããŸãããåŸã§ããäžåºŠãè©Šããã ããã + ããªããåå ããããšããŠãããã€ã¹ã³ãŒã« [VOICE_CHANNEL_NAME] ã¯ãåå è
ãæ倧éã«éããŸãããåŸã§ããäžåºŠãè©Šããã ããã </notification> <notification name="ProximalVoiceChannelFull"> ãã®ãšãªã¢ã®ãã€ã¹ãã£ããã¯ãæ··éã®ãã容éãè¶
ããŠããŸã£ãŠããŸããç³ãèš³ãããŸããããä»ã®ãšãªã¢ã§ãã€ã¹ãã£ããããè©Šããã ããã @@ -2574,7 +2567,7 @@ MããŒãæŒããŠå€æŽããŸãã [VOICE_CHANNEL_NAME] ãžã®æ¥ç¶ã«å€±æããŸãããããšã§å床ãè©Šããã ããã ãè¿ãã®ãã€ã¹ãã£ãããã«åæ¥ç¶ãããŸãã </notification> <notification name="VoiceLoginRetry"> - ããªãçšã®ãã€ã¹ãã£ã³ãã«ãäœæããŠããŸãã1åã»ã©ããããŸãã + ãã€ã¹ãã£ã³ãã«ãäœæããŠããŸãã1 åã»ã©ããããŸãã </notification> <notification name="Cannot enter parcel: not a group member"> ç¹å®ã®ã°ã«ãŒãã¡ã³ããŒã®ã¿ãã®ãšãªã¢ã蚪åããããšãã§ããŸãã @@ -2583,13 +2576,13 @@ MããŒãæŒããŠå€æŽããŸãã ç«å
¥çŠæ¢ãããŠãããããåºç»ã«å
¥ãããšãã§ããŸããã </notification> <notification name="Cannot enter parcel: not on access list"> - ã¢ã¯ã»ã¹ã»ãªã¹ãã«å«ãŸããŠããªããããåºç»ã«å
¥ãããšãã§ããŸããã + ã¢ã¯ã»ã¹ãªã¹ãã«å«ãŸããŠããªããããåºç»ã«å
¥ãããšãã§ããŸããã </notification> <notification name="VoiceNotAllowed"> - ããªãã«ã¯[VOICE_CHANNEL_NAME]ã®ãã€ã¹ã»ãã£ããã«æ¥ç¶ããæš©éããããŸããã + ããªãã«ã¯ [VOICE_CHANNEL_NAME] ã®ãã€ã¹ãã£ããã«æ¥ç¶ããæš©éããããŸããã </notification> <notification name="VoiceCallGenericError"> - [VOICE_CHANNEL_NAME]ã®ãã€ã¹ã»ãã£ããã«æ¥ç¶äžã«ããšã©ãŒãçºçããŸãããåŸã§ããäžåºŠãè©Šããã ããã + [VOICE_CHANNEL_NAME] ã®ãã€ã¹ãã£ããã«æ¥ç¶äžã«ããšã©ãŒãçºçããŸãããåŸã§ããäžåºŠãè©Šããã ããã </notification> <notification name="ServerVersionChanged"> ç°ãªããµãŒããŒããŒãžã§ã³ã®ãªãŒãžã§ã³ã«æ¥ãŸãããããã©ãŒãã³ã¹ã«åœ±é¿ããããšããããŸãã [[URL] ãªãªãŒã¹ããŒãã確èª] @@ -2656,13 +2649,13 @@ MããŒãæŒããŠå€æŽããŸãã 510 </global> <global name="UnsupportedGPU"> - - ããªãã®ã°ã©ãã£ãã¯ã»ã«ãŒãã¯å¿
é åäœç°å¢ã®æ¡ä»¶ãæºãããŠããŸããã + - ããªãã®ã°ã©ãã£ãã¯ã«ãŒãã¯å¿
é åäœç°å¢ã®æ¡ä»¶ãæºãããŠããŸããã </global> <global name="UnsupportedRAM"> - - ããªãã®ã·ã¹ãã ã»ã¡ã¢ãªã¯å¿
é åäœç°å¢ã®æ¡ä»¶ãæºãããŠããŸããã + - ããªãã®ã·ã¹ãã ã¡ã¢ãªã¯å¿
é åäœç°å¢ã®æ¡ä»¶ãæºãããŠããŸããã </global> <global name="You can only set your 'Home Location' on your land or at a mainland Infohub."> - èªåã®åå°ããæã¡ã®å ŽåãããŒã ãã±ãŒã·ã§ã³ã«èšå®ã§ããŸãã -ãæã¡ã§ãªãå Žåã¯ãå°å³ã§ãã€ã³ãã©ããããæ¢ããŠãã ããã + èªåã®åå°ããæã¡ã®å ŽåããããŒã ãã«èšå®ã§ããŸãã +ãæã¡ã§ãªãå Žåã¯ãå°å³ã§ãã€ã³ãã©ãããããæ¢ããã ããã </global> </notifications> diff --git a/indra/newview/skins/default/xui/ja/panel_bottomtray.xml b/indra/newview/skins/default/xui/ja/panel_bottomtray.xml index 81a852522b..f12f07f3e9 100644 --- a/indra/newview/skins/default/xui/ja/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/ja/panel_bottomtray.xml @@ -7,6 +7,11 @@ ãã€ã¹ã³ã³ãããŒã«ããã«ã®è¡šç€ºã»é衚瀺 </string> <layout_stack name="toolbar_stack"> + <layout_panel name="speak_panel"> + <talk_button name="talk"> + <speak_button label="話ã" label_selected="話ã" name="speak_btn"/> + </talk_button> + </layout_panel> <layout_panel name="gesture_panel"> <gesture_combo_list label="ãžã§ã¹ãã£ãŒ" name="Gesture" tool_tip="ãžã§ã¹ãã£ãŒã®è¡šç€ºã»é衚瀺"/> </layout_panel> diff --git a/indra/newview/skins/default/xui/ja/panel_friends.xml b/indra/newview/skins/default/xui/ja/panel_friends.xml index 97e58ceaed..0c7114dbb7 100644 --- a/indra/newview/skins/default/xui/ja/panel_friends.xml +++ b/indra/newview/skins/default/xui/ja/panel_friends.xml @@ -3,8 +3,8 @@ <string name="Multiple"> è€æ°ã®ãã¬ã³ã </string> - <scroll_list name="friend_list" tool_tip="è€æ°ã®ãã¬ã³ããéžæããã«ã¯ãShiftããŒãŸãã¯CtrlããŒãæŒããªããååãã¯ãªãã¯ããŸãã"> - <column name="icon_online_status" tool_tip="ãªã³ã©ã€ã³ç¶æ³"/> + <scroll_list name="friend_list" tool_tip="è€æ°ã®ãã¬ã³ããéžæããã«ã¯ãShift ããŒãŸã㯠Ctrl ããŒãæŒããªããååãã¯ãªãã¯ããŸãã"> + <column name="icon_online_status" tool_tip="ãªã³ã©ã€ã³ç¶æ
"/> <column label="åå" name="friend_name" tool_tip="åå"/> <column name="icon_visible_online" tool_tip="ãã¬ã³ãã¯ãããªãããªã³ã©ã€ã³ãã©ãã確èªããããšãã§ããŸãã"/> <column name="icon_visible_map" tool_tip="ãã¬ã³ãã¯ãå°å³ã§ããªãã®å±
å ŽæãèŠã€ããããšãã§ããŸãã"/> @@ -15,7 +15,7 @@ <text name="friend_name_label" right="-10"> ãã¬ã³ããéžæããŠæš©å©ãå€æŽ... </text> - <check_box label="ãªã³ã©ã€ã³ç¶æ³ã®ç¢ºèªãèš±å¯ãã" name="online_status_cb" tool_tip="ã³ãŒãªã³ã°ã«ãŒããããã¯ãã¬ã³ããªã¹ãã§ãã®ãã¬ã³ãããªã³ã©ã€ã³ç¶æ³ã確èªã§ããããèšå®ããŸã"/> + <check_box label="ãªã³ã©ã€ã³ç¶æ
ã®ç¢ºèªãèš±å¯ãã" name="online_status_cb" tool_tip="ã³ãŒãªã³ã°ã«ãŒããããã¯ãã¬ã³ããªã¹ãã§ãã®ãã¬ã³ãããªã³ã©ã€ã³ç¶æ
ã確èªã§ããããèšå®ããŸã"/> <check_box label="äžçå°å³äžã§ããªãã®å±
å Žæãæ€çŽ¢å¯èœã«ãã" name="map_status_cb" tool_tip="ãã®ãã¬ã³ããå°å³ã§ç§ã®äœçœ®ãçºèŠã§ããããã«èšå®ããŸã"/> <check_box label="ãªããžã§ã¯ãã®ä¿®æ£ãèš±å¯ãã" name="modify_status_cb" tool_tip="ãã®ãã¬ã³ãã«ç§ã®ãªããžã§ã¯ããæ¹é ããèš±å¯ãäžããŸã"/> <text name="process_rights_label"> @@ -23,7 +23,7 @@ </text> </panel> <pad left="-95"/> - <button label="IMã»ã³ãŒã«" name="im_btn" tool_tip="ã€ã³ã¹ã¿ã³ãã¡ãã»ãŒãžã»ã»ãã·ã§ã³ãéããŸãã" width="90"/> + <button label="IMã»ã³ãŒã«" name="im_btn" tool_tip="ã€ã³ã¹ã¿ã³ãã¡ãã»ãŒãžã»ãã·ã§ã³ãéããŸãã" width="90"/> <button label="ãããã£ãŒã«" name="profile_btn" tool_tip="åçãã°ã«ãŒããããã³ãã®ä»ã®æ
å ±ã衚瀺ããŸãã" width="90"/> <button label="ãã¬ããŒã" name="offer_teleport_btn" tool_tip="ãã®ãã¬ã³ãã«ãããªãã®çŸåšå°ãžã®ãã¬ããŒããç³ãåºãŸãã" width="90"/> <button label="æ¯æã" name="pay_btn" tool_tip="ãªã³ãã³ãã« (L$) ããã®ãã¬ã³ãã«ãããŸãã" width="90"/> diff --git a/indra/newview/skins/default/xui/ja/panel_group_general.xml b/indra/newview/skins/default/xui/ja/panel_group_general.xml index 17cfafc54d..a8df9aef80 100644 --- a/indra/newview/skins/default/xui/ja/panel_group_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_general.xml @@ -14,7 +14,7 @@ <panel name="group_info_top"> <texture_picker label="" name="insignia" tool_tip="ã¯ãªãã¯ããŠåçãéžæããŸã"/> <text name="prepend_founded_by"> - åµå§è
ïŒ + åµèšè
ïŒ </text> <name_box initial_value="ïŒååŸäžïŒ" name="founder_name"/> <text name="join_cost_text"> diff --git a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml index cfc0629ddb..4166108472 100644 --- a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml @@ -26,10 +26,10 @@ </accordion> </layout_panel> <layout_panel name="button_row"> - <button name="btn_create" tool_tip="æ°ããã°ã«ãŒããäœæ"/> <button label="ãã£ãã" name="btn_chat"/> <button label="ã°ã«ãŒãã³ãŒã«" name="btn_call" tool_tip="ãã®ã°ã«ãŒãã«ã³ãŒã«ãã"/> <button label="ä¿å" label_selected="ä¿å" name="btn_apply"/> + <button label="ã°ã«ãŒããäœæ" name="btn_create" tool_tip="æ°ããã°ã«ãŒããäœæ"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_me.xml b/indra/newview/skins/default/xui/ja/panel_me.xml index 523a3fa594..dda5bc0009 100644 --- a/indra/newview/skins/default/xui/ja/panel_me.xml +++ b/indra/newview/skins/default/xui/ja/panel_me.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="My Profile!!!!!" name="panel_me"> +<panel label="ã〠ãããã£ãŒã«" name="panel_me"> <tab_container name="tabs"> <panel label="ã〠ãããã£ãŒã«" name="panel_profile"/> <panel label="ã〠ããã¯" name="panel_picks"/> diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml index eba26bbe3d..6321dbb048 100644 --- a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml @@ -15,14 +15,14 @@ </text> <text name="current_url" tool_tip="ã¡ãã£ã¢ãœãŒã¹ã®çŸåšã®ããŒãž" value=""/> <button label="ãªã»ãã" name="current_url_reset_btn"/> - <check_box initial_value="false" label="èªåã«ãŒã" name="auto_loop"/> - <check_box initial_value="false" label="æåã®ã¯ãªãã¯" name="first_click_interact"/> + <check_box initial_value="false" label="ã«ãŒãåç" name="auto_loop"/> + <check_box initial_value="false" label="æåã«ã¯ãªãã¯ãããšãã®åäœ" name="first_click_interact"/> <check_box initial_value="false" label="èªåãºãŒã " name="auto_zoom"/> <check_box initial_value="false" label="èªåã¡ãã£ã¢åç" name="auto_play"/> <text name="media_setting_note"> 泚æïŒ äœäººã¯ãã®èšå®ãç¡èŠã§ããŸã </text> - <check_box initial_value="false" label="ãªããžã§ã¯ãã®è¡šé¢ã®ã¡ãã£ã¢ã®èªåã¹ã±ãŒã«" name="auto_scale"/> + <check_box initial_value="false" label="ãªããžã§ã¯ãã®è¡šé¢ãµã€ãºã«åãããŠèªå調æŽ" name="auto_scale"/> <text name="size_label"> ãµã€ãºïŒ </text> diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml index 6accbd4852..ea4fdb9ce5 100644 --- a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="ã»ãã¥ãªãã£" name="Media Settings Security"> - <check_box initial_value="false" label="æå®ããURLãã¿ãŒã³ã®ã¿ã¢ã¯ã»ã¹ãèš±å¯ãã" name="whitelist_enable"/> + <check_box initial_value="false" label="æå®ãã URL ãã¿ãŒã³ããå§ãŸãæ¥ç¶ãèš±å¯ãã" name="whitelist_enable"/> <text name="home_url_fails_some_items_in_whitelist"> - ããŒã ããŒãžã«å€±æãããšã³ããªãŒãããŒã¯ãããŸããïŒ + ããŒã ããŒãžã«å€±æãããšã³ããªãŒããããŸããïŒ </text> <button label="è¿œå " name="whitelist_add"/> <button label="åé€" name="whitelist_del"/> <text name="home_url_fails_whitelist"> - èŠåïŒ ãäžè¬ãã¿ãã§æå®ãããããŒã ããŒãžã¯ããã®ãã¯ã€ããªã¹ãããã¹ã§ããŸããã§ããã æå¹ãªãšã³ããªãŒãè¿œå ããããŸã§ã¯ãç¡å¹ã«ãªããŸãã + èŠåïŒ ãäžè¬ãã¿ãã§æå®ãããããŒã ããŒãžã¯ããã¯ã€ããªã¹ãã«æ²èŒãããŠããŸããã æ£ããæ©èœãèšå®ããããŸã§ããã®æ©èœã¯äžæåæ¢ããŸãã </text> </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 new file mode 100644 index 0000000000..ca93d46e4d --- /dev/null +++ b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="nearby_media"> + <string name="media_item_count_format"> + ïŒã¡ãã£ã¢ã¢ã€ãã %ld ïŒ + </string> + <string name="empty_item_text"> + <空> + </string> + <string name="parcel_media_name"> + åºç»ã¹ããªãŒãã³ã°ã¡ãã£ã¢ + </string> + <string name="parcel_audio_name"> + åºç»ã¹ããªãŒãã³ã°ãªãŒãã£ãª + </string> + <string name="playing_suffix"> + ïŒåçäžïŒ + </string> + <panel name="minimized_controls"> + <button label="ãã¹ãŠåæ¢" name="all_nearby_media_disable_btn" tool_tip="è¿ãã®ã¡ãã£ã¢ããã¹ãŠãªãã«ããŸã"/> + <button label="ãã¹ãŠéå§" name="all_nearby_media_enable_btn" tool_tip="è¿ãã®ã¡ãã£ã¢ããã¹ãŠãªã³ã«ããŸã"/> + <button name="open_prefs_btn" tool_tip="ã¡ãã£ã¢ã®èšå®ãéããŸã"/> + <button label="詳现 >>" label_selected="ç°¡æ <<" name="more_less_btn" tool_tip="ã¢ããã³ã¹ã³ã³ãããŒã«"/> + </panel> + <panel name="nearby_media_panel"> + <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> + <scroll_list name="media_list"> + <scroll_list.columns label="è¿æ¥" name="media_proximity"/> + <scroll_list.columns label="衚瀺" name="media_visibility"/> + <scroll_list.columns label="ã¯ã©ã¹" name="media_class"/> + <scroll_list.columns label="åå" name="media_name"/> + <scroll_list.columns label="ãããã°" name="media_debug"/> + </scroll_list> + <panel> + <layout_stack name="media_controls"> + <layout_panel name="stop"> + <button name="stop_btn" tool_tip="éžæããã¡ãã£ã¢ãåæ¢"/> + </layout_panel> + <layout_panel name="play"> + <button name="play_btn" tool_tip="éžæããã¡ãã£ã¢ãåç"/> + </layout_panel> + <layout_panel name="pause"> + <button name="pause_btn" tool_tip="éžæããã¡ãã£ã¢ãäžæåæ¢"/> + </layout_panel> + <layout_panel name="volume_slider_ctrl"> + <slider_bar initial_value="0.5" name="volume_slider" tool_tip="éžæããã¡ãã£ã¢ã®é³é"/> + </layout_panel> + <layout_panel name="mute"> + <button name="mute_btn" tool_tip="éžæããã¡ãã£ã¢ã®é³ããã¥ãŒã"/> + </layout_panel> + <layout_panel name="zoom"> + <button name="zoom_btn" tool_tip="éžæããã¡ãã£ã¢ã«è¿ã¥ã"/> + </layout_panel> + <layout_panel name="unzoom"> + <button name="unzoom_btn" tool_tip="éžæããã¡ãã£ã¢ããé ããã"/> + </layout_panel> + </layout_stack> + </panel> + </panel> +</panel> diff --git a/indra/newview/skins/default/xui/ja/panel_notes.xml b/indra/newview/skins/default/xui/ja/panel_notes.xml index 6023bf125f..cbeb5a7f97 100644 --- a/indra/newview/skins/default/xui/ja/panel_notes.xml +++ b/indra/newview/skins/default/xui/ja/panel_notes.xml @@ -6,7 +6,7 @@ <panel name="profile_scroll_panel"> <text name="status_message" value="å人çã¡ã¢ïŒ"/> <text name="status_message2" value="ãã®äººã«èš±å¯ïŒ"/> - <check_box label="ãªã³ã©ã€ã³ç¶æ³ã®ç¢ºèª" name="status_check"/> + <check_box label="ãªã³ã©ã€ã³ç¶æ
ã®ç¢ºèª" name="status_check"/> <check_box label="å°å³ã§å±
å Žæã確èª" name="map_check"/> <check_box label="ç§ã®ãªããžã§ã¯ãã®ç·šéã»åé€ã»ååŸ" name="objects_check"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_online_status.xml b/indra/newview/skins/default/xui/ja/panel_online_status.xml new file mode 100644 index 0000000000..fdc489f375 --- /dev/null +++ b/indra/newview/skins/default/xui/ja/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/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml index 81b9ed6a73..d6fe54fbd1 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml @@ -39,7 +39,7 @@ </text> <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"/> + <check_box label="ãã£ããå±¥æŽã«æåã ã衚瀺ãã" name="plain_text_chat_history"/> <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/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml index 87febfb52d..b81889b412 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml @@ -3,23 +3,20 @@ <panel.string name="log_in_to_change"> ãã°ã€ã³ããŠå€æŽ </panel.string> - <button label="å±¥æŽã®æ¶å»" name="clear_cache"/> + <button label="å±¥æŽãæ¶å»" name="clear_cache" tool_tip="ãã°ã€ã³ç»åãæåŸã«ããå Žæããã¬ããŒãå±¥æŽãWebããã¯ã¹ãã£ãã£ãã·ã¥ãåé€ããŸã"/> <text name="cache_size_label_l"> ïŒäœçœ®ãç»åãwebãæ€çŽ¢å±¥æŽïŒ </text> - <check_box label="ç§ã®ãªã³ã©ã€ã³ç¶æ³ã確èªã§ããã®ã¯ããã¬ã³ããšã°ã«ãŒãã ã" name="online_visibility"/> - <check_box label="ãã¬ã³ããšã°ã«ãŒã以å€ããã¯ã³ãŒã«ãšIMãåä¿¡ããªã" name="voice_call_friends_only_check"/> - <check_box label="ã³ãŒã«ãçµäºããããã€ã¯ã®ã¹ã€ãããåã" name="auto_disengage_mic_check"/> - <check_box label="Cookieãåãå
¥ãã" name="cookies_enabled"/> - <check_box label="ã¡ãã£ã¢ãæå¹ã«ãã" name="media_enabled"/> - <check_box label="ã¡ãã£ã¢ãèªååçãã" name="autoplay_enabled"/> - <check_box label="é³æ¥œãæå¹ã«ãã" name="music_enabled"/> + <check_box label="ç§ã®ãªã³ã©ã€ã³ç¶æ
ã確èªã§ããã®ã¯ããã¬ã³ããšã°ã«ãŒãã ã" name="online_visibility"/> + <check_box label="ãã¬ã³ããšã°ã«ãŒã以å€ããã¯ã³ãŒã«ãš IM ãåä¿¡ããªã" name="voice_call_friends_only_check"/> + <check_box label="ã³ãŒã«ãçµäºãããèªåçã«ãã€ã¯ã®ã¹ã€ãããåã" name="auto_disengage_mic_check"/> + <check_box label="Cookie ãåãå
¥ãã" name="cookies_enabled"/> <text name="Logs:"> ãã°ïŒ </text> <check_box label="è¿ãã®ãã£ãããã°ãã³ã³ãã¥ãŒã¿ãŒã«ä¿åãã" name="log_nearby_chat"/> <check_box label="IM ãã°ãã³ã³ãã¥ãŒã¿ãŒã«ä¿åãã" name="log_instant_messages"/> - <check_box label="ã¿ã€ã ã¹ã¿ã³ããè¿œå ãã" name="show_timestamps_check_im"/> + <check_box label="æ¥æãå
¥ãã" name="show_timestamps_check_im"/> <text name="log_path_desc"> ãã°ã®ä¿åå ŽæïŒ </text> diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml index 1fb824a6d7..ad8c8437be 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml @@ -5,7 +5,7 @@ äžäººç§°èŠç¹ïŒ </text> <text name=" Mouse Sensitivity"> - ããŠã¹ã®ç²ŸåºŠ + ããŠã¹ã®æ床 </text> <check_box label="åãæ¿ã" name="invert_mouse"/> <text name="Network:"> @@ -34,13 +34,13 @@ WebïŒ </text> <radio_group name="use_external_browser"> - <radio_item label="å
èµãã©ãŠã¶ã䜿çš" name="internal" tool_tip="å
èµãã©ãŠã¶ã§ãã«ããWebãªã³ã¯ãªã©ãèŠãŸãã[APP_NAME] å
ã«æ°ãããŠã£ã³ããŠã§ãã®ãã©ãŠã¶ãéããŸãã" value="0"/> - <radio_item label="å€éšãã©ãŠã¶ïŒIEãFirefoxïŒã䜿çš" name="external" tool_tip="ããã©ã«ãã®ã·ã¹ãã Webãã©ãŠã¶ã§ãã«ããWebãªã³ã¯å
ãªã©ãèŠãŸããå
šç»é¢ã§èµ·åäžã«ã¯ããããããŸããã" value="1"/> + <radio_item label="å
èµãã©ãŠã¶ã䜿çš" name="internal" tool_tip="å
èµãã©ãŠã¶ã§ãã«ãã Web ãªã³ã¯ãªã©ãèŠãŸãã[APP_NAME] å
ã«æ°ãããŠã£ã³ããŠã§ãã®ãã©ãŠã¶ãéããŸãã" value="0"/> + <radio_item label="æå®ã®ãã©ãŠã¶ïŒIE ã FirefoxïŒã䜿çš" name="external" tool_tip="ããã©ã«ãã®ã·ã¹ãã Web ãã©ãŠã¶ã§ãã«ãã Web ãªã³ã¯å
ãªã©ãèŠãŸããå
šç»é¢ã§èµ·åäžã«ã¯ããããããŸããã" value="1"/> </radio_group> <check_box initial_value="false" label="Web ãããã·ãæå¹ã«ãã" name="web_proxy_enabled"/> <text name="Proxy location"> ãããã·ïŒ </text> - <line_editor name="web_proxy_editor" tool_tip="䜿çšãããããã·åãŸãã¯IPã¢ãã¬ã¹"/> + <line_editor name="web_proxy_editor" tool_tip="䜿çšãããããã·ã®ãã¹ãåãŸã㯠IP ã¢ãã¬ã¹"/> <spinner label="ããŒãçªå·ïŒ" name="web_proxy_port"/> </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 9fb0dd0b46..af64a217f6 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml @@ -2,15 +2,19 @@ <panel label="ãµãŠã³ã" name="Preference Media panel"> <slider label="å
šäœã®é³é" name="System Volume"/> <check_box initial_value="true" label="æå°åã§ãã¥ãŒã" name="mute_when_minimized"/> - <slider label="颚" name="Wind Volume"/> <slider label="ãã¿ã³" name="UI Volume"/> - <slider label="ã¡ãã£ã¢" name="Media Volume"/> + <slider label="颚" name="Wind Volume"/> <slider label="å¹æé³" name="SFX Volume"/> <slider label="ã¹ããªãŒãã³ã°é³æ¥œ" name="Music Volume"/> - <check_box label="ãã€ã¹ãæå¹ã«ãã" name="enable_voice_check"/> - <slider label="ãã€ã¹" name="Voice Volume"/> + <check_box label="æå¹" name="music_enabled"/> + <slider label="ã¡ãã£ã¢" name="Media Volume"/> + <check_box label="æå¹" name="enable_media"/> + <slider label="ãã€ã¹ãã£ãã" name="Voice Volume"/> + <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> <radio_group name="ear_location"> <radio_item label="ã«ã¡ã©ã®äœçœ®ããèã" name="0"/> diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml index fcc225c333..71551c7680 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="äžåç£" name="Estate"> <text name="estate_help_text" width="400"> - ãã®ã¿ãã®èšå®ãžã®å€æŽã¯ããšã¹ããŒãå
ã®ãã¹ãŠã®ãªãŒãžã§ã³ã«åœ±é¿ãããŸãã + ãã®ã¿ãå
ã®èšå®å€æŽã¯ãäžåç£å
ã®ãã¹ãŠã®å°åã«åœ±é¿ããŸãã </text> <text name="estate_text"> äžåç£ïŒ @@ -69,6 +69,6 @@ <button label="?" name="ban_resident_help"/> <button label="è¿œå ..." name="add_banned_avatar_btn"/> <button label="åé€..." name="remove_banned_avatar_btn"/> - <button label="ã¡ãã»ãŒãžãäžåç£ãžéä¿¡..." name="message_estate_btn"/> + <button label="ã¡ãã»ãŒãžãäžåç£ã«éä¿¡..." name="message_estate_btn"/> <button label="åå°ãããŠãŒã¶ãŒãè¿œãåºã..." name="kick_user_from_estate_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml index d77f9749c2..8df803b2dc 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml @@ -18,13 +18,13 @@ <button label="?" name="fixed_sun_help" /> <slider label="段é" name="sun_hour_slider" /> <button label="é©çš" name="apply_btn" /> - <button label="RAWå°åœ¢ããŠã³ããŒã..." name="download_raw_btn" - tool_tip="äžåç£ãªãŒããŒã®ã¿å©çšå¯èœã管çè
ã¯å©çšäžå¯" /> + <button label="RAW å°åœ¢ããŠã³ããŒã..." name="download_raw_btn" + tool_tip="äžåç£ãªãŒããŒã®ã¿å©çšå¯èœã管çè
ã¯å©çšäžå¯ã§ã" /> <button label="?" name="download_raw_help" /> - <button label="RAWå°åœ¢ã¢ããããŒã..." name="upload_raw_btn" - tool_tip="äžåç£ãªãŒããŒã®ã¿å©çšå¯èœã管çè
ã¯å©çšäžå¯" /> + <button label="RAW å°åœ¢ã¢ããããŒã..." name="upload_raw_btn" + tool_tip="äžåç£ãªãŒããŒã®ã¿å©çšå¯èœã管çè
ã¯å©çšäžå¯ã§ã" /> <button label="?" name="upload_raw_help" /> <button label="å°åœ¢ã®æ§ç¯" name="bake_terrain_btn" - tool_tip="çŸåšã®å°åœ¢ãäžæïŒäžéç¯å²ã®äžéç¹ãšããŠèšå®" /> + tool_tip="çŸåšã®å°åœ¢ãäžæã»äžéç¯å²ã®äžéç¹ãšããŠèšå®ããŸã" /> <button label="?" name="bake_terrain_help" /> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_region_texture.xml b/indra/newview/skins/default/xui/ja/panel_region_texture.xml index 17e3260460..526e6cdeb9 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_texture.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="å°é¢ãã¯ã¹ãã£ãŒ" name="Textures"> +<panel label="å°é¢ãã¯ã¹ãã£" name="Textures"> <text name="region_text_lbl"> å°åïŒ </text> @@ -7,7 +7,7 @@ æªç¥ </text> <text name="detail_texture_text"> - å°åœ¢ã®ãã¯ã¹ãã£ãŒ (512x512ã24ããã .tgaãã¡ã€ã«ãå¿
èŠ) + å°åœ¢ã®ãã¯ã¹ã㣠ïŒ512x512ã24ããã .tgaãã¡ã€ã«ãå¿
èŠã§ãïŒ </text> <text name="height_text_lbl"> 1ïŒäœïŒ @@ -19,10 +19,10 @@ 3 </text> <text name="height_text_lbl4"> - 4(é«) + 4ïŒé«ïŒ </text> <text name="height_text_lbl5"> - ãã¯ã¹ãã£ãŒæšé«ç¯å² + ãã¯ã¹ãã£æšé«ç¯å² </text> <text name="height_text_lbl6"> å西 @@ -52,7 +52,7 @@ ãæ倧å€ãã§ãããé«ãã®å€ã¯ã4çªã®ãã¯ã¹ãã£ã®é«ãã®ãæäœå€ãã§ãã </text> <text name="height_text_lbl12"> - ãããŠãé«ãã®å€ã¯ãã¯ã¹ãã£ãŒ#4ã®é«ãã®äžéãšãªããŸãã + ãããŠãé«ãã®å€ã¯ãã¯ã¹ãã£#4ã®é«ãã®äžéãšãªããŸãã </text> <button label="é©çš" name="apply_btn"/> </panel> 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 48636f1e3b..5364b8726f 100644 --- a/indra/newview/skins/default/xui/ja/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/ja/panel_side_tray.xml @@ -7,7 +7,9 @@ <panel label="ããŒã " name="panel_home"/> </sidetray_tab> <sidetray_tab description="ããªãã®å
¬éãããã£ãŒã«ãšããã¯ãç·šéããŠãã ããã" name="sidebar_me" tab_title="ã〠ãããã£ãŒã«"> - <panel label="ããŒ" name="panel_me"/> + <panel_container name="panel_container"> + <panel label="ããŒ" name="panel_me"/> + </panel_container> </sidetray_tab> <sidetray_tab description="ãã¬ã³ããé£çµ¡å
ãè¿ãã®äººãæ¢ããŠãã ããã" name="sidebar_people" tab_title="人"> <panel_container name="panel_container"> 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 67b6e699f8..a9e13cfd9f 100644 --- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml @@ -26,5 +26,6 @@ <text name="TimeText" tool_tip="çŸåšæå»ïŒå€ªå¹³æŽïŒ"> 24:00 AM PST </text> + <button name="media_toggle_btn" tool_tip="ã¯ãªãã¯ããŠã¡ãã£ã¢ãåãæ¿ããŸã"/> <button name="volume_btn" tool_tip="ã°ããŒãã«é³éèšå®"/> </panel> diff --git a/indra/newview/skins/default/xui/ja/role_actions.xml b/indra/newview/skins/default/xui/ja/role_actions.xml index 59fceca2db..0a63cedf10 100644 --- a/indra/newview/skins/default/xui/ja/role_actions.xml +++ b/indra/newview/skins/default/xui/ja/role_actions.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <role_actions> - <action_set description="ãããã®èœåã«ã¯ãã°ã«ãŒãã»ã¡ã³ããŒãè¿œå ãæé€ããæåŸ
ç¶ãªãã«æ°ã¡ã³ããŒã®åå ãèªããæš©éãå«ãŸããŸãã" name="Membership"> + <action_set description="ãããã®èœåã«ã¯ãã°ã«ãŒãã¡ã³ããŒãè¿œå ãæé€ããæåŸ
ç¶ãªãã«æ°ã¡ã³ããŒã®åå ãèªããæš©éãå«ãŸããŸãã" name="Membership"> <action description="ãã®ã°ã«ãŒãã«äººãæåŸ
" longdescription="ã圹å²ãã»ã¯ã·ã§ã³ã®ãã¡ã³ããŒãã¿ãå
ã«ãããæåŸ
ããã¿ã³ãæŒããŠããã®ã°ã«ãŒãã«ã¡ã³ããŒãæåŸ
ããŸãã" name="member invite" value="1"/> <action description="ã¡ã³ããŒããã®ã°ã«ãŒãããè¿œæŸ" longdescription="ã圹å²ãã»ã¯ã·ã§ã³ã®ãã¡ã³ããŒãã¿ãå
ã«ãããè¿œæŸããã¿ã³ãæŒããŠããã®ã°ã«ãŒãããã¡ã³ããŒãè¿œæŸããŸãã ããªãŒããŒãã¯ãä»ã®ããªãŒããŒã以å€ã¯èª°ã§ãè¿œæŸã§ããŸãã ããªãŒããŒãã§ã¯ãªã人ããå
šå¡ïŒEveryoneïŒãã«ãã圹å²ããªãå Žåãã¡ã³ããŒã¯ã°ã«ãŒãããè¿œæŸãããããšããããŸãã ã圹å²ãããã¡ã³ããŒãåé€ããã«ã¯ãã圹å²ããã¡ã³ããŒãåé€ãã®èœåãäžããããŠããå¿
èŠããããŸãã" name="member eject" value="2"/> <action description="ãèªç±åå ããšãå
¥äŒè²»ãã®åãæ¿ã" longdescription="ãèªç±åå ãã«åãæ¿ãããšãæåŸ
ãããªããŠãæ°ããã¡ã³ããŒãå
¥äŒã§ããŸãããå
¥äŒè²»ãã¯ãäžè¬ãã»ã¯ã·ã§ã³ã§å€æŽããŸãã" name="member options" value="3"/> @@ -8,29 +8,29 @@ <action_set description="ãããã®èœåã«ã¯ãã°ã«ãŒãå
ã®åœ¹å²ãè¿œå ãåé€ãå€æŽãã圹å²ã«ã¡ã³ããŒãè¿œå ãåé€ããããã«åœ¹å²ãžèœåãå²ãåœãŠãæš©éãå«ãŸããŸãã" name="Roles"> <action description="æ°ãã圹å²ãäœæ" longdescription="æ°ããã圹å²ãã¯ãã圹å²ãã»ã¯ã·ã§ã³ > ã圹å²ãã¿ãã§äœæããŸãã" name="role create" value="4"/> <action description="圹å²ãåé€" longdescription="ã圹å²ãã¯ãã圹å²ãã»ã¯ã·ã§ã³ > ã圹å²ãã¿ãã§åé€ã§ããŸãã" name="role delete" value="5"/> - <action description="ã圹å²ãã®ååãè©æžãã説æãã¡ã³ããŒå
¬éã®æç¡ãå€æŽ" longdescription="ã圹å²ãã®ååãè©æžãã説æãã¡ã³ããŒå
¬éã®æç¡ãå€æŽããŸãã ã圹å²ããéžæåŸã«ãã圹å²ãã»ã¯ã·ã§ã³ > ã圹å²ãã¿ã ã®äžã§èšå®ã§ããŸãã" name="role properties" value="6"/> + <action description="ã圹å²ãã®ååãã¿ã€ãã«ã説æãã¡ã³ããŒå
¬éã®æç¡ãå€æŽ" longdescription="ã圹å²ãã®ååãã¿ã€ãã«ã説æãã¡ã³ããŒå
¬éã®æç¡ãå€æŽããŸãã ã圹å²ããéžæåŸã«ãã圹å²ãã»ã¯ã·ã§ã³ > ã圹å²ãã¿ã ã®äžã§èšå®ã§ããŸãã" name="role properties" value="6"/> <action description="ã¡ã³ããŒãå²ãåœãŠäººã®åœ¹å²ã«å²ãåœãŠã" longdescription="ãå²ãåœãŠããã圹å²ãïŒã圹å²ãã»ã¯ã·ã§ã³ > ãã¡ã³ããŒãã¿ãïŒã®ãªã¹ãã§ãã¡ã³ããŒãã圹å²ãã«å²ãåœãŠãŸãã ãã®èœåãããã¡ã³ããŒã¯ãå²ãåœãŠã人ãæ¢ã«æå±ããã圹å²ãã«ã®ã¿ã¡ã³ããŒãè¿œå ã§ããŸãã" name="role assign member limited" value="7"/> <action description="ã¡ã³ããŒãä»»æã®åœ¹å²ã«å²ãåœãŠã" longdescription="ãå²ãåœãŠããã圹å²ãïŒã圹å²ãã»ã¯ã·ã§ã³ > ãã¡ã³ããŒãã¿ãïŒã®ãªã¹ãã§ãã¡ã³ããŒãã©ã®ã圹å²ãã«ãå²ãåœãŠãããšãã§ããŸãã *èŠå* ãã®ãèœåããããã圹å²ããæã€ã¡ã³ããŒãªã誰ã§ãèªåèªèº«ãšãä»ã®ããªãŒããŒã以å€ã®ã¡ã³ããŒãçŸåšä»¥äžã®æš©éã®ããã圹å²ãã«å²ãåœãŠãããšãã§ããŸããã€ãŸããããªãŒããŒã以å€ã®äººãããªãŒããŒãã«è¿ãåãæã€ããèšå®ã§ããããšã«ãªããŸãã ãã®ãèœåããå²ãåœãŠãåã«ãèªåãããããšããŠããããšãããææ¡ããŠãã ããã" name="role assign member" value="8"/> <action description="圹å²ããã¡ã³ããŒã解é€" longdescription="ãå²ãåœãŠããã圹å²ãïŒã圹å²ãã»ã¯ã·ã§ã³ > ãã¡ã³ããŒãã¿ãïŒã®ãªã¹ãã§ãã¡ã³ããŒãã圹å²ãããåé€ããŸãã ããªãŒããŒãã¯åé€ã§ããŸããã" name="role remove member" value="9"/> <action description="圹å²ã®èœåã®å²ãåœãŠãšè§£é€" longdescription="ãèš±å¯ãããèœåãïŒã圹å²ãã»ã¯ã·ã§ã³ > ã圹å²ãã¿ãïŒã®ãªã¹ãã«ãããåã圹å²ãã®ãèœåããå²ãåœãŠãããåé€ããŸãã *èŠå* ãã®ãèœåããããã圹å²ããæã€ã¡ã³ããŒãªã誰ã§ãèªåèªèº«ãšãä»ã®ããªãŒããŒã以å€ã®ã¡ã³ããŒããã¹ãŠã®ãèœåããã«å²ãåœãŠãããšãã§ããŸããã€ãŸããããªãŒããŒã以å€ã®äººãããªãŒããŒãã«è¿ãæš©éãæã€ããèšå®ã§ããããšã«ãªããŸãã ãã®ãèœåããå²ãåœãŠãåã«ãèªåãããããšããŠããããšãããææ¡ããŠãã ããã" name="role change actions" value="10"/> </action_set> <action_set description="ãããã®èœåã«ã¯ãã°ã«ãŒãã®å
¬éæ§ãç念ãèšç« ã®å€æŽãšãã£ããã°ã«ãŒãã®ã¢ã€ãã³ãã£ãã£ãä¿®æ£ããæš©éãå«ãŸããŸãã" name="Group Identity"> - <action description="ç念ãèšç« ããWebäžã§å
¬éããããã³ã°ã«ãŒãæ
å ±å
ã§å
¬éã®ã¡ã³ããŒãå€æŽã" longdescription="ç念ãèšç« ããæ€çŽ¢ã«è¡šç€ºãã®å€æŽãããŸãã ãäžè¬ãã»ã¯ã·ã§ã³ã§è¡ããŸãã" name="group change identity" value="11"/> + <action description="ç念ãèšç« ããWeb äžã§å
¬éããããã³ã°ã«ãŒãæ
å ±å
ã§å
¬éã®ã¡ã³ããŒãå€æŽã" longdescription="ç念ãèšç« ããæ€çŽ¢ã«è¡šç€ºãã®å€æŽãããŸãã ãäžè¬ãã»ã¯ã·ã§ã³ã§è¡ããŸãã" name="group change identity" value="11"/> </action_set> <action_set description="ãããã®ãèœåãã«ã¯ããã®ã°ã«ãŒãã®ææå°ã®è²æž¡ãä¿®æ£ã販売ãããæš©éããããŸãã ãåå°æ
å ±ããŠã£ã³ããŠãèŠãã«ã¯ãå°é¢ãå³ã¯ãªãã¯ããŠãåå°æ
å ±ããéžã¶ããããã²ãŒã·ã§ã³ããŒã®ãiãã¢ã€ã³ã³ãã¯ãªãã¯ããŸãã" name="Parcel Management"> <action description="ã°ã«ãŒãçšã®åå°ã®è²æž¡ãšè³Œå
¥" longdescription="ã°ã«ãŒãçšã®åå°ã®è²æž¡ãšè³Œå
¥ãè¡ããŸãã ãã®æäœã«ã¯ãåå°æ
å ±ç»é¢ ïŒ äžè¬ã¿ãã䜿ããŸãã" name="land deed" value="12"/> - <action description="Lindenç·ç£ã«åå°ãæãæž¡ã" longdescription="Lindenç·ç£ã«åå°ãæãæž¡ããŸãã *èŠå* ãã®èœåãæã€åœ¹å²ã®ã¡ã³ããŒã¯ããåå°æ
å ±ãïŒãäžè¬ãã§ã°ã«ãŒãææã®åå°ãæŸæ£ããŠã売ãäžããªãã§Lindenç·ç£ã«æãæž¡ãããšãã§ããŸãã ãã®èœåã®å²ãåœãŠã¯ããã®ããšãç解ããäžã§è¡ã£ãŠãã ããã" name="land release" value="13"/> + <action description="ãªã³ãã³ç·ç£ã«åå°ãæãæž¡ã" longdescription="ãªã³ãã³ç·ç£ã«åå°ãæãæž¡ããŸãã *èŠå* ãã®èœåãæã€åœ¹å²ã®ã¡ã³ããŒã¯ããåå°æ
å ±ãïŒãäžè¬ãã§ã°ã«ãŒãææã®åå°ãæŸæ£ããŠã売ãäžããªãã§ãªã³ãã³ç·ç£ã«æãæž¡ãããšãã§ããŸãã ãã®èœåã®å²ãåœãŠã¯ããã®ããšãç解ããäžã§è¡ã£ãŠãã ããã" name="land release" value="13"/> <action description="売ãå°æ
å ±ã®èšå®" longdescription="売ãå°æ
å ±ãèšå®ããŸãã *èŠå* ãã®èœåãæã€åœ¹å²ã®ã¡ã³ããŒã¯ããåå°æ
å ±ãïŒãäžè¬ãã¿ãã§ã°ã«ãŒãææã®åå°ãèªåã®æãã©ããã«è²©å£²ããããšãã§ããŸãã ãã®èœåã®å²ãåœãŠã¯ããã®ããšãç解ããäžã§è¡ã£ãŠãã ããã" name="land set sale info" value="14"/> <action description="åºç»ã®ååå²ãšçµ±å" longdescription="åºç»ãååå²ãçµ±åããŸãã å°é¢ãå³ã¯ãªãã¯ããŠãå°åœ¢ãç·šéããéžã³ãããŠã¹ãåå°ã®äžã§ãã©ãã°ããŠç¯å²ãéžæããŸãã ååå²ããã«ã¯ãåå²å¯Ÿè±¡ãéžãã§ãååå²ããã¯ãªãã¯ããŸãã çµ±åããã«ã¯ã2ã€ä»¥äžã®é£æ¥ããåºç»ãéžãã§ãçµ±åããã¯ãªãã¯ããŸãã" name="land divide join" value="15"/> </action_set> - <action_set description="ãããã®èœåã«ã¯ãåºç»åãå
¬éèšå®ãæ€çŽ¢ãã£ã¬ã¯ããªãžã®ç»é²ãçå°ç¹ãªãã³ã«TPã«ãŒãã®ãªãã·ã§ã³ãå€æŽããæš©éãå«ãŸããŸãã" name="Parcel Identity"> + <action_set description="ãããã®èœåã«ã¯ãåºç»åãå
¬éèšå®ãæ€çŽ¢ãã£ã¬ã¯ããªãžã®ç»é²ãçå°ç¹ãªãã³ã« TP ã«ãŒãã®ãªãã·ã§ã³ãå€æŽããæš©éãå«ãŸããŸãã" name="Parcel Identity"> <action description="ãå Žææ€çŽ¢ã«è¡šç€ºããåãæ¿ãã«ããŽãªãèšå®" longdescription="ãå Žææ€çŽ¢ã«è¡šç€ºãã«åãæ¿ãããåå°æ
å ±ã > ããªãã·ã§ã³ãã¿ãã§åºç»ã®ã«ããŽãªãèšå®ããŸãã" name="land find places" value="17"/> <action description="åºç»åã説æããå Žææ€çŽ¢ã«è¡šç€ºãã®èšå®ãå€æŽ" longdescription="åºç»åã説æããå Žææ€çŽ¢ã«è¡šç€ºãã®èšå®ãå€æŽããŸãã ãåå°æ
å ±ã > ããªãã·ã§ã³ãã¿ãã§è¡ããŸãã" name="land change identity" value="18"/> - <action description="çå°ç¹ããã³ãã¬ããŒãã»ã«ãŒããèšå®" longdescription="ãã®èœåãæã€åœ¹å²ã®ã¡ã³ããŒã¯ãã°ã«ãŒãææã®åºç»äžã§çå°ç¹ãèšå®ããããšã«ããå€éšããã®ãã¬ããŒãã®å°çäœçœ®ãæå®ã§ãããšå
±ã«ããã¬ããŒãã»ã«ãŒããèšå®ããŠçŽ°ããå¶åŸ¡ããããšãã§ããŸãã ãã®æäœã¯ããåå°æ
å ±ãïŒããªãã·ã§ã³ãã¿ãã§è¡ããŸãã" name="land set landing point" value="19"/> + <action description="çå°ç¹ããã³ãã¬ããŒãã«ãŒããèšå®" longdescription="ãã®èœåãæã€åœ¹å²ã®ã¡ã³ããŒã¯ãã°ã«ãŒãææã®åºç»äžã§çå°ç¹ãèšå®ããããšã«ããå€éšããã®ãã¬ããŒãã®å°çäœçœ®ãæå®ã§ãããšå
±ã«ããã¬ããŒãã«ãŒããèšå®ããŠçŽ°ããå¶åŸ¡ããããšãã§ããŸãã ãã®æäœã¯ããåå°æ
å ±ãïŒããªãã·ã§ã³ãã¿ãã§è¡ããŸãã" name="land set landing point" value="19"/> </action_set> <action_set description="ãããã®èœåã«ã¯ãããªããžã§ã¯ããäœæãããå°åœ¢ãç·šéããé³æ¥œãšã¡ãã£ã¢ã®èšå®ãªã©ãåºç»ã®ãªãã·ã§ã³ã«é¢é£ããæš©éãå«ãŸããŸãã" name="Parcel Settings"> - <action description="é³æ¥œãšã¡ãã£ã¢ã®èšå®ãå€æŽ" longdescription="ã¹ããªãŒãã³ã°ã»ãã¥ãŒãžãã¯ãšåç»ã®èšå®ãå€æŽããã«ã¯ããåå°æ
å ±ã ïŒ ãã¡ãã£ã¢ãã¿ãã䜿ããŸãã" name="land change media" value="20"/> - <action description="ãå°åœ¢ãç·šéãã«åãæ¿ã" longdescription="ãå°åœ¢ãç·šéãã«åãæ¿ããŸãã *èŠå* ãåå°æ
å ±ãïŒããªãã·ã§ã³ãïŒãå°åœ¢ãç·šéãã®é ã§é²ããšã誰ã§ãããªãã®åå°ã®åœ¢ã®æŽåãããªã³ãã³ãã©ã³ãã®èšçœ®ã移åãã§ããŸãã ãã®èœåãå²ãæ¯ãåã«ããã®ããšãããç解ããŠãããŠãã ããã ãåå°æ
å ±ãïŒããªãã·ã§ã³ãã¿ããããå°åœ¢ãç·šéãã«åãæ¿ããããŸãã" name="land edit" value="21"/> + <action description="é³æ¥œãšã¡ãã£ã¢ã®èšå®ãå€æŽ" longdescription="ã¹ããªãŒãã³ã°ãã¥ãŒãžãã¯ãšåç»ã®èšå®ãå€æŽããã«ã¯ããåå°æ
å ±ã ïŒ ãã¡ãã£ã¢ãã¿ãã䜿ããŸãã" name="land change media" value="20"/> + <action description="ãå°åœ¢ãç·šéãã«åãæ¿ã" longdescription="ãå°åœ¢ãç·šéãã«åãæ¿ããŸãã *èŠå* ãåå°æ
å ±ãïŒããªãã·ã§ã³ãïŒãå°åœ¢ãç·šéãã®é ã§é²ããšã誰ã§ãããªãã®åå°ã®åœ¢ã®æŽåãããªã³ãã³è£œã®æš¹æšã®èšçœ®ã移åãã§ããŸãã ãã®èœåãå²ãæ¯ãåã«ããã®ããšãããç解ããŠãããŠãã ããã ãåå°æ
å ±ãïŒããªãã·ã§ã³ãã¿ããããå°åœ¢ãç·šéãã«åãæ¿ããããŸãã" name="land edit" value="21"/> <action description="ãåå°æ
å ±ãïŒããªãã·ã§ã³ãã¿ãå
ã®ããŸããŸãªèšå®ãåãæ¿ã" longdescription="ãå®å
šïŒãã¡ãŒãžãªãïŒãããé£è¡ããåãæ¿ããäœäººã«ä»¥äžãèš±å¯ããŸãïŒ ã°ã«ãŒãææå°ã®ãåå°æ
å ±ã > ããªãã·ã§ã³ãã¿ãå
ã®ããå°åœ¢ãç·šéãããå¶äœãããã©ã³ãããŒã¯ã®äœæãããã¹ã¯ãªããã®å®è¡ãã" name="land options" value="22"/> </action_set> <action_set description="ãããã®èœåã«ã¯ãã°ã«ãŒãææã®åºç»ã«é¢ããèŠå¶ãè¿åããããšããã¡ã³ããŒã«èš±å¯ããæš©éãå«ãŸããŸãã" name="Parcel Powers"> @@ -41,24 +41,24 @@ <action description="ã°ã«ãŒãã®åå°ãžã®ãããŒã èšå®ããèš±å¯" longdescription="ãã®ã圹å²ããæã€ã¡ã³ããŒã¯ããã®ã°ã«ãŒãã«è²æž¡ãããåºç»äžã§ãäžçãã¡ãã¥ãŒ > ã©ã³ãããŒã¯ > çŸåšå°ãããŒã ã«èšå® ã䜿çšããŠãããŒã ã®èšå®ãè¡ãããšãã§ããŸãã" name="land allow set home" value="28"/> </action_set> <action_set description="ãããã®èœåã«ã¯ãäœäººã®åçµãè¿œæŸãå«ããã°ã«ãŒãææã®åºç»ãžã®ã¢ã¯ã»ã¹ãèš±å¯ãå¶éããæš©éãå«ãŸããŸãã" name="Parcel Access"> - <action description="åºç»ã¢ã¯ã»ã¹ã»ãªã¹ãã®ç®¡ç" longdescription="åºç»ã¢ã¯ã»ã¹ã»ãªã¹ãã®ç®¡çã¯ããåå°æ
å ±ãïŒãã¢ã¯ã»ã¹ãã¿ãã§è¡ããŸãã" name="land manage allowed" value="29"/> + <action description="åºç»ã¢ã¯ã»ã¹ãªã¹ãã®ç®¡ç" longdescription="åºç»ã¢ã¯ã»ã¹ã»ãªã¹ãã®ç®¡çã¯ããåå°æ
å ±ãïŒãã¢ã¯ã»ã¹ãã¿ãã§è¡ããŸãã" name="land manage allowed" value="29"/> <action description="åºç»çŠæ¢ãªã¹ãã®ç®¡ç" longdescription="ãåå°æ
å ±ã > ãã¢ã¯ã»ã¹ãã¿ãã®ãåºç»ã®çŠæ¢ãªã¹ãã®ç®¡çãã§ããŸãã" name="land manage banned" value="30"/> <action description="ãå
¥å Žèš±å¯ã販売ãã®èšå®ãå€æŽ" longdescription="ãåå°æ
å ±ã > ãã¢ã¯ã»ã¹ãã¿ãã§ãåºç»ã®ãå
¥å Žèš±å¯ã販売ãã®èšå®ãå€æŽããŸãã" name="land manage passes" value="31"/> - <action description="åºç»äžã®äœäººã®è¿œæŸãšåçµ" longdescription="ãã®ãèœåããæã€ã圹å²ãã®ã¡ã³ããŒã¯ãã°ã«ãŒãææå°ã«ããŠæ¬²ãããªãäœäººãå³ã¯ãªãã¯ãããè¿œæŸãããããªãŒãºããéžãã§å¯Ÿå¿ã§ããŸãã" name="land admin" value="32"/> + <action description="åºç»äžã®äœäººã®è¿œæŸãšããªãŒãº" longdescription="ãã®ãèœåããæã€ã圹å²ãã®ã¡ã³ããŒã¯ãã°ã«ãŒãææå°ã«ããŠæ¬²ãããªãäœäººãå³ã¯ãªãã¯ãããè¿œæŸãããããªãŒãºããéžãã§å¯Ÿå¿ã§ããŸãã" name="land admin" value="32"/> </action_set> <action_set description="ãããã®èœåã«ã¯ããªããžã§ã¯ãã®è¿åŽããªã³ãã³ãã©ã³ãã®èšçœ®ã移åããã¡ã³ããŒã«èš±å¯ããæš©éãå«ãŸããŸãã ããã¯ã¡ã³ããŒããŽãåŠçãæ¯èŠ³äœæãããéã«äŸ¿å©ã§ãããè¿åŽãããªããžã§ã¯ãã¯å
ã«æ»ããªãã®ã§ã泚æããŠè¡ããŸãããã" name="Parcel Content"> <action description="ã°ã«ãŒãææãªããžã§ã¯ãã®è¿åŽ" longdescription="ã°ã«ãŒãææã®åºç»äžã®ãªããžã§ã¯ãã®ãã¡ãã°ã«ãŒãææã®ãªããžã§ã¯ããè¿åŽããã«ã¯ããåå°æ
å ±ãïŒããªããžã§ã¯ããã¿ãã䜿ããŸãã" name="land return group owned" value="48"/> <action description="ã°ã«ãŒãã«èšå®ãããŠãããªããžã§ã¯ããè¿åŽ" longdescription="ã°ã«ãŒãææã®åºç»äžã®ãªããžã§ã¯ãã®ãã¡ãã°ã«ãŒãã«èšå®ãããŠãããªããžã§ã¯ããè¿åŽããã«ã¯ããåå°æ
å ±ãïŒããªããžã§ã¯ããã¿ãã䜿ããŸãã" name="land return group set" value="33"/> - <action description="éã°ã«ãŒãã»ãªããžã§ã¯ãã®è¿åŽ" longdescription="ã°ã«ãŒãææã®åºç»äžã®ãªããžã§ã¯ãã®ãã¡ãã°ã«ãŒã以å€ã®ãªããžã§ã¯ããè¿åŽããã«ã¯ããåå°æ
å ±ãïŒããªããžã§ã¯ããã¿ãã䜿ããŸãã" name="land return non group" value="34"/> - <action description="Linden補ã®æ€ç©ã䜿çšããŠæ¯èŠ³äœæ" longdescription="ãªã³ãã³è£œã®æš¹æšãæ€ç©ãèãæ€ãããæ¯èŠ³ã¥ããã®èœåã§ãã ãããã®æ€ç©ã¯ããªãã®æã¡ç©å
ã®ãã©ã€ãã©ãªã > ããªããžã§ã¯ãããã©ã«ãã«ãããŸãããå¶äœãã¡ãã¥ãŒã§äœæããããšãã§ããŸãã" name="land gardening" value="35"/> + <action description="éã°ã«ãŒããªããžã§ã¯ãã®è¿åŽ" longdescription="ã°ã«ãŒãææã®åºç»äžã®ãªããžã§ã¯ãã®ãã¡ãã°ã«ãŒã以å€ã®ãªããžã§ã¯ããè¿åŽããã«ã¯ããåå°æ
å ±ãïŒããªããžã§ã¯ããã¿ãã䜿ããŸãã" name="land return non group" value="34"/> + <action description="ãªã³ãã³è£œã®æ€ç©ã䜿çšããŠæ¯èŠ³äœæ" longdescription="ãªã³ãã³è£œã®æš¹æšãæ€ç©ãèãæ€ãããæ¯èŠ³ã¥ããã®èœåã§ãã ãããã®æ€ç©ã¯ããªãã®æã¡ç©å
ã®ãã©ã€ãã©ãªã > ããªããžã§ã¯ãããã©ã«ãã«ãããŸãããå¶äœãã¡ãã¥ãŒã§äœæããããšãã§ããŸãã" name="land gardening" value="35"/> </action_set> <action_set description="ãããã®ãèœåãã«ã¯ãã°ã«ãŒãææã®ãªããžã§ã¯ããè²æž¡ãä¿®æ£ã販売ããæš©éãå«ãŸããŸãã å€æŽã¯ãå¶äœããŒã«ã > ãäžè¬ãã¿ãã§è¡ããŸãã ãªããžã§ã¯ããå³ã¯ãªãã¯ããŠãç·šéããéããšèšå®å
容ã確èªã§ããŸãã" name="Object Management"> <action description="ã°ã«ãŒãã«ãªããžã§ã¯ããè²æž¡" longdescription="ãå¶äœããŒã«ã > ãäžè¬ãã¿ãã§ããªããžã§ã¯ããã°ã«ãŒãã«è²æž¡ããŸãã" name="object deed" value="36"/> <action description="ã°ã«ãŒãææãªããžã§ã¯ãã®æäœïŒç§»åãã³ããŒãä¿®æ£ïŒ" longdescription="ãå¶äœããŒã«ã > ãäžè¬ãã¿ãã§ãã°ã«ãŒãææã®ãªããžã§ã¯ããæäœïŒç§»åãã³ããŒãä¿®æ£ïŒããŸãã" name="object manipulate" value="38"/> <action description="ã°ã«ãŒãææãªããžã§ã¯ãã販売å¯èœã«èšå®" longdescription="ãå¶äœããŒã«ã > ãäžè¬ãã¿ãã§ãã°ã«ãŒãææã®ãªããžã§ã¯ãã販売察象ã«èšå®ããŸãã" name="object set sale" value="39"/> </action_set> - <action_set description="ãããã®èœåã«ã¯ãã¡ã³ããŒã«ãã°ã«ãŒãã®è² åµã®æ¯æããšå©ååãåããèŠæ±ããæš©éãã°ã«ãŒãå£åº§å±¥æŽãžã®ã¢ã¯ã»ã¹ãå¶éããæš©éãå«ãŸããŸãã" name="Accounting"> - <action description="ã°ã«ãŒãè² åµã®è¿æžãšã°ã«ãŒãé
åœã®åé " longdescription="ãã®èœåãæã€åœ¹å²ã®ã¡ã³ããŒã«ã€ããŠã¯ãã°ã«ãŒãè² åµã®æ¯æããšã°ã«ãŒãé
åœã®åãåããèªåçã«è¡ãããŸãã ã€ãŸãããããã®ã¡ã³ããŒã¯ãæ¯æ¥é
åœãããã°ã«ãŒãææã®åå°ã®å£²ãäžãéã®äžéšãåãåããšå
±ã«ãåºç»ã®åºåè²»ãªã©ãè² æ
ããããšã«ãªããŸãã" name="accounting accountable" value="40"/> + <action_set description="ãããã®èœåã«ã¯ãã¡ã³ããŒã«ãã°ã«ãŒãã®è² åµã®æ¯æããšå©ååãåããèŠæ±ããæš©éãã°ã«ãŒãå£åº§å±¥æŽãžã®ã¢ã¯ã»ã¹ãå¶éããæš©éãå«ãŸããŸãã" name="Accounting"><action description="ã°ã«ãŒãè² åµã®è¿æžãšã°ã«ãŒãé
åœã®åé " longdescription="ãã®èœåãæã€åœ¹å²ã®ã¡ã³ããŒã«ã€ããŠã¯ãã°ã«ãŒãè² åµã®æ¯æããšã°ã«ãŒãé
åœã®åãåããèªåçã«è¡ãããŸãã + ã€ãŸãããããã®ã¡ã³ããŒã¯ãæ¯æ¥é
åœãããã°ã«ãŒãææå°ã®å£²ãäžãéã®äžéšãåãåããšå
±ã«ãåºç»ã®åºåè²»ãªã©ãè² æ
ããããšã«ãªããŸãã" name="accounting accountable" value="40"/> </action_set> <action_set description="ãããã®èœåã«ã¯ãã°ã«ãŒãéç¥ã®éä¿¡ãåä¿¡ã衚瀺ãã¡ã³ããŒã«èš±å¯ããæš©éãå«ãŸããŸãã" name="Notices"> <action description="éç¥ãéä¿¡" longdescription="ãã®ãèœåããæã€ã圹å²ãã®ã¡ã³ããŒã¯ããã°ã«ãŒãã > ãéç¥ãã»ã¯ã·ã§ã³ããéç¥ãéä¿¡ã§ããŸãã" name="notices send" value="42"/> @@ -68,9 +68,9 @@ <action description="ææ¡ãäœæ" longdescription="ãã®èœåãæã€åœ¹å²ã®ã¡ã³ããŒã¯ãæ祚ã®å¯Ÿè±¡ãšãªãåé¡æèµ·ããã°ã«ãŒãæ
å ±ãïŒãåé¡æèµ·ãã¿ãäžã§äœæããããšãã§ããŸãã" name="proposal start" value="44"/> <action description="åé¡æèµ·ã«æ祚ãã" longdescription="ãã®èœåãæã€åœ¹å²ã®ã¡ã³ããŒã¯ãã°ã«ãŒãæ
å ±ïŒææ¡ã¿ãã§ææ¡ã«æ祚ããããšãã§ããŸãã" name="proposal vote" value="45"/> </action_set> - <action_set description=" ãããã®ã¢ããªãã£ã«ã¯ãã°ã«ãŒãã»ãã£ããã»ã»ãã·ã§ã³ãã°ã«ãŒãã»ãã€ã¹ã»ãã£ãããžã®ã¢ã¯ã»ã¹ã®èš±å¯ãå¶éã®æš©éãå«ãŸããŸãã " name="Chat"> - <action description="ã°ã«ãŒãã»ãã£ããã«åå ãã" longdescription=" ãã®ã¢ããªãã£ãæã€åœ¹å²ã®ã¡ã³ããŒã¯ãã°ã«ãŒãã»ãã£ããã»ã»ãã·ã§ã³ã«ããã¹ãããã³ãã€ã¹ã§åå ã§ããŸãã " name="join group chat"/> - <action description="ã°ã«ãŒãã»ãã€ã¹ã»ãã£ããã«åå ãã" longdescription=" ãã®ã¢ããªãã£ãæã€åœ¹å²ã®ã¡ã³ããŒã¯ãã°ã«ãŒãã»ãã€ã¹ã»ãã£ããã»ã»ãã·ã§ã³ã«åå ã§ããŸãã æ³šïŒ ãã€ã¹ã»ãã£ããã»ã»ãã·ã§ã³ã«ã¢ã¯ã»ã¹ããã«ã¯ãã°ã«ãŒãã»ãã£ããã«åå ããã¢ããªãã£ãå¿
èŠã§ãã " name="join voice chat"/> - <action description="ã°ã«ãŒãã»ãã£ããã管çãã" longdescription=" ãã®ã¢ããªãã£ãæã€åœ¹å²ã®ã¡ã³ããŒã¯ãã°ã«ãŒãã»ãã€ã¹ã»ãã£ããã»ã»ãã·ã§ã³ããã³ã°ã«ãŒãã»ããã¹ãã»ãã£ããã»ã»ãã·ã§ã³ãžã®ã¢ã¯ã»ã¹ãåå ãã³ã³ãããŒã«ããããšãã§ããŸãã " name="moderate group chat"/> + <action_set description=" ãããã®èœåã«ã¯ãã°ã«ãŒããã£ããã»ãã·ã§ã³ãã°ã«ãŒããã€ã¹ãã£ãããžã®ã¢ã¯ã»ã¹ã®èš±å¯ãå¶éã®æš©éãå«ãŸããŸãã " name="Chat"> + <action description="ã°ã«ãŒããã£ããã«åå ãã" longdescription=" ãã®èœåãæã€åœ¹å²ã®ã¡ã³ããŒã¯ãã°ã«ãŒããã£ããã»ãã·ã§ã³ã«ããã¹ãããã³ãã€ã¹ã§åå ã§ããŸãã " name="join group chat"/> + <action description="ã°ã«ãŒããã€ã¹ãã£ããã«åå ãã" longdescription=" ãã®èœåãæã€åœ¹å²ã®ã¡ã³ããŒã¯ãã°ã«ãŒããã€ã¹ãã£ããã»ãã·ã§ã³ã«åå ã§ããŸãã æ³šïŒ ãã€ã¹ãã£ããã»ãã·ã§ã³ã«ã¢ã¯ã»ã¹ããã«ã¯ãã°ã«ãŒããã£ããã«åå ããèœåãå¿
èŠã§ãã " name="join voice chat"/> + <action description="ã°ã«ãŒããã£ããã管çãã" longdescription=" ãã®èœåãæã€åœ¹å²ã®ã¡ã³ããŒã¯ãã°ã«ãŒããã€ã¹ãã£ããã»ãã·ã§ã³ããã³ã°ã«ãŒãããã¹ããã£ããã»ãã·ã§ã³ãžã®ã¢ã¯ã»ã¹ãåå ãã³ã³ãããŒã«ããããšãã§ããŸãã " name="moderate group chat"/> </action_set> </role_actions> diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index 28f4e88cd5..9b272b2fe8 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -38,16 +38,16 @@ èªèšŒããŠããŸã... </string> <string name="LoginMaintenance"> - ã¢ã«ãŠã³ãã»ã¡ã³ããã³ã¹ãå®è¡ããŠããŸã... + ã¢ã«ãŠã³ãã®ã¡ã³ããã³ã¹ãå®è¡ããŠããŸã... </string> <string name="LoginAttempt"> - ååã®ãã°ã€ã³ã«å€±æããŸããã ãã°ã€ã³äžã§ã([NUMBER]åç®) + ååã®ãã°ã€ã³ã«å€±æããŸããã ãã°ã€ã³äžã§ãïŒ[NUMBER] åç®ïŒ </string> <string name="LoginPrecaching"> - ã¯ãŒã«ããããŒãããŠããŸã... + ã¯ãŒã«ããèªã¿èŸŒãã§ããŸã... </string> <string name="LoginInitializingBrowser"> - åã蟌ã¿Webãã©ãŠã¶ãåæåããŠããŸã... + å
èµ Web ãã©ãŠã¶ãåæåããŠããŸã... </string> <string name="LoginInitializingMultimedia"> ãã«ãã¡ãã£ã¢ãåæåããŠããŸã... @@ -56,7 +56,7 @@ ãã©ã³ããããŒãã£ã³ã°äž... </string> <string name="LoginVerifyingCache"> - ãã£ãã·ã¥ã»ãã¡ã€ã«ãæ€èšŒããŠããŸã(æèŠæéã¯60ïœ90ç§)... + ãã£ãã·ã¥ãã¡ã€ã«ãæ€èšŒããŠããŸãïŒæèŠæé㯠60 ïœ 90 ç§ïŒ... </string> <string name="LoginProcessingResponse"> å¿çãåŠçããŠããŸã... @@ -68,22 +68,22 @@ ç»åããã³ãŒãããŠããŸã... </string> <string name="LoginInitializingQuicktime"> - QuickTimeãåæåããŠããŸã... + QuickTime ãåæåããŠããŸã... </string> <string name="LoginQuicktimeNotFound"> - QuickTimeãèŠã€ãããŸãããåæåã«å€±æããŸããã + QuickTime ãèŠã€ãããŸãããåæåã«å€±æããŸããã </string> <string name="LoginQuicktimeOK"> - QuickTimeãæ£åžžã«åæåãããŸããã + QuickTime ãæ£åžžã«åæåãããŸããã </string> <string name="LoginWaitingForRegionHandshake"> - å°åã®ãã³ãã·ã§ã€ã¯ãåŸ
ã£ãŠããŸã... + ãªãŒãžã§ã³ã®ãã³ãã·ã§ã€ã¯ãåŸ
ã£ãŠããŸã... </string> <string name="LoginConnectingToRegion"> - å°åã«æ¥ç¶ããŠããŸã... + ãªãŒãžã§ã³ã«æ¥ç¶ããŠããŸã... </string> <string name="LoginDownloadingClothing"> - æãããŠã³ããŒãããŠããŸã... + è¡£é¡ãããŠã³ããŒãããŠããŸã... </string> <string name="LoginFailedNoNetwork"> ãããã¯ãŒã¯ãšã©ãŒïŒ æ¥ç¶ã確ç«ã§ããŸããã§ãããã䜿ãã®ãããã¯ãŒã¯æ¥ç¶ãã確èªãã ããã @@ -101,19 +101,19 @@ 人 </string> <string name="TooltipNoName"> - (ååãªã) + ïŒååãªãïŒ </string> <string name="TooltipOwner"> - ãªãŒããŒ: + ææè
: </string> <string name="TooltipPublic"> å
Œ
± </string> <string name="TooltipIsGroup"> - (ã°ã«ãŒã) + ïŒã°ã«ãŒãïŒ </string> <string name="TooltipForSaleL$"> - 売ãåºãäž:L$[AMOUNT] + 売ãåºãäž:L$ [AMOUNT] </string> <string name="TooltipFlagGroupBuild"> ã°ã«ãŒãäœæ @@ -131,7 +131,7 @@ é£è¡çŠæ¢ </string> <string name="TooltipFlagGroupScripts"> - ã°ã«ãŒãã»ã¹ã¯ãªãã + ã°ã«ãŒãã¹ã¯ãªãã </string> <string name="TooltipFlagNoScripts"> ã¹ã¯ãªãããªã @@ -140,42 +140,42 @@ åå°: </string> <string name="TooltipMustSingleDrop"> - 1ã€ã®ã¢ã€ãã ã®ã¿ãããã«ãã©ãã°ã§ããŸã + ã¢ã€ãã 㯠1 ã€ã ãããã«ãã©ãã°ã§ããŸã </string> <string name="TooltipHttpUrl"> - ã¯ãªãã¯ããŠãã®WebããŒãžãèŠã + ã¯ãªãã¯ããŠãã® Web ããŒãžãèŠãŸã </string> <string name="TooltipSLURL"> - ã¯ãªãã¯ããŠãã®å Žæã®æ
å ±ãèŠã + ã¯ãªãã¯ããŠãã®å Žæã®æ
å ±ãèŠãŸã </string> <string name="TooltipAgentUrl"> - ã¯ãªãã¯ããŠãã®äœäººã®ãããã£ãŒã«ãèŠã + ã¯ãªãã¯ããŠãã®äœäººã®ãããã£ãŒã«ãèŠãŸã </string> <string name="TooltipGroupUrl"> - ã¯ãªãã¯ããŠãã®ã°ã«ãŒãã®èª¬ææãèŠã + ã¯ãªãã¯ããŠãã®ã°ã«ãŒãã®èª¬ææãèŠãŸã </string> <string name="TooltipEventUrl"> - ã¯ãªãã¯ããŠãã®ã°ã«ãŒãã®èª¬ææãèŠã + ã¯ãªãã¯ããŠãã®ã°ã«ãŒãã®èª¬ææãèŠãŸã </string> <string name="TooltipClassifiedUrl"> - ã¯ãªãã¯ããŠãã®ã¯ã©ã·ãã¡ã€ãåºåãèŠã + ã¯ãªãã¯ããŠãã®ã¯ã©ã·ãã¡ã€ãåºåãèŠãŸã </string> <string name="TooltipParcelUrl"> - ã¯ãªãã¯ããŠãã®åºç»ã®èª¬ææãèŠã + ã¯ãªãã¯ããŠãã®åºç»ã®èª¬ææãèŠãŸã </string> <string name="TooltipTeleportUrl"> - ã¯ãªãã¯ããŠãã®å Žæã«ãã¬ããŒããã + ã¯ãªãã¯ããŠãã®å Žæã«ãã¬ããŒãããŸã </string> <string name="TooltipObjectIMUrl"> - ã¯ãªãã¯ããŠãã®ãªããžã§ã¯ãã®èª¬ææãèŠã + ã¯ãªãã¯ããŠãã®ãªããžã§ã¯ãã®èª¬ææãèŠãŸã </string> <string name="TooltipMapUrl"> - ã¯ãªãã¯ããŠãã®å Žæãå°å³ã«è¡šç€ºãã + ã¯ãªãã¯ããŠãã®å Žæãå°å³ã«è¡šç€ºããŸã </string> <string name="TooltipSLAPP"> - ã¯ãªãã¯ã㊠secondlife:// ã³ãã³ããåºã + ã¯ãªãã¯ã㊠secondlife:// ã³ãã³ããåºããŸã </string> - <string name="CurrentURL" value=" çŸåšã®URLïŒ [CurrentURL]"/> + <string name="CurrentURL" value=" çŸåšã® URLïŒ [CurrentURL]"/> <string name="SLurlLabelTeleport"> ãã¬ããŒã </string> @@ -384,28 +384,28 @@ æ³£ã </string> <string name="anim_dance1"> - ãã³ã¹1 + ãã³ã¹ 1 </string> <string name="anim_dance2"> - ãã³ã¹2 + ãã³ã¹ 2 </string> <string name="anim_dance3"> - ãã³ã¹3 + ãã³ã¹ 3 </string> <string name="anim_dance4"> - ãã³ã¹4 + ãã³ã¹ 4 </string> <string name="anim_dance5"> - ãã³ã¹5 + ãã³ã¹ 5 </string> <string name="anim_dance6"> - ãã³ã¹6 + ãã³ã¹ 6 </string> <string name="anim_dance7"> - ãã³ã¹7 + ãã³ã¹ 7 </string> <string name="anim_dance8"> - ãã³ã¹8 + ãã³ã¹ 8 </string> <string name="anim_express_disdain"> 䟮è @@ -594,10 +594,10 @@ ãè¿ãã®ãã€ã¹ãã£ãããã«åæ¥ç¶ãããŸã </string> <string name="ScriptQuestionCautionChatGranted"> - [REGIONNAME]ã®[REGIONPOS]ãšããå Žæã«ããã[OWNERNAME]ãææã®ã[OBJECTNAME]ããšãããªããžã§ã¯ãã¯ã次ã®æš©éãèš±å¯ããŸããïŒ [PERMISSIONS] + [REGIONNAME] ã® [REGIONPOS] ãšããå Žæã«ãããã [OWNERNAME] ããææããã [OBJECTNAME] ããšãããªããžã§ã¯ãã¯ã次ã®æš©éãèš±å¯ããŸããïŒ [PERMISSIONS] </string> <string name="ScriptQuestionCautionChatDenied"> - [REGIONNAME]ã®[REGIONPOS]ãšããå Žæã«ããã[OWNERNAME]ãææã®ã[OBJECTNAME]ããšãããªããžã§ã¯ãã¯ã次ã®æš©éãæåŠããŸããïŒ [PERMISSIONS] + [REGIONNAME] ã® [REGIONPOS] ãšããå Žæã«ãããã [OWNERNAME] ããææããã [OBJECTNAME] ããšãããªããžã§ã¯ãã¯ã次ã®æš©éãæåŠããŸããïŒ [PERMISSIONS] </string> <string name="ScriptTakeMoney"> ãªã³ãã³ãã«ïŒL$ïŒãæ¯æã @@ -672,22 +672,22 @@ ããŒã </string> <string name="targa_image_files"> - Targaç»å + Targa ç»å </string> <string name="bitmap_image_files"> ããããããç»å </string> <string name="avi_movie_file"> - AVIã ãŒããŒãã¡ã€ã« + AVI ã ãŒããŒãã¡ã€ã« </string> <string name="xaf_animation_file"> - XAFã¢ãã¡ãŒã·ã§ã³ãã¡ã€ã« + XAF ã¢ãã¡ãŒã·ã§ã³ãã¡ã€ã« </string> <string name="xml_file"> - XMLãã¡ã€ã« + XML ãã¡ã€ã« </string> <string name="dot_raw_file"> - RAWãã¡ã€ã« + RAW ãã¡ã€ã« </string> <string name="compressed_image_files"> å§çž®ç»å @@ -792,7 +792,7 @@ äžåšäžã«æ°ããéç¥ãå±ããŸããã </string> <string name="OverflowInfoChannelString"> - You have %d more notification + ããªãã«ã¯ããã« %d éã®éç¥ããããŸã </string> <string name="BodyPartsRightArm"> å³è
@@ -822,16 +822,16 @@ é« </string> <string name="LeaveMouselook"> - ESC ããŒãæŒããŠã¯ãŒã«ããã¥ãŒã«æ»ã + ESC ããŒãæŒããŠã¯ãŒã«ããã¥ãŒã«æ»ããŸã </string> <string name="InventoryNoMatchingItems"> - äžèŽããã¢ã€ãã ãæã¡ç©ã«ãããŸããã§ãã + äžèŽããã¢ã€ãã ãæã¡ç©ã«ãããŸããã§ããã [secondlife:///app/search/groups ãæ€çŽ¢ã] ããè©Šããã ããã </string> <string name="FavoritesNoMatchingItems"> ããã«ã©ã³ãããŒã¯ããã©ãã°ããŠããæ°ã«å
¥ãã«è¿œå ããŸãã </string> <string name="InventoryNoTexture"> - æã¡ç©å
ã«ãã®ãã¯ã¹ãã£ã®ã³ããŒããããŸãã + ãæã¡ç©ãå
ã«ãã®ãã¯ã¹ãã£ã®ã³ããŒããããŸãã </string> <string name="no_transfer" value=" ïŒå販ã»ãã¬ãŒã³ãäžå¯ïŒ"/> <string name="no_modify" value=" ïŒç·šéäžå¯ïŒ"/> @@ -910,7 +910,7 @@ æ°èŠãã©ã«ã </string> <string name="InvFolder Inventory"> - ã€ã³ãã³ã㪠+ æã¡ç© </string> <string name="InvFolder Uncompressed Images"> å§çž®ãããŠããªãç»å @@ -1256,7 +1256,7 @@ ïŒäžæïŒ </string> <string name="SummaryForTheWeek" value="ä»é±ã®ãŸãšããéå§æ¥ã¯"/> - <string name="NextStipendDay" value="次åã®ãå°é£ãæ¯çµŠæ¥ã¯"/> + <string name="NextStipendDay" value="ã§ãã次åã®ãå°é£ãæ¯çµŠæ¥ïŒ"/> <string name="GroupIndividualShare" value=" ã°ã«ãŒã å人ã®å²ãåœãŠ"/> <string name="Balance"> æ®é« @@ -1316,10 +1316,10 @@ åºç»ã®ã¹ã¯ãªããURL </string> <string name="ScriptLimitsURLsUsed"> - 䜿çšãããURLïŒ [MAX] äž [COUNT] ïŒ[AVAILABLE] å©çšå¯ + 䜿çšããã URLïŒ [MAX] äž [COUNT] ïŒ[AVAILABLE] å©çšå¯ </string> <string name="ScriptLimitsURLsUsedSimple"> - 䜿çšãããURLïŒ [COUNT] + 䜿çšããã URLïŒ [COUNT] </string> <string name="ScriptLimitsRequestError"> æ
å ±ã®ãªã¯ãšã¹ãäžã«ãšã©ãŒãçºçããŸãã @@ -1433,13 +1433,13 @@ HUDïŒäžå€® 2ïŒ </string> <string name="ATTACH_HUD_TOP_RIGHT"> - HUDå³äž + HUDïŒå³äžïŒ </string> <string name="ATTACH_HUD_TOP_CENTER"> HUDïŒäžã»äžå€®ïŒ </string> <string name="ATTACH_HUD_TOP_LEFT"> - HUD å·Šäž + HUDïŒå·ŠäžïŒ </string> <string name="ATTACH_HUD_CENTER_1"> HUDïŒäžå€® 1ïŒ @@ -1504,7 +1504,7 @@ ïŒæ²èŒåŸæŽæ°ïŒ </string> <string name="NoPicksClassifiedsText"> - ããã«ã¯ããã¯ã»ã¯ã©ã·ãã¡ã€ãåºåã¯ãããŸããã + ããã¯ãã¯ã©ã·ãã¡ã€ãåºåãäœæããŠããŸããã äœæããã«ã¯ãäžã«ããããã©ã¹ããã¿ã³ãã¯ãªãã¯ããŸãã </string> <string name="PicksClassifiedsLoadingText"> ããŒãã£ã³ã°... @@ -1682,7 +1682,7 @@ åå°ã®ã¬ã³ã¿ã« </string> <string name="Property Rental"> - 建ç©ã®ã¬ã³ã¿ã« + ããããã£ã®ã¬ã³ã¿ã« </string> <string name="Special Attraction"> ç¹å¥ã¢ãã©ã¯ã·ã§ã³ @@ -1852,13 +1852,13 @@ www.secondlife.com ããææ°ããŒãžã§ã³ãããŠã³ããŒãããŠãã ã ãã¯ã»ã«åœ¢åŒæ
å ±ãèŠã€ãããŸãã </string> <string name="MBTrueColorWindow"> - [APP_NAME] ãå®è¡ããã«ã¯ãTrue ColorïŒ32ãããïŒãå¿
èŠã§ãã + [APP_NAME] ãå®è¡ããã«ã¯ãTrue Color ïŒ32ãããïŒãå¿
èŠã§ãã ã䜿ãã®ã³ã³ãã¥ãŒã¿ãŒã®ãã³ã³ãããŒã«ããã«ãïŒãç»é¢ãïŒãèšå®ãã«è¡ãããæé« ïŒ32 ããã)ãã«èšå®ããŠãã ããã </string> <string name="MBAlpha"> [APP_NAME] 㯠8 ãããã®ã¢ã«ãã¡ãã£ã³ãã«ãååŸã§ããªãããå®è¡ã§ããŸããã éåžžãããªã«ãŒãã®ãã©ã€ãã®åé¡ã§èµ·ãããŸãã ã䜿ãã®ã³ã³ãã¥ãŒã¿ãŒã«ææ°ã®ãããªã«ãŒããã©ã€ããã€ã³ã¹ããŒã«ãããŠãããã確èªãã ããã -ãŸãããã³ã³ãããŒã«ããã«ãïŒãç»é¢ãïŒãèšå®ãå
ã§ãã¢ãã¿ãŒããæé« ïŒ32ãããïŒãã«èšå®ãããŠããããšãã確èªãã ããã +ãŸãããã³ã³ãããŒã«ããã«ãïŒãç»é¢ãïŒãèšå®ãå
ã§ãã¢ãã¿ãŒããæé« ïŒ32 ãããïŒãã«èšå®ãããŠããããšãã確èªãã ããã ãã®ã¡ãã»ãŒãžãäœåºŠãåºãå Žåã¯ã[SUPPORT_SITE] ãžãé£çµ¡ãã ããã </string> <string name="MBPixelFmtSetErr"> @@ -1871,7 +1871,7 @@ www.secondlife.com ããææ°ããŒãžã§ã³ãããŠã³ããŒãããŠãã ã GL ã¬ã³ããŒã³ã³ããã¹ããã¢ã¯ãã£ããŒãã§ããŸãã </string> <string name="MBVideoDrvErr"> - ã䜿ãã®ã³ã³ãã¥ãŒã¿ãŒã®ãããªã«ãŒããã©ã€ããæ£åžžã«ã€ã³ã¹ããŒã«ã§ããªãã£ãããŸãã¯å€ãããµããŒã察象å€ã®ããã[APP_NAME] ã¯å®è¡ã§ããŸããã ææ°ã®ãããªã«ãŒããã©ã€ããã€ã³ã¹ããŒã«ãããŠããã®ã確èªãããããŠããå Žåã¯åã€ã³ã¹ããŒã«ããè©Šããã ããã + ã䜿ãã®ã³ã³ãã¥ãŒã¿ãŒã®ãããªã«ãŒããã©ã€ããæ£åžžã«ã€ã³ã¹ããŒã«ã§ããªãã£ãããŸãã¯å€ãããµããŒã察象å€ã®ããã[APP_NAME] ã¯å®è¡ã§ããŸããã ææ°ã®ãããªã«ãŒããã©ã€ããã€ã³ã¹ããŒã«ãããŠããã®ã確èªãããããŠããå Žåã¯åã€ã³ã¹ããŒã«ããè©Šããã ããã ãã®ã¡ãã»ãŒãžãäœåºŠãåºãå Žåã¯ã[SUPPORT_SITE] ãžãé£çµ¡ãã ããã </string> @@ -3295,7 +3295,7 @@ www.secondlife.com ããææ°ããŒãžã§ã³ãããŠã³ããŒãããŠãã ã ã¢ãããã¯ã³ã³ãã¡ã¬ã³ã¹ </string> <string name="inventory_item_offered-im"> - æã¡ç©ã¢ã€ãã ãéãããŠããŸãã + æã¡ç©ã¢ã€ãã ãéããŸãã </string> <string name="share_alert"> æã¡ç©ããããã«ã¢ã€ãã ããã©ãã°ããŸã @@ -3304,10 +3304,10 @@ www.secondlife.com ããææ°ããŒãžã§ã³ãããŠã³ããŒãããŠãã ã ãã®ã»ãã·ã§ã³ã«ãããŠãŒã¶ãŒã¯ããªãã ãã§ãã </string> <string name="offline_message"> - [FIRST] [LAST]ã¯ãªãã©ã€ã³ã§ãã + [FIRST] [LAST] ã¯ãªãã©ã€ã³ã§ãã </string> <string name="invite_message"> - ãã®ãã€ã¹ãã£ããã«å¿ç/æ¥ç¶ããå Žåã¯ã[BUTTON NAME]ãã¯ãªãã¯ããŠãã ããã + ãã®ãã€ã¹ãã£ããã«å¿çã»æ¥ç¶ããå Žåã¯ã[BUTTON NAME] ãã¯ãªãã¯ããŠãã ããã </string> <string name="muted_message"> ãã®äœäººããããã¯ããŠããŸãã ã¡ãã»ãŒãžãéããšããããã¯ãèªåçã«è§£é€ãããŸãã @@ -3331,7 +3331,7 @@ www.secondlife.com ããææ°ããŒãžã§ã³ãããŠã³ããŒãããŠãã ã ããªãã«ã¯ãã®èœåããããŸããã </string> <string name="not_a_mod_error"> - ããªãã¯ã»ãã·ã§ã³ã»ã¢ãã¬ãŒã¿ã§ã¯ãããŸããã + ããªãã¯ã»ãã·ã§ã³ã¢ãã¬ãŒã¿ã§ã¯ãããŸããã </string> <string name="muted"> ã°ã«ãŒãã®ã¢ãã¬ãŒã¿ãŒããããªãã®ããã¹ããã£ãããçŠæ¢ããŸããã @@ -3340,13 +3340,13 @@ www.secondlife.com ããææ°ããŒãžã§ã³ãããŠã³ããŒãããŠãã ã ã°ã«ãŒãã¢ãã¬ãŒã¿ãããªãã®ããã¹ããã£ãããç¡å¹åããŸãã </string> <string name="add_session_event"> - [RECIPIENT] ãšã®ãã£ããã»ã»ãã·ã§ã³ã«ãŠãŒã¶ãŒãè¿œå ããããšãã§ããŸãã + [RECIPIENT] ãšã®ãã£ããã»ãã·ã§ã³ã«ãŠãŒã¶ãŒãè¿œå ããããšãã§ããŸãã </string> <string name="message"> [RECIPIENT] ãšã®ãã£ããã»ãã·ã§ã³ã«ãã¡ãã»ãŒãžãéä¿¡ããããšãã§ããŸããã </string> <string name="message_session_event"> - [RECIPIENT] ãšã®ãã£ããã»ã»ãã·ã§ã³ã«ã¡ãã»ãŒãžãéãããšãã§ããŸãã + [RECIPIENT] ãšã®ãã£ããã»ãã·ã§ã³ã«ã¡ãã»ãŒãžãéãããšãã§ããŸãã </string> <string name="mute"> ã¢ãã¬ãŒãäžã«ãšã©ãŒãçºçããŸããã @@ -3358,7 +3358,7 @@ www.secondlife.com ããææ°ããŒãžã§ã³ãããŠã³ããŒãããŠãã ã ããªãã¯ã°ã«ãŒãããåé€ãããŸããã </string> <string name="close_on_no_ability"> - ãã®ãã£ããã»ã»ãã·ã§ã³ãç¶ç¶ããããšã¯ã§ããŸãã + ãã®ãã£ããã»ãã·ã§ã³ãç¶ç¶ããããšã¯ã§ããŸãã </string> <string name="unread_chat_single"> [SOURCES] ã¯äœãæ°ããããšãèšããŸããã |