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/strings.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/strings.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/pt/strings.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index bc0e1ea1a9..1995382697 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -89,7 +89,7 @@ L$
</string>
<string name="TooltipFlagDropInventory">
- Largar Estoque
+ Dar Inventário
</string>
<string name="TooltipFlagPhantom">
Imaterial
@@ -161,13 +161,13 @@ Nenhum erro
</string>
<string name="AssetErrorRequestFailed">
- Valor pedido falhou
+ Item pedido falhou
</string>
<string name="AssetErrorNonexistentFile">
- Valor pedido: arquivo inexistente
+ Item pedido: arquivo inexistente
</string>
<string name="AssetErrorNotInDatabase">
- Valor pedido: valor não encontrado na base de dados.
+ Item pedido: item não encontrado na base de dados.
</string>
<string name="AssetErrorEOF">
Fim do arquivo
@@ -182,7 +182,7 @@ Tempo de transferência de arquivo expirado
</string>
<string name="AssetErrorCircuitGone">
- Circuito caiu (Circuit gone)
+ Circuito caiu
</string>
<string name="AssetErrorUnknownStatus">
Status desconhecido
@@ -197,7 +197,7 @@ Ocupado
</string>
<string name="AvatarMuted">
- Emudecido
+ Mudo
</string>
<string name="anim_express_afraid">
Temeroso
@@ -293,7 +293,7 @@ Beijar
</string>
<string name="anim_laugh_short">
- rir
+ Rir
</string>
<string name="anim_musclebeach">
Exibir músculos
@@ -308,7 +308,7 @@ Nya-nya-nya
</string>
<string name="anim_punch_onetwo">
- Um-Dois soco
+ Soco Um-Dois
</string>
<string name="anim_express_open_mouth">
Abrir a boca
|