diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2012-09-07 12:53:07 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2012-09-07 12:53:07 -0400 |
commit | 04e8d074b2f21438b3f9c463a387c964cd5b6961 (patch) | |
tree | c95b5bee3fd31fc66b0055c9635f5d8369cbd5e6 /indra/newview/skins/default/xui/ja/teleport_strings.xml | |
parent | 7bee4b58ff1e36ca39abc090991833c43c8903cc (diff) | |
parent | e3b4b3875a6d8c7857ba948a662ace4731913ecf (diff) |
DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.
This was yet another refresh from v-d because of significant changes
to lltexturefetch that would not have been resolvable by casual
application of any merge tool. There are still a few questions
outstanding but this is the initial, optimistic merge.
Diffstat (limited to 'indra/newview/skins/default/xui/ja/teleport_strings.xml')
-rw-r--r-- | indra/newview/skins/default/xui/ja/teleport_strings.xml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/ja/teleport_strings.xml b/indra/newview/skins/default/xui/ja/teleport_strings.xml index 64f01f4030..7868c25807 100644 --- a/indra/newview/skins/default/xui/ja/teleport_strings.xml +++ b/indra/newview/skins/default/xui/ja/teleport_strings.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <teleport_messages> <message_set name="errors"> <message name="invalid_tport"> @@ -47,6 +47,9 @@ <message name="no_inventory_host"> インベントリシステムは現在利用できません。 </message> + <message name="MustGetAgeRegion"> + この地域(リージョン)に入るには 18 才以上である必要があります。 + </message> </message_set> <message_set name="progress"> <message name="sending_dest"> @@ -82,5 +85,8 @@ <message name="requesting"> テレポートをリクエスト... </message> + <message name="pending"> + テレポートを保留中... + </message> </message_set> </teleport_messages> |