Merged Experimental branch (exp) back into main line (next).

Git thought many files (almost 100) had merge conflicts. But, after
resolving the conflicts (which were mostly trivial), almost all the
files turned out to be the same as in the exp branch. So, the
conflicts are not listed here. Check the diff between commit 244ffe8
and this commit to see what really changed.

1 files changed, 10 insertions, 1 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 a17d0de..d3c9df1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/strings.xml
@@ -20,6 +20,15 @@
   <string name="TitleBarMultiple">
     [FIRST_NAME] [LAST_NAME] on [GRID_NAME]
   </string>
+  <string name="copy_obj_key_info">
+    Copied key(s) for:
+  </string>
+  <string name="TeleportOfferMaturity">
+    [NAME] is offering a TP to [DESTINATION]
+  </string>
+  <string name="TeleportLureMaturity">
+    [NAME]'s teleport lure is to [DESTINATION]
+  </string>
 
   <!-- Login -->
   <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen.  Please wait.</string>
@@ -225,7 +234,7 @@
   <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="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>