[gnome-control-center] notifications: replace unclear Banner term in UI

[Marek Kašík <mkasik src gnome org>]

commit 0c9657c0eddd4b09d0f18212adbb627d28d6dfcd
Author: Martin Hatina <mhatina redhat com>
Date:   Mon Jun 6 10:56:56 2016 +0200

    notifications: replace unclear Banner term in UI
    
    Users are not familiar with term 'banner', so it is replaced with
    term 'popup'. Also description has been added to the notifications
    and popups switches, which explains why someone might want to disable
    popups but leave notifications enabled.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=751369

 panels/notifications/edit-dialog.ui   |   57 ++++++++++++++++++++++++++------
 panels/notifications/notifications.ui |    2 +-
 2 files changed, 47 insertions(+), 12 deletions(-)
---
diff --git a/panels/notifications/edit-dialog.ui b/panels/notifications/edit-dialog.ui
index 1ed53a8..3100907 100644
--- a/panels/notifications/edit-dialog.ui
+++ b/panels/notifications/edit-dialog.ui
@@ -157,19 +157,54 @@
                     <property name="margin_top">12</property>
                     <property name="margin_bottom">12</property>
                     <child>
-                      <object class="GtkLabel" id="notification-banners-label">
+                      <object class="GtkBox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">True</property>
-                        <property name="xalign">0</property>
-                        <property name="margin_end">15</property>
-                        <property name="label" translatable="yes" context="notifications">Notification 
_Banners</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">notification-banners-switch</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <object class="GtkLabel" id="notification-banners-label">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="hexpand">True</property>
+                            <property name="vexpand">True</property>
+                            <property name="xalign">0</property>
+                            <property name="margin_end">15</property>
+                            <property name="label" translatable="yes" context="notifications">Notification 
_Popups</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">notification-banners-switch</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="notification-banners-info">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="max-width-chars">42</property>
+                            <property name="wrap-mode">word</property>
+                            <property name="label" translatable="yes">Notifications will continue to appear 
in the notification list when popups are disabled.</property>
+                            <property name="wrap">True</property>
+                            <property name="lines">-1</property>
+                            <property name="xalign">0</property>
+                            <style>
+                              <class name="dim-label"/>
+                            </style>
+                            <attributes>
+                              <attribute name="scale" value="0.83"/>
+                            </attributes>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
+                        <property name="expand">True</property>
                         <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
@@ -185,7 +220,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
@@ -215,7 +250,7 @@
                         <property name="vexpand">True</property>
                         <property name="xalign">0</property>
                         <property name="margin_end">15</property>
-                        <property name="label" translatable="yes" context="notifications" comments="Banners 
here refers to message tray notifications in the middle of the screen.">Show Message _Content in 
Banners</property>
+                        <property name="label" translatable="yes" context="notifications" comments="Popups 
here refers to message tray notifications in the middle of the screen.">Show Message _Content in 
Popups</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">notification-banners-content-switch</property>
                       </object>
diff --git a/panels/notifications/notifications.ui b/panels/notifications/notifications.ui
index 304b154..d86f19f 100644
--- a/panels/notifications/notifications.ui
+++ b/panels/notifications/notifications.ui
@@ -58,7 +58,7 @@
                                 <property name="margin_bottom">8</property>
                                 <property name="hexpand">True</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Notification _Banners</property>
+                                <property name="label" translatable="yes">Notification _Popups</property>
                                 <property name="use_underline">True</property>
                                 <property name="mnemonic_widget">ccnotify-switch-banners</property>
                               </object>