summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/es
diff options
context:
space:
mode:
authorMark Palange <palange@lindenlab.com>2009-01-13 03:46:56 +0000
committerMark Palange <palange@lindenlab.com>2009-01-13 03:46:56 +0000
commit446c55538e1fb12d8a1feb541edf99c16bb29121 (patch)
tree022ca3c10bd2e0326098719cdffb65f9465ab08f /indra/newview/skins/default/xui/es
parent5476aca88e4b34d4d145f3a0b04fce95402c7b1f (diff)
svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/
merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.
Diffstat (limited to 'indra/newview/skins/default/xui/es')
-rw-r--r--indra/newview/skins/default/xui/es/panel_group_land_money.xml4
-rw-r--r--indra/newview/skins/default/xui/es/panel_preferences_general.xml2
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/es/panel_group_land_money.xml b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
index 268b62fa42..29bd688867 100644
--- a/indra/newview/skins/default/xui/es/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
@@ -4,8 +4,8 @@
Parcelas pertenecientes al grupo son listadas
con detalles de contribución. Un aviso aparece hasta que
el terreno total en uso sea menor o igual al total
-de contribución. Las pestañas Planeamiento, Detalles y Ventas
-conceden informaciones sobre las finanzas&apos; del grupo.
+de contribución. Las pestañas Detalles y Ventas
+conceden informaciones sobre las finanzas del grupo.
</text>
<button label="?" name="help_button" />
<text name="cant_view_group_land_text">
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
index 66fb9bd2c9..dd285d5218 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
@@ -81,7 +81,7 @@
한국어 (Coreano) - Beta
</combo_item>
<combo_item type="string" length="1" name="Chinese">
- 汉语/漢語 (Chino) - Beta
+ 中文 (简体) (Chino) - Beta
</combo_item>
<combo_item type="string" name="Spanish">
Español - Beta