diff options
author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-01 11:04:15 -0700 |
---|---|---|
committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-01 11:04:15 -0700 |
commit | 359fb947411654e7d345709448db6ff316551d96 (patch) | |
tree | 2514f1c31ce39ee63559f0c88c4b5ac6d85299b8 /indra/newview/skins/default/xui/da/floater_land_holdings.xml | |
parent | 3069355a6f33b7bbcfc8c493910a40e6836249e1 (diff) |
Sync up with a number of SVN changes that snuck in via weird merges
Diffstat (limited to 'indra/newview/skins/default/xui/da/floater_land_holdings.xml')
-rw-r--r-- | indra/newview/skins/default/xui/da/floater_land_holdings.xml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/da/floater_land_holdings.xml b/indra/newview/skins/default/xui/da/floater_land_holdings.xml index fcb159664c..bd623e7b75 100644 --- a/indra/newview/skins/default/xui/da/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/da/floater_land_holdings.xml @@ -1,19 +1,20 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="land holdings floater" title="Mit land"> <scroll_list name="parcel list"> - <column label="Navn" name="name" /> - <column label="Lokation" name="location" /> - <column label="Område" name="area" /> - <column label="" name="hidden" /> + <column label="Navn" name="name"/> + <column label="Region" name="location"/> + <column label="Type" name="type"/> + <column label="Område" name="area"/> + <column label="" name="hidden"/> </scroll_list> - <button label="Teleport" label_selected="Teleport" name="Teleport" /> - <button label="Vis på kort" label_selected="Vis på kort" name="Show on Map" /> + <button label="Teleport" label_selected="Teleport" name="Teleport" tool_tip="Teleport til centrum på dette land."/> + <button label="Vis på kort" label_selected="Vis på kort" name="Show on Map" tool_tip="Vis dette land på verdenskortet."/> <text name="contrib_label"> Bidrag til dine grupper: </text> <scroll_list name="grant list"> - <column label="Gruppe" name="group" /> - <column label="Område" name="area" /> + <column label="Gruppe" name="group"/> + <column label="Område" name="area"/> </scroll_list> <text name="allowed_label"> Tilladt land ifølge nuværende betalingsaftale: |