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/zh/floater_event.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/zh/floater_event.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/zh/floater_event.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/zh/floater_event.xml b/indra/newview/skins/default/xui/zh/floater_event.xml index 349b5717f2..7175731fef 100644 --- a/indra/newview/skins/default/xui/zh/floater_event.xml +++ b/indra/newview/skins/default/xui/zh/floater_event.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="Event" name="Event" title="EVENT DETAILS"> +<floater label="活動" name="Event" title="活動細節"> <floater.string name="loading_text"> 載入中... </floater.string> <floater.string name="done_text"> - Done + 完成 </floater.string> </floater> |