diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-09-15 20:44:04 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-09-15 20:44:04 +0300 |
| commit | 329268c5f7520a288e76e253f9bffea9dc212488 (patch) | |
| tree | dffda1aca4433b5acd7cd759714b03a6e85feb67 /indra/newview/skins/default/xui/zh | |
| parent | c50dd63ca38ce44f6c6997a052a114989db8c942 (diff) | |
| parent | c2a27c474dc11dff4f93b0bd319cfec7de27bb22 (diff) | |
Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
# indra/newview/llmodelpreview.h
Diffstat (limited to 'indra/newview/skins/default/xui/zh')
| -rw-r--r-- | indra/newview/skins/default/xui/zh/panel_region_terrain.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/zh/strings.xml | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml index 85e759e445..81bce46876 100644 --- a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml @@ -10,7 +10,7 @@ <spinner label="地形提升限制" name="terrain_raise_spin"/> <spinner label="地形降低限制" name="terrain_lower_spin"/> <text name="detail_texture_text"> - 地形材質（須 512x512，24 位元 .tga 檔格式） + 地形材質（須 1024x1024，24 位元 .tga 檔格式） </text> <text name="height_text_lbl"> 1（低） diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml index a4e1b21ce6..bdb16c9bf1 100644 --- a/indra/newview/skins/default/xui/zh/strings.xml +++ b/indra/newview/skins/default/xui/zh/strings.xml @@ -685,9 +685,6 @@ http://secondlife.com/viewer-access-faq <string name="GroupNameNone"> （無） </string> - <string name="AvalineCaller"> - Avaline 通話者 [ORDER] - </string> <string name="AssetErrorNone"> 無錯誤 </string> |