summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-12-12 10:54:45 -0800
committerLeslie Linden <leslie@lindenlab.com>2011-12-12 10:54:45 -0800
commitec30e6e70ff71723e2137595bc6ecd3eb358aabe (patch)
tree49055571f280685a440b1d79415a8004b5f28c7e /indra/newview/skins/default/xui/en
parent6114ce2d27a3c776a59d1f09ad05d9b2f100a35d (diff)
parentdbc91a7fac9513bdd879c5c2dc82208e08eaad2d (diff)
Merge from viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/floater_snapshot.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_postcard_settings.xml4
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index e71b714f25..0c38283d59 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -34,7 +34,7 @@
</string>
<string
name="profile_succeeded_str">
- Profile feed updated!
+ Image uploaded
</string>
<string
name="postcard_succeeded_str">
@@ -50,7 +50,7 @@
</string>
<string
name="profile_failed_str">
- Failed to update your Profile Feed.
+ Failed to upload image to your Profile Feed.
</string>
<string
name="postcard_failed_str">
diff --git a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
index aebbc51be1..2e0bb88f53 100644
--- a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
@@ -113,11 +113,11 @@
label="Image quality"
label_width="80"
layout="topleft"
- left="10"
+ left="0"
max_val="100"
name="image_quality_slider"
top_pad="7"
- width="200" />
+ width="190" />
<text
type="string"
follows="left|top"