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_buy_currency.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_buy_currency.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/pt/floater_buy_currency.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml index 9bae0378e2..53093a8c6e 100644 --- a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="buy currency" title="Adquira Lindens (L$)">
+<floater name="buy currency" title="Comprar Dinheiro">
<text name="info_buying">
- Comprando Moeda:
+ Comprando Dinheiro:
</text>
<text name="info_cannot_buy">
Não pode comprar agora:
</text>
<text name="info_need_more">
- Você precisa de mais moeda:
+ Você precisa de mais dinheiro:
</text>
<text name="error_message">
Algo não está certo.
</text>
- <button label="Ir para website" name="error_web"/>
+ <button label="Ir para o website" name="error_web"/>
<text name="contacting">
Contatando LindeX...
</text>
<text name="buy_action_unknown">
- Comprar L$ sobre o câmbio corrente da LindeX
+ Comprar L$ no câmbio atual da LindeX
</text>
<text name="buy_action">
[NAME] L$ [PRICE]
@@ -32,7 +32,7 @@ por aproxim. US$ [USD]
</text>
<text name="getting_data">
- Primeiros dados...
+ Obtendo dados...
</text>
<text name="balance_label">
Você tem atualmente
@@ -63,6 +63,6 @@ Aumente a quantidade de compra. <button label="Fechar" name="cancel_btn"/>
<button label="Adquirir" name="buy_btn"/>
<string name="buy_currency">
- Comprar L$ [LINDENS] por aproximadamente US$ [dólares americanos]
+ Comprar L$ [LINDENS] por aproximadamente US$ [USD]
</string>
</floater>
|