From c3cbd049859c058526ae9a07a5cbfa7e51085943 Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Fri, 21 Aug 2009 21:52:21 +0000
Subject: svn merge -r130238:130240
 svn+ssh://svn.lindenlab.com/svn/linden/branches/linux-updater-6

QAR-1771  Linux Viewer Autoupdater + XUI-parse refactoring
---
 .../newview/skins/default/xui/en/notifications.xml | 39 ++++++++++++++++++++++
 indra/newview/skins/default/xui/en/strings.xml     | 35 ++++++++++++++++++-
 2 files changed, 73 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8460e98fa3..3083a7f689 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2626,6 +2626,45 @@ This update is not required, but we suggest you install it to improve performanc
      yestext="Download"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="DownloadLinuxMandatory"
+   type="alertmodal">
+A new version of [SECOND_LIFE] is available.
+[MESSAGE]
+You must download this update to use [SECOND_LIFE].
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Quit"
+     yestext="Download"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DownloadLinux"
+   type="alertmodal">
+An updated version of [SECOND_LIFE] is available.
+[MESSAGE]
+This update is not required, but we suggest you install it to improve performance and stability.
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Continue"
+     yestext="Download"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DownloadLinuxReleaseForDownload"
+   type="alertmodal">
+An updated version of [SECOND_LIFE] is available.
+[MESSAGE]
+This update is not required, but we suggest you install it to improve performance and stability.
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Continue"
+     yestext="Download"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="DownloadMacMandatory"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f89625c535..3d4ac94044 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -666,7 +666,7 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	<string name="Any">Any</string>	
 	<string name="You">You</string>							
 						
-	<!-- puncutations -->
+	<!-- punctuations -->
 	<string name=":">:</string>			
 	<string name=",">,</string>					
 	<string name="...">...</string>					
@@ -936,4 +936,37 @@ If you continue to receive this message, contact customer support.
     <string name="poofy skirt">poofy skirt</string>
     <string name="tight skirt">tight skirt</string>	
 	<string name="wrinkles">wrinkles</string>	
+	
+	<!-- Strings used by the (currently Linux) auto-updater app -->
+	<string name="UpdaterWindowTitle">
+	  [SECOND_LIFE_VIEWER] Update
+	</string>
+	<string name="UpdaterNowUpdating">
+	  Now updating [SECOND_LIFE_VIEWER]...
+	</string>
+	<string name="UpdaterNowInstalling">
+	  Installing [SECOND_LIFE_VIEWER]...
+	</string>
+	<string name="UpdaterUpdatingDescriptive">
+	  Your [SECOND_LIFE_VIEWER] Viewer is being updated to the latest release.  This may take some time, so please be patient.
+	</string>
+	<string name="UpdaterProgressBarTextWithEllipses">
+	  Downloading update...
+	</string>
+	<string name="UpdaterProgressBarText">
+	  Downloading update
+	</string>
+	<string name="UpdaterFailDownloadTitle">
+	  Failed to download update
+	</string>
+	<string name="UpdaterFailUpdateDescriptive">
+	  An error occurred while updating Second Life. Please download the latest version from www.secondlife.com.
+	</string>
+	<string name="UpdaterFailInstallTitle">
+	  Failed to install update
+	</string>
+	<string name="UpdaterFailStartTitle">
+	  Failed to start viewer
+	</string>
+	
 </strings>
-- 
cgit v1.2.3