diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
4 files changed, 38 insertions, 17 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml index 1bbe9d80c0..4acfa42c23 100644 --- a/indra/newview/skins/default/xui/en/panel_region_general.xml +++ b/indra/newview/skins/default/xui/en/panel_region_general.xml @@ -171,27 +171,48 @@ width="100"> Rating: </text> - <combo_box + <icons_combo_box + follows="left|top" height="20" label="Moderate" layout="topleft" left_delta="100" name="access_combo" top_delta="0" - width="85"> - <combo_box.item + width="105"> + <icons_combo_box.drop_down_button + image_overlay="Parcel_M_Light" + image_overlay_alignment="left" + imgoverlay_label_space="3" + pad_left="3"/> + <icons_combo_box.item label="Adult" - name="Adult" - value="42" /> - <combo_box.item + value="42"> + <item.columns + halign="center" + type="icon" + value="Parcel_R_Light" + width="20"/> + </icons_combo_box.item> + <icons_combo_box.item label="Moderate" - name="Mature" - value="21" /> - <combo_box.item + value="21"> + <item.columns + halign="center" + type="icon" + value="Parcel_M_Light" + width="20"/> + </icons_combo_box.item> + <icons_combo_box.item label="General" - name="PG" - value="13" /> - </combo_box> + value="13"> + <item.columns + halign="center" + type="icon" + value="Parcel_PG_Light" + width="20"/> + </icons_combo_box.item> + </icons_combo_box> <button enabled="false" follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index 8a1f74c46c..0c870e155b 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -51,7 +51,7 @@ image_unselected="spacer35.tga" image_pressed="spacer35.tga" height="16" - right="-220" + right="-230" label_shadow="false" name="buycurrency" tool_tip="My Balance" 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 b9bc1dd9d8..657bf792cf 100644 --- a/indra/newview/skins/default/xui/fr/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/fr/panel_status_bar.xml @@ -21,7 +21,7 @@ <panel.string name="buycurrencylabel"> [AMT] L$ </panel.string> - <button label="" label_selected="" name="buycurrency" right="-250" tool_tip="Mon solde"/> + <button label="" label_selected="" name="buycurrency" tool_tip="Mon solde"/> <button label="Acheter" name="buyL" tool_tip="Cliquez pour acheter plus de L$"/> <text name="TimeText" tool_tip="Heure actuelle (Pacifique)"> 00h00 PST diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml index e6fb07f120..bcad812457 100644 --- a/indra/newview/skins/default/xui/ja/menu_viewer.xml +++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml @@ -241,7 +241,7 @@ <menu label="レンダーテスト" name="Render Tests"> <menu_item_check label="カメラオフセット" name="Camera Offset"/> <menu_item_check label="フレームレートをランダム化" name="Randomize Framerate"/> - <menu_item_check label="Periodic Slow Frame" name="Periodic Slow Frame"/> + <menu_item_check label="定期的に遅いフレームを挿入する" name="Periodic Slow Frame"/> <menu_item_check label="フレームテスト" name="Frame Test"/> </menu> <menu label="メタデータのレンダー" name="Render Metadata"> @@ -344,7 +344,7 @@ <menu_item_call label="PG のトグル" name="Toggle PG"/> <menu_item_check label="選択アバター許可" name="Allow Select Avatar"/> </menu> - <menu_item_call label="Params をデフォルトで実行する" name="Force Params to Default"/> + <menu_item_call label="パラメータを強制的にデフォルトにする" name="Force Params to Default"/> <menu_item_check label="アニメーション情報" name="Animation Info"/> <menu_item_check label="スローモーションのアニメーション" name="Slow Motion Animations"/> <menu_item_check label="見ているものを表示する" name="Show Look At"/> @@ -361,7 +361,7 @@ </menu> <menu_item_check label="HTTP Texture" name="HTTP Textures"/> <menu_item_call label="圧縮画像" name="Compress Images"/> - <menu_item_check label="Output Debug Minidump" name="Output Debug Minidump"/> + <menu_item_check label="デバッグ用のミニダンプを出力する" name="Output Debug Minidump"/> <menu_item_check label="次回の起動時にコンソールウィンドウを表示する" name="Console Window"/> <menu_item_check label="管理者メニューを表示する" name="View Admin Options"/> <menu_item_call label="管理者ステータスの呼び出し" name="Request Admin Options"/> |