Add copyright/trademark attribution notices

1 files changed, 65 insertions, 35 deletions

diff --git a/src/paprefs.glade b/src/paprefs.glade
index 881b2cb..33ab460 100644
--- a/src/paprefs.glade
+++ b/src/paprefs.glade
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
 <glade-interface>
+  <!-- interface-requires gtk+ 2.16 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="mainWindow">
     <property name="title" translatable="yes">PulseAudio Preferences</property>
     <property name="resizable">False</property>
@@ -20,12 +20,13 @@
                 <child>
                   <widget class="GtkImage" id="image19">
                     <property name="visible">True</property>
-                    <property name="icon_size">6</property>
                     <property name="icon_name">preferences-desktop</property>
+                    <property name="icon-size">6</property>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -40,6 +41,9 @@
                         <property name="label" translatable="yes">&lt;span size="18000" color="black"&gt;&lt;b&gt;PulseAudio Preferences&lt;/b&gt;&lt;/span&gt;</property>
                         <property name="use_markup">True</property>
                       </widget>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <widget class="GtkLabel" id="label4825">
@@ -64,6 +68,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -93,16 +98,17 @@
                     <property name="spacing">6</property>
                     <child>
                       <widget class="GtkCheckButton" id="remoteAccessCheckButton">
+                        <property name="label" translatable="yes">Enable _network access to local sound devices</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Enable _network access to local sound devices</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -115,25 +121,26 @@
                             <property name="spacing">6</property>
                             <child>
                               <widget class="GtkCheckButton" id="zeroconfBrowseCheckButton">
+                                <property name="label" translatable="yes">Allow other machines on the LAN to _discover local sound devices</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Allow other machines on the LAN to _discover local sound devices</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
                               </widget>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <widget class="GtkCheckButton" id="anonymousAuthCheckButton">
+                                <property name="label" translatable="yes">Don't require _authentication</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Don't require _authentication</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
                               </widget>
                               <packing>
@@ -153,12 +160,12 @@
                     </child>
                     <child>
                       <widget class="GtkCheckButton" id="zeroconfDiscoverCheckButton">
+                        <property name="label" translatable="yes">_Make discoverable network sound devices available locally</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">_Make discoverable network sound devices available locally</property>
                         <property name="use_underline">True</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
@@ -169,12 +176,12 @@
                     </child>
                     <child>
                       <widget class="GtkCheckButton" id="zeroconfRaopDiscoverCheckButton">
+                        <property name="label" translatable="yes">Make discoverable Apple Air_tunes sound devices available locally</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Make discoverable Apple Air_tunes sound devices available locally</property>
                         <property name="use_underline">True</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
@@ -183,6 +190,18 @@
                         <property name="position">3</property>
                       </packing>
                     </child>
+                    <child>
+                      <widget class="GtkLabel" id="tm">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">&lt;i&gt;Apple and Airtunes are trademarks of Apple Inc., registered in the U.S. and other countries.&lt;/i&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="position">4</property>
+                      </packing>
+                    </child>
                   </widget>
                 </child>
                 <child>
@@ -193,8 +212,8 @@
                     <property name="use_underline">True</property>
                   </widget>
                   <packing>
-                    <property name="type">tab</property>
                     <property name="tab_fill">False</property>
+                    <property name="type">tab</property>
                   </packing>
                 </child>
                 <child>
@@ -204,25 +223,26 @@
                     <property name="spacing">6</property>
                     <child>
                       <widget class="GtkCheckButton" id="rtpReceiveCheckButton">
+                        <property name="label" translatable="yes">Enable Multicast/RTP _receiver</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Enable Multicast/RTP _receiver</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <widget class="GtkCheckButton" id="rtpSendCheckButton">
+                        <property name="label" translatable="yes">Enable Multicast/RTP _sender</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Enable Multicast/RTP _sender</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
@@ -241,25 +261,26 @@
                             <property name="spacing">6</property>
                             <child>
                               <widget class="GtkRadioButton" id="rtpMikeRadioButton">
+                                <property name="label" translatable="yes">Send audio from local _microphone</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Send audio from local _microphone</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
                               </widget>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <widget class="GtkRadioButton" id="rtpSpeakerRadioButton">
+                                <property name="label" translatable="yes">Send audio from local s_peakers</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Send audio from local s_peakers</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">rtpMikeRadioButton</property>
                               </widget>
@@ -271,11 +292,11 @@
                             </child>
                             <child>
                               <widget class="GtkRadioButton" id="rtpNullSinkRadioButton">
+                                <property name="label" translatable="yes">Create seperate audio _device for Multicast/RTP</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Create seperate audio _device for Multicast/RTP</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">rtpMikeRadioButton</property>
                               </widget>
@@ -287,11 +308,11 @@
                             </child>
                             <child>
                               <widget class="GtkCheckButton" id="rtpLoopbackCheckButton">
+                                <property name="label" translatable="yes">_Loopback audio to local speakers</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">_Loopback audio to local speakers</property>
+                                <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
                               </widget>
                               <packing>
@@ -320,9 +341,9 @@
                     <property name="use_underline">True</property>
                   </widget>
                   <packing>
-                    <property name="type">tab</property>
                     <property name="position">1</property>
                     <property name="tab_fill">False</property>
+                    <property name="type">tab</property>
                   </packing>
                 </child>
                 <child>
@@ -332,16 +353,17 @@
                     <property name="spacing">6</property>
                     <child>
                       <widget class="GtkCheckButton" id="combineCheckButton">
+                        <property name="label" translatable="yes">Add _virtual output device for simultaneous output on all local sound cards</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Add _virtual output device for simultaneous output on all local sound cards</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="response_id">0</property>
                         <property name="draw_indicator">True</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                   </widget>
@@ -357,32 +379,40 @@
                     <property name="use_underline">True</property>
                   </widget>
                   <packing>
-                    <property name="type">tab</property>
                     <property name="position">2</property>
                     <property name="tab_fill">False</property>
+                    <property name="type">tab</property>
                   </packing>
                 </child>
               </widget>
+              <packing>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkHButtonBox" id="hbuttonbox1">
                 <property name="visible">True</property>
-                <property name="layout_style">GTK_BUTTONBOX_END</property>
+                <property name="layout_style">end</property>
                 <child>
                   <widget class="GtkButton" id="closeButton">
+                    <property name="label">gtk-close</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
-                    <property name="label">gtk-close</property>
+                    <property name="receives_default">False</property>
                     <property name="use_stock">True</property>
-                    <property name="response_id">0</property>
                   </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="pack_type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>