From 38703d62e382bf7e57a0d3c2ab55714e99889e32 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Thu, 20 Nov 2014 08:37:55 -0500
Subject: STORM-2085 Spelling error and duplicate entry in notifications.xml

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f1d34a1449..83384e0902 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3792,17 +3792,6 @@ Leave Group?
      yestext="OK"/>
   </notification>
 
-  <notification
-   icon="aler.tga"
-   name="GroupDepartError"
-   type="alert">
-Unable to leave group: [reason].
-      <tag>reason</tag>
-      <usetemplate
-       name="okbutton"
-       yestext="OK"/>
-  </notification>
-
   <notification
    icon="alert.tga"
    name="GroupDepart"
@@ -3815,7 +3804,7 @@ You have left the group [group_name].
   </notification>
 
   <notification
-   icon="aler.tga"
+   icon="alert.tga"
    name="GroupDepartError"
    type="alert">
 Unable to leave group: [reason].
-- 
cgit v1.2.3


From 2e0d7ce282c007d791301ac73ff58c39dd40af81 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Fri, 21 Nov 2014 06:46:43 -0500
Subject: STORM-2085 Remove additional duplicate entry GroupDepart

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 83384e0902..05bda0259d 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3792,17 +3792,6 @@ Leave Group?
      yestext="OK"/>
   </notification>
 
-  <notification
-   icon="alert.tga"
-   name="GroupDepart"
-   type="alert">
-You have left the group [group_name].
-      <tag>group_name</tag>
-      <usetemplate
-       name="okbutton"
-       yestext="OK"/>
-  </notification>
-
   <notification
    icon="alert.tga"
    name="GroupDepartError"
-- 
cgit v1.2.3


From 4c96feb0e5b521275ce5298725b19833e0c42168 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Wed, 31 Dec 2014 07:20:52 -0500
Subject: STORM-2099 Minor formatting issue with logged out message

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ea1bc66236..157cd94939 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2463,8 +2463,9 @@ This is usually a temporary failure. Please customize and save the wearable agai
    icon="alertmodal.tga"
    name="YouHaveBeenLoggedOut"
    type="alertmodal">
-Darn. You have been logged out of [SECOND_LIFE]
-            [MESSAGE]
+Darn. You have been logged out of [SECOND_LIFE].
+
+[MESSAGE]
     <usetemplate
      name="okcancelbuttons"
      notext="Quit"
-- 
cgit v1.2.3


From eb5d634ef97a638f59785c507f7211674edef3ea Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 20 Feb 2015 18:05:41 -0500
Subject: separate tag and attribute names

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

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

diff --git a/indra/newview/skins/default/xui/pl/floater_font_test.xml b/indra/newview/skins/default/xui/pl/floater_font_test.xml
index 8542cafd16..7bf6c11d21 100755
--- a/indra/newview/skins/default/xui/pl/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/pl/floater_font_test.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floatername="contents" title="TEST CZCIONKI" />
+<floater name="contents" title="TEST CZCIONKI" />
-- 
cgit v1.2.3


From 79441b908dfc601ace11c438ac080480362c199d Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 23 Mar 2015 22:42:12 -0400
Subject: re-enable polish and danish

---
 .../skins/default/xui/en/panel_preferences_general.xml     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index f6665a1d5d..9da044ab64 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -39,7 +39,12 @@
          enabled="true"
          label="English"
          name="English"
-         value="en" />        
+         value="en" />
+        <combo_box.item
+         enabled="true"
+         label="Dansk (Danish) - Beta"
+         name="Danish"
+         value="da" />
         <combo_box.item
          enabled="true"
          label="Deutsch (German) - Beta"
@@ -59,7 +64,12 @@
          enabled="true"
          label="Italiano (Italian) - Beta"
          name="Italian"
-         value="it" />        
+         value="it" />
+        <combo_box.item
+         enabled="true"
+         label="Polski (Polish) - Beta"
+         name="Polish"
+         value="pl" />
         <combo_box.item
          enabled="true"
          label="Português (Portuguese) - Beta"
-- 
cgit v1.2.3