1 files changed, 35 insertions, 4 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/strings.xml b/linden/indra/newview/skins/default/xui/en-us/strings.xml
index 5808e71..fd4fb58 100644
--- a/linden/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <!-- This file contains strings that used to be hardcoded in the source.
-     It is only for those strings which don't belong in a floater.
+     It is only for those strings which do not belong in a floater.
      For example, the strings used in avatar chat bubbles, and strings 
      that are returned from one component and may appear in many places-->
 <strings>
@@ -23,7 +23,6 @@
         <string name="LoginWaitingForRegionHandshake">Waiting for region handshake...</string>
         <string name="LoginConnectingToRegion">Connecting to region...</string>
         <string name="LoginDownloadingClothing">Downloading clothing...</string>
-  <string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string>
 
 
         <!-- Disconnection -->
@@ -58,7 +57,7 @@
         <string name="TooltipMustSingleDrop">Only a single item can be dragged here</string>    
 
         
-        <!-- Indicates that an avatar's name or other similar datum is being retrieved. General usage. -->
+        <!-- Indicates that an avatar name or other similar datum is being retrieved. General usage. -->
         <string name="RetrievingData">Retrieving...</string>
 
         <string name="ReleaseNotes">Release Notes</string>
@@ -90,9 +89,10 @@
         <string name="AssetErrorFileNotFound">File not found</string>
         <string name="AssetErrorTCPTimeout">File transfer timeout</string>
         <string name="AssetErrorCircuitGone">Circuit gone</string>
+        <string name="AssetErrorPriceMismatch">Viewer and server do not agree on price</string>
         <string name="AssetErrorUnknownStatus">Unknown status</string>
         
-        <!-- llvoavatar. Displayed in the avatar's chat bubble -->
+        <!-- llvoavatar. Displayed in the avatar chat bubble -->
         <string name="AvatarEditingApparance">(Editing Appearance)</string>
         <string name="AvatarAway">Away</string>
         <string name="AvatarBusy">Busy</string>
@@ -175,6 +175,37 @@
         <!-- Chat -->
         <string name="whisper">whispers:</string>
         <string name="shout">shouts:</string>
+        
+        <!-- Sim Access labels -->
+        <string name="SIM_ACCESS_PG">PG</string>
+        <string name="SIM_ACCESS_MATURE">Mature</string>
+        <string name="SIM_ACCESS_ADULT">Adult</string>
+        <string name="SIM_ACCESS_DOWN">Offline</string>
+        <string name="SIM_ACCESS_MIN">Unknown</string>
+        
+        <!-- For use when we do not have land type back from the server -->
+        <string name="land_type_unknown">(unknown)</string>
+        
+        <!-- Covenant info -->
+        <string name="covenant_never_modified">Last Modified: (never)</string>
+        <string name="covenant_modified">Last Modified: </string>
+
+        <!-- File load/save dialogs -->
+        <string name="all_files">All Files</string>
+        <string name="sound_files">Sounds</string>
+        <string name="animation_files">Animations</string>
+        <string name="image_files">Images</string>
+        <string name="save_file_verb">Save</string>
+        <string name="load_file_verb">Load</string>
+        <string name="targa_image_files">Targa Images</string>
+        <string name="bitmap_image_files">Bitmap Images</string>
+        <string name="avi_movie_file">AVI Movie File</string>
+        <string name="xaf_animation_file">XAF Anim File</string>
+        <string name="xml_file">XML File</string>
+        <string name="dot_raw_file">RAW File</string>
+        <string name="compressed_image_files">Compressed Images</string>
+        <string name="load_files">Load Files</string>
+        <string name="choose_the_directory">Choose Directory</string>
 
   <!-- System messages -->
   <string name="landmark_created">You created a landmark at</string>