summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/ja
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-07-01 16:55:19 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-07-01 16:55:19 -0400
commitddf87b874a0841a65ec95d2d8ed4764412cd394c (patch)
tree956fedc2cc55b74c3959b9f9c1a8de9c12206178 /indra/newview/skins/default/xui/ja
parent5cda3ccad729f21dee0ea5517be4dcd8304943fe (diff)
parenteed8e6adc93ed85ce9fe15f946fb4035672f6190 (diff)
merge
Diffstat (limited to 'indra/newview/skins/default/xui/ja')
-rw-r--r--indra/newview/skins/default/xui/ja/floater_world_map.xml8
-rw-r--r--indra/newview/skins/default/xui/ja/sidepanel_item_info.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/strings.xml2
3 files changed, 6 insertions, 6 deletions
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 ce9e7d0777..62670251d6 100644
--- a/indra/newview/skins/default/xui/ja/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml
@@ -39,12 +39,12 @@
<text name="pg_label">
General
</text>
- <check_box initial_value="true" label="Mature" name="event_mature_chk"/>
- <text name="mature_label">
+ <check_box initial_value="true" label="Mature" name="events_mature_chk"/>
+ <text name="events_mature_label">
Moderate
</text>
- <check_box label="Adult" name="event_adult_chk"/>
- <text name="adult_label">
+ <check_box label="Adult" name="events_adult_chk"/>
+ <text name="events_adult_label">
Adult
</text>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
index 584524e3b1..b194608181 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
@@ -16,7 +16,7 @@
[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
</panel.string>
<text name="title" value="アイテムのプロフィール"/>
- <text name="where" value="(持ち物)"/>
+ <text name="origin" value="(持ち物)"/>
<panel label="">
<text name="LabelItemNameTitle">
名前:
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index bf8541a73d..619f9fc9ef 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -1095,7 +1095,7 @@
<string name="InvFolder Gestures">
ジェスチャー
</string>
- <string name="InvFolder favorite">
+ <string name="InvFolder Favorite">
お気に入り
</string>
<string name="InvFolder Current Outfit">