diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-07-26 15:38:37 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-07-26 15:38:37 -0700 |
| commit | 2c2a4c123eb9bfa80785e5509e73c8f7f236228f (patch) | |
| tree | 83160657e9c42e9dc78f6be455f254671429bc9c /indra/newview/skins/default/xui/ja | |
| parent | 74b6f5dce31b5ff69ced8e1e8cd37e4c5ded2943 (diff) | |
| parent | 95da8c81f3d5afd8d888589398028883e6647333 (diff) | |
merge
Diffstat (limited to 'indra/newview/skins/default/xui/ja')
| -rw-r--r-- | indra/newview/skins/default/xui/ja/panel_edit_pick.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/ja/strings.xml | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml index 4fb031b677..39ea1df1e3 100644 --- a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml @@ -29,7 +29,7 @@ <layout_panel name="layout_panel1"> <button label="ピックを保存" name="save_changes_btn"/> </layout_panel> - <layout_panel name="layout_panel1"> + <layout_panel name="layout_panel2"> <button label="取り消し" name="cancel_btn"/> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index ff22221aab..fa6d25d238 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -1238,9 +1238,6 @@ support@secondlife.com にお問い合わせください。 <string name="InvFolder My Inventory"> 持ち物 </string> - <string name="InvFolder My Favorites"> - お気に入り - </string> <string name="InvFolder Library"> ライブラリ </string> |