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/es/floater_bumps.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/es/floater_bumps.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/es/floater_bumps.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/es/floater_bumps.xml b/indra/newview/skins/default/xui/es/floater_bumps.xml index 99cc6ae6bf..dce3b457a4 100644 --- a/indra/newview/skins/default/xui/es/floater_bumps.xml +++ b/indra/newview/skins/default/xui/es/floater_bumps.xml @@ -1,21 +1,21 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_bumps" title="Golpes, empujones & mamporros">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_bumps" title="Choques, empujones, e impactos">
<text name="none_detected">
- Nada detectado
+ No se han detectado
</text>
<text name="bump">
- [TIME] [FIRST] [LAST] golpeó usted
+ [TIME] [FIRST] [LAST] ha chocado con usted
</text>
<text name="llpushobject">
- [TIME] [FIRST] [LAST] empujó usted con un script
+ [TIME] [FIRST] [LAST] le ha empujado con un script
</text>
<text name="selected_object_collide">
- [TIME] [FIRST] [LAST] golpeó usted con un objeto
+ [TIME] [FIRST] [LAST] ha hecho que un objeto impacte con usted
</text>
<text name="scripted_object_collide">
- [TIME] [FIRST] [LAST] golpeó usted con un objeto con script
+ [TIME] [FIRST] [LAST] ha hecho que un objeto con script impacte con usted
</text>
<text name="physical_object_collide">
- [TIME] [FIRST] [LAST] golpeó usted con un objeto físico
+ [TIME] [FIRST] [LAST] ha hecho que un objeto material impacte con usted
</text>
</floater>
|