From 9dfe0ca9a0228c4fa75c8a3e51840696cc6b4960 Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Fri, 22 May 2009 09:58:47 +0000
Subject: svn merge -r121194:121210
 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1

QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
---
 indra/newview/skins/default/xui/ja/floater_land_holdings.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/ja/floater_land_holdings.xml')

diff --git a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
index ba85592dd9..cb87dafb49 100644
--- a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="land holdings floater" title="自分の土地">
 	<scroll_list name="parcel list">
-		<column label="名前" name="name"/>
-		<column label="位置" name="location"/>
+		<column label="区画名" name="name"/>
+		<column label="地域（リージョン）" name="location"/>
+		<column label="種類" name="type"/>
 		<column label="面積" name="area"/>
 		<column label="" name="hidden"/>
 	</scroll_list>
-- 
cgit v1.2.3