summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/zh/floater_search.xml
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-11-26 14:50:36 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2012-11-26 14:50:36 -0800
commit14e82732f4f74ec59933bb9e6c67cf1ce7800a7f (patch)
treec2b5ff471400ced9342f7f3c1e4bc6b32d8df79f /indra/newview/skins/default/xui/zh/floater_search.xml
parenta897e69ffc36b8159e89031c38846395b6551d0b (diff)
parent890965faf5baa5f6f832e086991d59bb8d33b7bc (diff)
merging in latest changes, resolved llimview.cpp conflict
Diffstat (limited to 'indra/newview/skins/default/xui/zh/floater_search.xml')
-rw-r--r--indra/newview/skins/default/xui/zh/floater_search.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/zh/floater_search.xml b/indra/newview/skins/default/xui/zh/floater_search.xml
index d5abf37b86..3e85a529ae 100644
--- a/indra/newview/skins/default/xui/zh/floater_search.xml
+++ b/indra/newview/skins/default/xui/zh/floater_search.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="尋找">
+<floater name="floater_search" title="">
<floater.string name="loading_text">
載入中...
</floater.string>