diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-26 19:00:27 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-26 19:00:27 +0200 |
commit | a5227864bd7ca930b41041ff80b20c30474f5f8c (patch) | |
tree | 0a7f77c543184209717be29dfc24e1d05d320a00 /indra/newview/skins/default/xui/ja/floater_about_land.xml | |
parent | 3f3c9c7e255e090c7f09dafd08ec20f2d8a09c6d (diff) | |
parent | b74e1d942352e81e0cc00e21ef3b351152b32248 (diff) |
Manual merge from default branch
Resolved conflict in indra/newview/llviewerwindow.cpp.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/ja/floater_about_land.xml')
-rw-r--r-- | indra/newview/skins/default/xui/ja/floater_about_land.xml | 2 |
1 files changed, 1 insertions, 1 deletions
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 e59397ee0c..c9c01bc2a4 100644 --- a/indra/newview/skins/default/xui/ja/floater_about_land.xml +++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml @@ -395,7 +395,7 @@ <text name="at URL:"> ホームページ: </text> - <button label="設定" label_selected="設定..." name="set_media_url"/> + <button label="設定" name="set_media_url"/> <check_box label="URL を非表示" name="hide_media_url" tool_tip="このオプションをオンにすると、許可なしでこの区画情報にアクセスしているユーザーにはメディア URL が表示されません。 これは HTML タイプには使用できませんのでご注意ください。"/> <text name="Description:"> 説明: |