diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-05-04 17:43:26 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-05-04 17:43:26 +0000 |
| commit | cc92525b0df952659102d2e5adcc4140fea7f371 (patch) | |
| tree | ee1a9b63decb3667fb740a8c9b70bcfdbf9a054b /indra/newview/skins/default/xui/da/floater_land_holdings.xml | |
| parent | 4bcbf3342284b19ff5fbda5a16a43a8cafb3baad (diff) | |
QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476
this is a composite of...
svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C doc/contributions.txt
C indra/llaudio/audioengine.cpp
C indra/newview/CMakeLists.txt
C indra/newview/llfloaterlandholdings.cpp
C indra/newview/llpaneldirbrowser.cpp
C indra/newview/llpanelgrouplandmoney.cpp
C indra/newview/llpreviewscript.cpp
C indra/newview/llviewermenu.cpp
C indra/newview/skins/default/xui/en-us/notifications.xml
and...
svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C indra/llcommon/llversionserver.h
C indra/newsim/llrezdata.cpp
C indra/newsim/llstate.cpp
C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
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 | 20 |
1 files changed, 9 insertions, 11 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 4b5bee1b68..14043cadab 100644 --- a/indra/newview/skins/default/xui/da/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/da/floater_land_holdings.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="land holdings floater" title="Mit Land">
+<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" />
</scroll_list>
- <button label="Teleporter" label_selected="Teleporter" name="Teleport"
- tool_tip="Teleporter til midten af dette land." />
- <button label="Vis på kort" label_selected="Vis på kort" name="Show on Map"
- tool_tip="Vis dette land på verdenskortet." />
+ <button label="Teleport" label_selected="Teleport" name="Teleport" />
+ <button label="Vis på kort" label_selected="Vis på kort" name="Show on Map" />
<text name="contrib_label">
Bidrag til dine grupper:
</text>
@@ -21,21 +19,21 @@ Tilladt land ifølge nuværende betalingsaftale:
</text>
<text name="allowed_text">
- [AREA] m2
+ [AREA] m²
</text>
<text name="current_label">
- Current land holdings:
+ Nuværende besiddelser:
</text>
<text name="current_text">
- [AREA] m2
+ [AREA] m²
</text>
<text name="available_label">
- Antal m2 der kan købes:
+ Antal m² der kan købes:
</text>
<text name="available_text">
- [AREA] m2
+ [AREA] m²
</text>
<string name="area_string">
- [AREA] m2
+ [AREA] m²
</string>
</floater>
|