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_sell_land.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_sell_land.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/da/floater_sell_land.xml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/da/floater_sell_land.xml b/indra/newview/skins/default/xui/da/floater_sell_land.xml index 7dbd2eb20c..32905594a4 100644 --- a/indra/newview/skins/default/xui/da/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/da/floater_sell_land.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="sell land" title="Sælg Land">
+<floater name="sell land" title="Sælg land">
<text name="info_parcel_label">
Parcel:
</text>
@@ -10,16 +10,16 @@ Størrelse:
</text>
<text name="info_size">
- [AREA] m2
+ [AREA] m²
</text>
<text name="info_action">
- Sælg dette parcel:
+ Sælg denne parcel:
</text>
<text name="price_label">
Sæt en pris:
</text>
<text name="price_text">
- Vælg en fornuftig pris for jorden.
+ Vælg en passende pris for jorden.
</text>
<text name="price_ld">
L$
@@ -41,7 +41,7 @@ Alle
</combo_item>
<combo_item name="Specificuser:">
- Specifik Beboer:
+ Specifik bruger:
</combo_item>
</combo_box>
<button label="Vælg..." name="sell_to_select_agent" />
@@ -49,20 +49,20 @@ Sælg objekter sammen med jorden?
</text>
<text name="sell_objects_text">
- Jord Ejer's objekter der kan videregives sælges med jorden.
+ Dine objekter der kan videregives sælges med jorden.
</text>
<radio_group name="sell_objects">
<radio_item name="no">
- Nej, behold ejerskab over objekterne
+ Nej, behold ejerskab til objekterne
</radio_item>
<radio_item name="yes">
- Ja, sælg dem med jorden
+ Ja, sælg objekter med jorden
</radio_item>
</radio_group>
- <button label="Show Objects" name="show_objects" />
+ <button label="Vis objekter" name="show_objects" />
<text name="nag_message_label">
HUSK: Alle salg er endegyldige.
</text>
<button label="Sæt land til salg" name="sell_btn" />
- <button label="Annuller" name="cancel_btn" />
+ <button label="Annullér" name="cancel_btn" />
</floater>
|