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/pt/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/pt/floater_sell_land.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/pt/floater_sell_land.xml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/pt/floater_sell_land.xml b/indra/newview/skins/default/xui/pt/floater_sell_land.xml index 1acdc223cc..7dccf87180 100644 --- a/indra/newview/skins/default/xui/pt/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_sell_land.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="sell land" title="Vender terreno">
<text name="info_parcel_label">
Lote:
@@ -10,10 +10,10 @@ Tamanho:
</text>
<text name="info_size">
- [AREA] m2.
+ [AREA] m².
</text>
<text name="info_action">
- Para vender este terreno:
+ Para vender este lote:
</text>
<text name="price_label">
Defina um preço:
@@ -25,7 +25,7 @@ L$
</text>
<text name="price_per_m">
- (L$[PER_METER] por metro quadrado)
+ (L$[PER_METER] por m²)
</text>
<text name="sell_to_label">
Vender esta terra para:
@@ -44,12 +44,12 @@ Usuário Específico:
</combo_item>
</combo_box>
- <button label="Selecione..." name="sell_to_select_agent" />
+ <button label="Selecione..." name="sell_to_select_agent"/>
<text name="sell_objects_label">
- Vender os objetos com a Terra?
+ Vender os objetos com a terra?
</text>
<text name="sell_objects_text">
- Os objeto tranferiveis do proprietário d terra neste lote irão mudar de propriedade.
+ Os objetos tranferíveis do proprietário do terreno que estão neste lote irão mudar de propriedade.
</text>
<radio_group name="sell_objects">
<radio_item name="no">
@@ -59,10 +59,10 @@ Sim, vender objetos com a terra
</radio_item>
</radio_group>
- <button label="Mostrar Objetos" name="show_objects" />
+ <button label="Mostrar Objetos" name="show_objects"/>
<text name="nag_message_label">
LEMBRE-SE: Todas as vendas são finais.
</text>
- <button label="Definir Terra para Venda" name="sell_btn" />
- <button label="Cancelar" name="cancel_btn" />
+ <button label="Definir Terra para Venda" name="sell_btn"/>
+ <button label="Cancelar" name="cancel_btn"/>
</floater>
|