From 1cc154166fe504e17735669b7b9e366f93e34d64 Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Tue, 20 Dec 2011 22:17:20 -0800
Subject: STORM-1738 - Add autocorrect functionality Ported with owner
 permission from Firestorm, inital work done by LordGregGreg Back

---
 indra/newview/skins/default/xui/en/notifications.xml | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index a7705c8bac..adbfd70e18 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6717,6 +6717,13 @@ One or more of your Voice Morphs will expire in less than [INTERVAL] days.
     <tag>voice</tag>
   </notification>
 
+  <notification
+     icon="notifytip.tga"
+     name="AutoReplace"
+     type="notifytip">
+    &apos;[BEFORE]&apos; has been auto replaced by &apos;[REPLACEMENT]&apos;
+    based on your [LISTNAME] list.
+  </notification>
   <notification
    icon="notify.tga"
    name="VoiceEffectsNew"
-- 
cgit v1.2.3


From 6d9c0fab8f2c19fa624e3c1f697ee9c7f08d9245 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 11 May 2012 14:31:45 -0400
Subject: remove author tracking, non-wordstyle option, and notifications

---
 indra/newview/skins/default/xui/en/notifications.xml | 7 -------
 1 file changed, 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5680c6e676..afc5b916e7 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6763,13 +6763,6 @@ One or more of your Voice Morphs will expire in less than [INTERVAL] days.
     <tag>voice</tag>
   </notification>
 
-  <notification
-     icon="notifytip.tga"
-     name="AutoReplace"
-     type="notifytip">
-    &apos;[BEFORE]&apos; has been auto replaced by &apos;[REPLACEMENT]&apos;
-    based on your [LISTNAME] list.
-  </notification>
   <notification
    icon="notify.tga"
    name="VoiceEffectsNew"
-- 
cgit v1.2.3


From 04ab2cf43b5341900737f0d480bce0b8205add8e Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 23 May 2012 21:30:13 -0400
Subject: storm-1738: restructure code, preferences storage, preferences ui; ui
 not completely tested

---
 .../newview/skins/default/xui/en/notifications.xml | 57 ++++++++++++++++++++++
 1 file changed, 57 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index afc5b916e7..47cf35092c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2339,6 +2339,63 @@ Would you be my friend?
     </form>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   label="Add Auto-Replace List"
+   name="AddAutoReplaceList"
+   type="alertmodal">
+    <tag>addlist</tag>
+    Name for the new list:
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="listname" type="text"/>
+      <button
+       default="true"
+       index="0"
+       name="SetName"
+       text="OK"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Rename Auto-Replace List"
+   name="RenameAutoReplaceList"
+   type="alertmodal">
+    The name '[DUPNAME]' is in use
+    Enter a new unique name:
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="listname" type="text"/>
+      <button
+       default="false"
+       index="0"
+       name="ReplaceList"
+       text="Replace Current List"/>
+      <button
+       default="true"
+       index="1"
+       name="SetName"
+       text="Use New Name"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="InvalidAutoReplaceEntry"
+   type="notify">
+    The keyword must be a single word, and the replacement may not be empty.
+    <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="InvalidAutoReplaceList"
+   type="notify">
+    That replacement list is not valid.
+    <tag>fail</tag>
+  </notification>
+
   <notification
  icon="alertmodal.tga"
  label="Save Outfit"
-- 
cgit v1.2.3


From 1acae5b2915aacff7a2c7892ea2ab094b60b67c9 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 11 Jun 2012 08:21:39 -0400
Subject: fix error notices to be more prominent for invalid list names and
 keywords

---
 indra/newview/skins/default/xui/en/notifications.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 47cf35092c..bc69e973ed 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2381,17 +2381,17 @@ Would you be my friend?
   </notification>
 
   <notification
-   icon="notify.tga"
+   icon="alertmodal.tga"
    name="InvalidAutoReplaceEntry"
-   type="notify">
+   type="alertmodal">
     The keyword must be a single word, and the replacement may not be empty.
     <tag>fail</tag>
   </notification>
 
   <notification
-   icon="notify.tga"
+   icon="alertmodal.tga"
    name="InvalidAutoReplaceList"
-   type="notify">
+   type="alertmodal">
     That replacement list is not valid.
     <tag>fail</tag>
   </notification>
-- 
cgit v1.2.3


From 02f0f87f95c7f47a93d20de9478bf0b2d5c6e4e6 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 14 Jun 2012 21:21:42 -0400
Subject: STORM-1880: copy imported dictionary files rather than moving them

---
 indra/newview/skins/default/xui/en/notifications.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index bc69e973ed..c04e33fe8e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2396,6 +2396,17 @@ Would you be my friend?
     <tag>fail</tag>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="SpellingDictImportFailed"
+   type="alertmodal">
+    Unable to copy
+    [FROM_NAME]
+    to
+    [TO_NAME]
+    <tag>fail</tag>
+  </notification>
+
   <notification
  icon="alertmodal.tga"
  label="Save Outfit"
-- 
cgit v1.2.3


From 3f7ed8b888b5725912e38f19e36c4c5e1583ea7c Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 15 Jun 2012 12:36:03 -0400
Subject: STORM-1883: add alert when a secondary dictionary is imported

---
 indra/newview/skins/default/xui/en/notifications.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c04e33fe8e..79e02727e9 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2396,6 +2396,17 @@ Would you be my friend?
     <tag>fail</tag>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="SpellingDictIsSecondary"
+   type="alertmodal">
+The dictionary [DIC_NAME] does not appear to have an "aff" file; this means that it is a "secondary" dictionary.
+It can be used as an additional dictionary, but not as your Main dictionary.
+
+See https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
+    <tag>confirm</tag>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="SpellingDictImportFailed"
-- 
cgit v1.2.3


From 5dceb6b06c8493d0bf0e21ead14539185bd4b4a8 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 20 Jun 2012 21:52:42 -0400
Subject: STORM-1889: require all fields when importing spelling dictionary

---
 indra/newview/skins/default/xui/en/notifications.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 79e02727e9..1cb0fad9a9 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2396,6 +2396,14 @@ Would you be my friend?
     <tag>fail</tag>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="SpellingDictImportRequired"
+   type="alertmodal">
+    You must specify a file, a name, and a language.
+    <tag>fail</tag>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="SpellingDictIsSecondary"
-- 
cgit v1.2.3