summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Linden <eli@lindenlab.com>2010-03-25 16:44:58 -0700
committerEli Linden <eli@lindenlab.com>2010-03-25 16:44:58 -0700
commitff91cb1f798d5d016810fcdb4624a25443fc129f (patch)
treeb4392af77d6556d7c970e812af020723a01b2858
parentbb53ecc458cb0be010982206951826fa80e64188 (diff)
VWR-18445 en_xui_change for DE truncation; remove old DE hard returns; FR linguistic
-rw-r--r--indra/newview/skins/default/xui/de/floater_about_land.xml6
-rw-r--r--indra/newview/skins/default/xui/en/floater_about_land.xml16
-rw-r--r--indra/newview/skins/default/xui/fr/floater_tools.xml4
3 files changed, 15 insertions, 11 deletions
diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml
index 4a3ec4a3a2..5322febe27 100644
--- a/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_about_land.xml
@@ -151,12 +151,10 @@
Gekauftes Land in dieser Region kann nicht wiederverkauft werden.
</panel.string>
<panel.string name="can_change">
- Gekauftes Land in dieser Region kann zusammengelegt und
-geteilt werden.
+ Gekauftes Land in dieser Region kann zusammengelegt und geteilt werden.
</panel.string>
<panel.string name="can_not_change">
- Gekauftes Land in dieser Region kann nicht zusammengelegt
-und geteilt werden.
+ Gekauftes Land in dieser Region kann nicht zusammengelegt und geteilt werden.
</panel.string>
<text name="estate_section_lbl">
Grundbesitz:
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index b9d5029773..51bd7a0a16 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -559,21 +559,26 @@ Leyla Linden </text>
left="0"
top="0"
help_topic="land_covenant_tab"
- name="land_covenant_panel">
+ name="land_covenant_panel"
+ word_wrap="true">
<panel.string
- name="can_resell">
+ name="can_resell"
+ word_wrap="true">
Purchased land in this region may be resold.
</panel.string>
<panel.string
- name="can_not_resell">
+ name="can_not_resell"
+ word_wrap="true">
Purchased land in this region may not be resold.
</panel.string>
<panel.string
- name="can_change">
+ name="can_change"
+ word_wrap="true">
Purchased land in this region may be joined or subdivided.
</panel.string>
<panel.string
- name="can_not_change">
+ name="can_not_change"
+ word_wrap="true">
Purchased land in this region may not be joined or subdivided.
</panel.string>
<text
@@ -748,6 +753,7 @@ Leyla Linden </text>
left_pad="10"
mouse_opaque="false"
name="resellable_clause"
+ word_wrap="true"
width="330">
Land in this region may not be resold.
</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index 40765b9e06..8d58e62f02 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -339,8 +339,8 @@
<text name="text revolutions">
Révolutions
</text>
- <texture_picker label="Texture du sculptie" name="sculpt texture control" tool_tip="Cliquez pour sélectionner une image"/>
- <check_box label="Mirroir" name="sculpt mirror control" tool_tip="Inverse le sculptie le long de l&apos;axe X"/>
+ <texture_picker label="Texture de la sculptie" name="sculpt texture control" tool_tip="Cliquez pour sélectionner une image"/>
+ <check_box label="Mirroir" name="sculpt mirror control" tool_tip="Inverse la sculptie le long de l&apos;axe X"/>
<check_box label="A l&apos;envers" name="sculpt invert control" tool_tip="Inverse les normales des sculpties, qui apparaissent alors à l&apos;envers"/>
<text name="label sculpt type">
Type de raccord