Automated merge with ssh://rick@hg.lindenlab.com/skolb/media

4 files changed, 10 insertions, 10 deletions

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 10b72144e7..1239152c32 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1561,7 +1561,7 @@ Only large parcels can be listed in search.
              left="10"
              name="at URL:"
              width="100">
-                Home URL:
+                Home Page:
             </text>
             <line_editor
              follows="left|top"
@@ -1590,7 +1590,7 @@ Only large parcels can be listed in search.
              left="10"
              name="CurrentURL:"
              width="100">
-                Current URL:
+                Current Page:
             </text>
              <button
      follows="top|right"
diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index d6b20c8015..4b280ac59f 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -171,7 +171,7 @@
              enabled="false"
              follows="left|top"
              height="20"
-             label="Send Current URL to Parcel"
+             label="Send Current Page to Parcel"
              layout="topleft"
              left="0"
              name="assign"
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index c8ec515e6d..5217ab3571 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -17,7 +17,7 @@
    height="15"
    left="10"
    name="home_label">
-    Home URL:
+    Home Page:
   </text>
   <text
    visible="false" 
@@ -27,7 +27,7 @@
    left_delta="64"
    text_color="red"
    name="home_fails_whitelist_label">
-    (This URL does not pass the specified whitelist)
+    (This page does not pass the specified whitelist)
   </text>
   <line_editor 
    bottom_delta="-24" 
@@ -37,7 +37,7 @@
    height="20" 
    left="10" 
    name="home_url"
-   tool_tip="The home URL for this media source"
+   tool_tip="The home page for this media source"
    width="340"> 
     <!--  <line_editor.commit_callback
 	     function="Media.CommitHomeURL"/> -->
@@ -69,7 +69,7 @@
    height="15" 
    left="10" 
    name="current_url_label">
-    Current URL:
+    Current Page:
   </text>
   <text 
    bottom_delta="-20" 
@@ -79,7 +79,7 @@
    height="20" 
    left="10" 
    name="current_url"
-   tool_tip="The current URL for this media source"
+   tool_tip="The current page for this media source"
    value="" 
    width="340" />
   <button 
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
index 6e82713f06..1f41a0d284 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
@@ -48,7 +48,7 @@
    bottom_delta="0"
    text_color="0.4 0.4 0.4 1.0" 
    name="home_url_fails_some_items_in_whitelist">
-    Entries that the home URL fails against are marked:
+    Entries that the home page fails against are marked:
   </text>
   <button 
    bottom_delta="-36" 
@@ -82,7 +82,7 @@
    left="30"
    text_color="0.6 0.0 0.0 1.0"
    name="home_url_fails_whitelist">
-Warning: the home URL specified in the General tab 
+Warning: the home page specified in the General tab 
 fails to pass this whitelist. It has been disabled 
 until a valid entry has been added.
   </text>