From ed564994ae08e61d1df2564af30796c52c496360 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 6 Jan 2017 10:08:19 +0200
Subject: MAINT-7039 Fixed typo

---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 512deed054..58869ec602 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4031,7 +4031,7 @@ An update was downloaded. It will be installed during restart.
  icon="alertmodal.tga"
  name="UpdateCheckError"
  type="alertmodal">
-An error occured while checking for update.
+An error occurred while checking for update.
 Please try again later.
     <tag>confirm</tag>
     <usetemplate
-- 
cgit v1.2.3


From e10cc6d69dae10be846e20bbda74fc9cf9561729 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Tue, 31 Jan 2017 19:10:40 +0200
Subject: MAINT-7094 Fixed Adjust messages in the viewer for new xml tags

---
 .../newview/skins/default/xui/en/notifications.xml | 38 +++++++++++-----------
 1 file changed, 19 insertions(+), 19 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 58869ec602..c4190a4940 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -9849,29 +9849,29 @@ Eject failed because you don't have admin permission for that parcel.
 
   <notification
    icon="alertmodal.tga"
-   name="CantMoveObjectParcelFull"
+   name="CMOParcelFull"
    type="notify">
    <tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because the parcel is full.
+Can't move object '[O]' to
+[P] in region [R] because the parcel is full.
   </notification>
 
   <notification
    icon="alertmodal.tga"
-   name="CantMoveObjectParcelPerms"
+   name="CMOParcelPerms"
    type="notify">
    <tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because your objects are not allowed on this parcel.
+Can't move object '[O]' to
+[P] in region [R] because your objects are not allowed on this parcel.
   </notification>
 
   <notification
    icon="alertmodal.tga"
-   name="CantMoveObjectParcelResources"
+   name="CMOParcelResources"
    type="notify">
    <tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because there are not enough resources for this object on this parcel.
+Can't move object '[O]' to
+[P] in region [R] because there are not enough resources for this object on this parcel.
   </notification>
 
   <notification
@@ -9884,29 +9884,29 @@ Copy failed because you lack access to that parcel.
 
   <notification
    icon="alertmodal.tga"
-   name="CantMoveObjectRegionVersion"
+   name="CMORegionVersion"
    type="notify">
-   <tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because the other region is running an older version which does not support receiving this object via region crossing.
+    <tag>fail</tag>
+    Can't move object '[O]' to
+    [P] in region [R] because the other region is running an older version which does not support receiving this object via region crossing.
   </notification>
 
   <notification
    icon="alertmodal.tga"
-   name="CantMoveObjectNavMesh"
+   name="CMONavMesh"
    type="notify">
    <tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because you cannot modify the navmesh across region boundaries.
+Can't move object '[O]' to
+[P] in region [R] because you cannot modify the navmesh across region boundaries.
   </notification>
 
   <notification
    icon="alertmodal.tga"
-   name="CantMoveObjectWTF"
+   name="CMOWTF"
    type="notify">
    <tag>fail</tag>
-Can't move object '[OBJECT_NAME]' to
-[OBJ_POSITION] in region [REGION_NAME] because of an unknown reason. ([FAILURE_TYPE])
+Can't move object '[O]' to
+[P] in region [R] because of an unknown reason. ([F])
   </notification>
 
   <notification
-- 
cgit v1.2.3