diff options
author | Mark Palange <palange@lindenlab.com> | 2008-12-23 19:39:58 +0000 |
---|---|---|
committer | Mark Palange <palange@lindenlab.com> | 2008-12-23 19:39:58 +0000 |
commit | fb793870fe95f1951d7c30ea6068e187b9dededd (patch) | |
tree | 6d11632353ff4fb07133625ec5031b135b1e2882 /indra/newview/skins/default/xui/es | |
parent | d182b9fb82b9c63f41d81bc80dbbfe627475facf (diff) |
QAR-1142 merging 1.22 RC0-RC4 changes.
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
Diffstat (limited to 'indra/newview/skins/default/xui/es')
-rw-r--r-- | indra/newview/skins/default/xui/es/floater_about_land.xml | 21 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/es/menu_viewer.xml | 2 |
2 files changed, 1 insertions, 22 deletions
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml index 1411093a82..ce401c16b9 100644 --- a/indra/newview/skins/default/xui/es/floater_about_land.xml +++ b/indra/newview/skins/default/xui/es/floater_about_land.xml @@ -132,54 +132,33 @@ <text type="string" length="1" name="Simulator primitive usage:">
Simulador de primitiva usado:
</text>
- <text type="string" length="1" name="0 out of 0 available">
- 0 de 14055 (14055 disponible)
- </text>
<text type="string" length="1" name="Primitives parcel supports:">
Primitivas en la parcela soportan:
</text>
- <text type="string" length="1" name="object_contrib_text">
- 926
- </text>
<text type="string" length="1" name="Primitives on parcel:">
Primitivas en la parcela:
</text>
- <text type="string" length="1" name="total_objects_text">
- 0
- </text>
<text type="string" length="1" name="Owned by parcel owner:">
Pertenecientes al propietario de la parcela:
</text>
- <text type="string" length="1" name="owner_objects_text">
- 0
- </text>
<button label="Mostrar" label_selected="Mostrar" name="ShowOwner" />
<button label="Retornar..." label_selected="Retornar..." name="ReturnOwner..."
tool_tip="Devolver objetos para sus propietarios." />
<text type="string" length="1" name="Set to group:">
Definido para el grupo:
</text>
- <text type="string" length="1" name="group_objects_text">
- 0
- </text>
<button label="Mostrar" label_selected="Mostrar" name="ShowGroup" />
<button label="Retornar..." label_selected="Retornar..." name="ReturnGroup..."
tool_tip="Devolver objetos para sus propietarios." />
<text type="string" length="1" name="Owned by others:">
Pertenecientes a otros:
</text>
- <text type="string" length="1" name="other_objects_text">
- 0
- </text>
<button label="Mostrar" label_selected="Mostrar" name="ShowOther" />
<button label="Retornar..." label_selected="Retornar..." name="ReturnOther..."
tool_tip="Devolver objetos para sus propietarios." />
<text type="string" length="1" name="Selected / sat upon:">
Seleccionado / puesto en:
</text>
- <text type="string" length="1" name="selected_objects_text">
- 0
- </text>
<text type="string" length="1" name="Autoreturn other resident&apos;s objects (minutes, 0 for off):">
Autoretornar objetos de otros residentes (minutos, 0 para desligar):
</text>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml index bb67d7cfa8..d688337055 100644 --- a/indra/newview/skins/default/xui/es/menu_viewer.xml +++ b/indra/newview/skins/default/xui/es/menu_viewer.xml @@ -76,7 +76,7 @@ <menu_item_check label="Historial del chat" name="Chat History" />
<menu_item_check label="Mensaje instantáneo" name="Instant Message" />
<menu_item_call label="Inventario" name="Inventory" />
- <menu_item_check label="Dejar sin sonido por la lista" name="Mute List" />
+ <menu_item_check label="Residentes & Objetos sin sonido" name="Mute List" />
<menu_item_separator label="-----------" name="separator2" />
<menu_item_check label="Controles de cámara" name="Camera Controls" />
<menu_item_check label="Controles de movimiento" name="Movement Controls" />
|