summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/ja/menu_viewer.xml
diff options
context:
space:
mode:
authorcallum_linden <none@none>2014-09-22 15:41:46 -0700
committercallum_linden <none@none>2014-09-22 15:41:46 -0700
commit82dd0453aa2a344b6de3c289d367ab6847e5f8d2 (patch)
tree909c80b50a2a772d3a2454dba89a1d5e27b41979 /indra/newview/skins/default/xui/ja/menu_viewer.xml
parent499f5aa9a4b46d61ee94b26d5c86bc032766af70 (diff)
parentbbbbbd24508a91f15a45d2a085c8d6249d47c915 (diff)
Merge with top of viewer-release
Diffstat (limited to 'indra/newview/skins/default/xui/ja/menu_viewer.xml')
-rwxr-xr-xindra/newview/skins/default/xui/ja/menu_viewer.xml8
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index b151915ae4..4e6c6808c6 100755
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -36,6 +36,9 @@
<menu_item_check label="近くのチャット..." name="Nearby Chat"/>
<menu_item_check label="話す" name="Speak"/>
<menu_item_check label="会話ログ..." name="Conversation Log..."/>
+ <menu_item_call label="Facebook..." name="Facebook"/>
+ <menu_item_call label="Twitter..." name="Twitter"/>
+ <menu_item_call label="Flickr..." name="Flickr"/>
<menu label="ボイスモーフィング" name="VoiceMorphing">
<menu_item_check label="ボイスモーフィングなし" name="NoVoiceMorphing"/>
<menu_item_check label="プレビュー..." name="Preview"/>
@@ -150,7 +153,8 @@
<menu_item_check label="グリッドポイントにスナップする" name="Snap to Grid"/>
<menu_item_call label="オブジェクトの XY 軸をグリッドにスナップする" name="Snap Object XY to Grid"/>
<menu_item_call label="選択をグリッドに使用する" name="Use Selection for Grid"/>
- <menu_item_call label="グリッドオプション" name="Grid Options"/>
+ <menu_item_call label="グリッドオプション..." name="Grid Options"/>
+ <menu_item_call label="デフォルト権限の設定..." name="Set default permissions"/>
</menu>
<menu label="アップロード" name="Upload">
<menu_item_call label="画像(L$[COST])..." name="Upload Image"/>
@@ -158,7 +162,6 @@
<menu_item_call label="アニメーション(L$[COST])..." name="Upload Animation"/>
<menu_item_call label="モデル" name="Upload Model"/>
<menu_item_call label="一括 (ファイルにつきL$[COST])..." name="Bulk Upload"/>
- <menu_item_call label="デフォルトのアップロード権限を設定" name="perm prefs"/>
</menu>
<menu_item_call label="元に戻す" name="Undo"/>
<menu_item_call label="やり直し" name="Redo"/>
@@ -304,6 +307,7 @@
<menu_item_check label="LOD 情報" name="LOD Info"/>
<menu_item_check label="制作キュー" name="Build Queue"/>
<menu_item_check label="光" name="Lights"/>
+ <menu_item_check label="パーティクル" name="Particles"/>
<menu_item_check label="骨組みの衝突判定" name="Collision Skeleton"/>
<menu_item_check label="ジョイント" name="Joints"/>
<menu_item_check label="レイキャスト" name="Raycast"/>