Index: src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/TrackEditor.cs
===================================================================
--- src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/TrackEditor.cs	(revisión: 4386)
+++ src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/TrackEditor.cs	(copia de trabajo)
@@ -59,6 +59,8 @@
         public string AlbumArtist;
         public string TrackTitle;
         public string Genre;
+        public string Composer;
+        public string Comment;
         public SafeUri Uri;
         
         public int Disc;
@@ -97,6 +99,8 @@
             Year = track.Year;
             Uri = track.Uri;
             Rating = track.Rating;
+            Composer = track.Composer ?? String.Empty;
+            Comment = track.Comment ?? String.Empty;
         }
         
         public void Save ()
@@ -112,6 +116,8 @@
             track.Uri = Uri;
             track.Year = Year;
             track.Rating = Rating;
+            track.Composer = Composer;
+            track.Comment = Comment;
         }
         
         public TrackInfo Track {
@@ -136,6 +142,8 @@
         [Widget] private Button DiscSync;
         [Widget] private Button RatingSync;
         [Widget] private Button EnterNextTitle;
+        [Widget] private Button ComposerSync;
+        [Widget] private Button CommentSync;
         [Widget] private SpinButton TrackCount;
         [Widget] private SpinButton TrackNumber;
         [Widget] private SpinButton Disc;
@@ -144,6 +152,8 @@
         [Widget] private Entry Artist;
         [Widget] private Entry Album;
         [Widget] private Entry Title;
+        [Widget] private Entry Composer;
+        [Widget] private Entry Comment;
         [Widget] private ComboBoxEntry Genre;
         [Widget] private Entry Uri;
         [Widget] private Entry Location;
@@ -200,6 +210,8 @@
             GenreSync.Clicked += OnGenreSyncClicked;
             DiscSync.Clicked += OnDiscSyncClicked;
             YearSync.Clicked += OnYearSyncClicked;
+            ComposerSync.Clicked += OnComposerSyncClicked;
+            CommentSync.Clicked += OnCommentSyncClicked;
             SyncAll.Clicked += OnSyncAllClicked;
             RatingSync.Clicked += OnRatingSyncClicked;
             EnterNextTitle.Clicked += OnEnterNextTitleClicked;
@@ -212,6 +224,8 @@
             Year.Changed += OnValueEdited;
             Genre.Entry.Changed += OnValueEdited;
             rating_entry.Changed += OnValueEdited;
+            Composer.Changed += OnValueEdited;
+            Comment.Changed += OnValueEdited;
             
             ListStore genre_model = new ListStore (typeof (string));
             Genre.Model = genre_model;
@@ -238,6 +252,8 @@
             GenreSync.Visible = TrackSet.Count > 1;
             DiscSync.Visible = TrackSet.Count > 1;
             YearSync.Visible = TrackSet.Count > 1;
+            ComposerSync.Visible = TrackSet.Count > 1;
+            CommentSync.Visible = TrackSet.Count > 1;
             RatingSync.Visible = TrackSet.Count > 1;
             EnterNextTitle.Visible = TrackSet.Count > 1;
             Glade["SyncAllAlignment"].Visible = TrackSet.Count > 1;
@@ -252,6 +268,8 @@
             tips.SetTip (DiscSync, Catalog.GetString ("Set all disc numbers to this value"), "discs");
             tips.SetTip (GenreSync, Catalog.GetString ("Set all genres to this value"), "genres"); 
             tips.SetTip (YearSync, Catalog.GetString ("Set all years to this value"), "years");
+            tips.SetTip (ComposerSync, Catalog.GetString ("Set all composers to this value"), "composers");
+            tips.SetTip (CommentSync, Catalog.GetString ("Set all comments to this value"), "comments");
             tips.SetTip (SyncAll, Catalog.GetString ("Apply the values of this track set for the Artist, Album Title, Genre, Track count, Year, and Rating fields to the rest of the selected tracks in this editor."), "all");
             tips.SetTip (RatingSync, Catalog.GetString ("Set all ratings to this value"), "ratings");
             
@@ -311,6 +329,8 @@
             (Glade["Album"] as Entry).Text = track.AlbumTitle;
             (Glade["Title"] as Entry).Text = track.TrackTitle;
             (Glade["Genre"] as ComboBoxEntry).Entry.Text = track.Genre;
+            (Glade["Composer"] as Entry).Text = track.Composer;
+            (Glade["Comment"] as Entry).Text = track.Comment;
             
             (Glade["DurationLabel"] as Label).Text = DateTimeUtil.FormatDuration (track.Track.Duration);
             (Glade["PlayCountLabel"] as Label).Text = track.Track.PlayCount.ToString ();
@@ -508,6 +528,20 @@
             }
         }
         
+        private void OnComposerSyncClicked (object o, EventArgs args)
+        {
+            foreach (EditorTrack track in TrackSet) {
+                track.Composer = Composer.Text;
+            }
+        }
+        
+        private void OnCommentSyncClicked (object o, EventArgs args)
+        {
+            foreach (EditorTrack track in TrackSet) {
+                track.Comment = Comment.Text;
+            }
+        }
+        
         private void OnSyncAllClicked (object o, EventArgs args)
         {
             OnTrackCountSyncClicked (o, args);
@@ -518,6 +552,8 @@
             OnArtistSyncClicked (o, args);
             OnYearSyncClicked (o, args);
             OnRatingSyncClicked (o, args);
+            OnComposerSyncClicked (o, args);
+            OnCommentSyncClicked (o, args);
         }
         
         private void OnGenreSyncClicked (object o, EventArgs args)
Index: src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade
===================================================================
--- src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade	(revisión: 4386)
+++ src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade	(copia de trabajo)
@@ -20,18 +20,18 @@
                   <widget class="GtkTable" id="EditorTable">
                     <property name="visible">True</property>
                     <property name="border_width">10</property>
-                    <property name="n_rows">11</property>
-                    <property name="n_columns">4</property>
+                    <property name="n_rows">10</property>
+                    <property name="n_columns">6</property>
                     <property name="column_spacing">2</property>
                     <property name="row_spacing">5</property>
                     <child>
-                      <widget class="GtkButton" id="AlbumArtistSync">
+                      <widget class="GtkButton" id="CommentSync">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
                         <property name="response_id">0</property>
                         <child>
-                          <widget class="GtkImage" id="image3">
+                          <widget class="GtkImage" id="image11">
                             <property name="visible">True</property>
                             <property name="stock">gtk-copy</property>
                             <property name="icon_size">1</property>
@@ -39,12 +39,32 @@
                         </child>
                       </widget>
                       <packing>
+                        <property name="top_attach">7</property>
+                        <property name="bottom_attach">8</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <placeholder/>
+                      <widget class="GtkButton" id="ComposerSync">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="relief">GTK_RELIEF_NONE</property>
+                        <property name="response_id">0</property>
+                        <child>
+                          <widget class="GtkImage" id="image8">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-copy</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="top_attach">6</property>
+                        <property name="bottom_attach">7</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
                     </child>
                     <child>
                       <placeholder/>
@@ -59,148 +79,181 @@
                       <placeholder/>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label42">
+                      <widget class="GtkAlignment" id="alignment9">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Track _number:&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">TrackNumber</property>
+                        <property name="left_padding">10</property>
+                        <child>
+                          <widget class="GtkEntry" id="Comment">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                          </widget>
+                        </child>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">5</property>
-                        <property name="bottom_attach">6</property>
-                        <property name="x_options">GTK_FILL</property>
+                        <property name="left_attach">2</property>
+                        <property name="right_attach">6</property>
+                        <property name="top_attach">7</property>
+                        <property name="bottom_attach">8</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label43">
+                      <widget class="GtkLabel" id="label11">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Track _count:&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">&lt;b&gt;_Comment:&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                         <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">TrackCount</property>
+                        <property name="mnemonic_widget">Artist</property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">6</property>
-                        <property name="bottom_attach">7</property>
+                        <property name="top_attach">7</property>
+                        <property name="bottom_attach">8</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label54">
+                      <widget class="GtkAlignment" id="alignment2">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;_Disc:&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">Disc</property>
+                        <property name="left_padding">10</property>
+                        <child>
+                          <widget class="GtkEntry" id="Composer">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                          </widget>
+                        </child>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">7</property>
-                        <property name="bottom_attach">8</property>
-                        <property name="x_options">GTK_FILL</property>
+                        <property name="left_attach">2</property>
+                        <property name="right_attach">6</property>
+                        <property name="top_attach">6</property>
+                        <property name="bottom_attach">7</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label66">
+                      <widget class="GtkLabel" id="label10">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;_Year:&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Com_poser:&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                         <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">Year</property>
+                        <property name="mnemonic_widget">Artist</property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">8</property>
-                        <property name="bottom_attach">9</property>
+                        <property name="top_attach">6</property>
+                        <property name="bottom_attach">7</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="ArtistSync">
+                      <widget class="GtkAlignment" id="SyncAllAlignment">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="relief">GTK_RELIEF_NONE</property>
-                        <property name="response_id">0</property>
+                        <property name="top_padding">10</property>
                         <child>
-                          <widget class="GtkImage" id="image5">
+                          <widget class="GtkButton" id="SyncAll">
                             <property name="visible">True</property>
-                            <property name="stock">gtk-copy</property>
-                            <property name="icon_size">1</property>
+                            <property name="can_focus">True</property>
+                            <property name="relief">GTK_RELIEF_NONE</property>
+                            <property name="response_id">0</property>
+                            <child>
+                              <widget class="GtkAlignment" id="alignment17">
+                                <property name="visible">True</property>
+                                <property name="xscale">0</property>
+                                <property name="yscale">0</property>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox22">
+                                    <property name="visible">True</property>
+                                    <property name="spacing">2</property>
+                                    <child>
+                                      <widget class="GtkImage" id="image20">
+                                        <property name="visible">True</property>
+                                        <property name="stock">gtk-copy</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkLabel" id="label84">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes">Apply common field values to all tracks</property>
+                                        <property name="use_underline">True</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                </child>
+                              </widget>
+                            </child>
                           </widget>
                         </child>
                       </widget>
                       <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
+                        <property name="right_attach">6</property>
+                        <property name="top_attach">9</property>
+                        <property name="bottom_attach">10</property>
+                        <property name="x_options"></property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="AlbumSync">
+                      <widget class="GtkAlignment" id="alignment25">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="relief">GTK_RELIEF_NONE</property>
-                        <property name="response_id">0</property>
+                        <property name="left_padding">10</property>
                         <child>
-                          <widget class="GtkImage" id="image6">
+                          <widget class="GtkEntry" id="Year">
                             <property name="visible">True</property>
-                            <property name="stock">gtk-copy</property>
-                            <property name="icon_size">1</property>
+                            <property name="can_focus">True</property>
+                            <property name="width_chars">4</property>
                           </widget>
                         </child>
                       </widget>
                       <packing>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="x_options">GTK_FILL</property>
+                        <property name="left_attach">5</property>
+                        <property name="right_attach">6</property>
+                        <property name="top_attach">5</property>
+                        <property name="bottom_attach">6</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="GenreSync">
+                      <widget class="GtkLabel" id="label66">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="relief">GTK_RELIEF_NONE</property>
-                        <property name="response_id">0</property>
-                        <child>
-                          <widget class="GtkImage" id="image9">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-copy</property>
-                            <property name="icon_size">1</property>
-                          </widget>
-                        </child>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">&lt;b&gt;_Year:&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">Year</property>
                       </widget>
                       <packing>
-                        <property name="top_attach">4</property>
-                        <property name="bottom_attach">5</property>
+                        <property name="left_attach">4</property>
+                        <property name="right_attach">5</property>
+                        <property name="top_attach">5</property>
+                        <property name="bottom_attach">6</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="TrackCountSync">
+                      <widget class="GtkButton" id="YearSync">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
                         <property name="response_id">0</property>
                         <child>
-                          <widget class="GtkImage" id="image4">
+                          <widget class="GtkImage" id="image10">
                             <property name="visible">True</property>
                             <property name="stock">gtk-copy</property>
                             <property name="icon_size">1</property>
@@ -208,41 +261,62 @@
                         </child>
                       </widget>
                       <packing>
-                        <property name="top_attach">6</property>
-                        <property name="bottom_attach">7</property>
+                        <property name="left_attach">3</property>
+                        <property name="right_attach">4</property>
+                        <property name="top_attach">5</property>
+                        <property name="bottom_attach">6</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="DiscSync">
+                      <widget class="GtkAlignment" id="alignment24">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="relief">GTK_RELIEF_NONE</property>
-                        <property name="response_id">0</property>
+                        <property name="left_padding">10</property>
                         <child>
-                          <widget class="GtkImage" id="image4">
+                          <widget class="GtkSpinButton" id="Disc">
                             <property name="visible">True</property>
-                            <property name="stock">gtk-copy</property>
-                            <property name="icon_size">1</property>
+                            <property name="can_focus">True</property>
+                            <property name="width_chars">2</property>
+                            <property name="adjustment">1 0 1000 1 10 10</property>
+                            <property name="climb_rate">1</property>
                           </widget>
                         </child>
                       </widget>
                       <packing>
-                        <property name="top_attach">7</property>
-                        <property name="bottom_attach">8</property>
+                        <property name="left_attach">5</property>
+                        <property name="right_attach">6</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label54">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">&lt;b&gt;_Disc:&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">Disc</property>
+                      </widget>
+                      <packing>
+                        <property name="left_attach">4</property>
+                        <property name="right_attach">5</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="YearSync">
+                      <widget class="GtkButton" id="DiscSync">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="relief">GTK_RELIEF_NONE</property>
                         <property name="response_id">0</property>
                         <child>
-                          <widget class="GtkImage" id="image10">
+                          <widget class="GtkImage" id="image4">
                             <property name="visible">True</property>
                             <property name="stock">gtk-copy</property>
                             <property name="icon_size">1</property>
@@ -250,60 +324,66 @@
                         </child>
                       </widget>
                       <packing>
-                        <property name="top_attach">8</property>
-                        <property name="bottom_attach">9</property>
+                        <property name="left_attach">3</property>
+                        <property name="right_attach">4</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label63">
+                      <widget class="GtkAlignment" id="alignment018">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;_Genre:&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">Genre</property>
+                        <property name="left_padding">10</property>
+                        <child>
+                          <widget class="GtkEntry" id="AlbumArtist">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                          </widget>
+                        </child>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">4</property>
-                        <property name="bottom_attach">5</property>
-                        <property name="x_options">GTK_FILL</property>
+                        <property name="left_attach">2</property>
+                        <property name="right_attach">6</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label46">
+                      <widget class="GtkLabel" id="label044">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;_Title:&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Al_bum Artist:&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                         <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">Title</property>
+                        <property name="mnemonic_widget">Artist</property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label45">
+                      <widget class="GtkButton" id="AlbumArtistSync">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Albu_m:&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">Album</property>
+                        <property name="can_focus">True</property>
+                        <property name="relief">GTK_RELIEF_NONE</property>
+                        <property name="response_id">0</property>
+                        <child>
+                          <widget class="GtkImage" id="image3">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-copy</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
                       </widget>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
                         <property name="top_attach">2</property>
                         <property name="bottom_attach">3</property>
                         <property name="x_options">GTK_FILL</property>
@@ -311,29 +391,11 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label44">
+                      <widget class="GtkAlignment" id="alignment19">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Track _Artist:&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">Artist</property>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment18">
-                        <property name="visible">True</property>
                         <property name="left_padding">10</property>
                         <child>
-                          <widget class="GtkEntry" id="Artist">
+                          <widget class="GtkEntry" id="Album">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                           </widget>
@@ -341,65 +403,52 @@
                       </widget>
                       <packing>
                         <property name="left_attach">2</property>
-                        <property name="right_attach">4</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
+                        <property name="right_attach">3</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label044">
+                      <widget class="GtkLabel" id="label45">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Al_bum Artist:&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Albu_m:&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                         <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">Artist</property>
+                        <property name="mnemonic_widget">Album</property>
                       </widget>
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkAlignment" id="alignment018">
+                      <widget class="GtkButton" id="AlbumSync">
                         <property name="visible">True</property>
-                        <property name="left_padding">10</property>
+                        <property name="can_focus">True</property>
+                        <property name="relief">GTK_RELIEF_NONE</property>
+                        <property name="response_id">0</property>
                         <child>
-                          <widget class="GtkEntry" id="AlbumArtist">
+                          <widget class="GtkImage" id="image6">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="stock">gtk-copy</property>
+                            <property name="icon_size">1</property>
                           </widget>
                         </child>
                       </widget>
                       <packing>
-                        <property name="left_attach">2</property>
-                        <property name="right_attach">4</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
+                        <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkAlignment" id="alignment19">
-                        <property name="visible">True</property>
-                        <property name="left_padding">10</property>
-                        <child>
-                          <widget class="GtkEntry" id="Album">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">2</property>
-                        <property name="right_attach">4</property>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
                       <widget class="GtkAlignment" id="alignment20">
                         <property name="visible">True</property>
                         <property name="left_padding">10</property>
@@ -432,13 +481,27 @@
                       </widget>
                       <packing>
                         <property name="left_attach">2</property>
-                        <property name="right_attach">4</property>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
+                        <property name="right_attach">6</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
+                      <widget class="GtkLabel" id="label46">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">&lt;b&gt;_Title:&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">Title</property>
+                      </widget>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
                       <widget class="GtkAlignment" id="alignment21">
                         <property name="visible">True</property>
                         <property name="left_padding">10</property>
@@ -454,7 +517,7 @@
                       </widget>
                       <packing>
                         <property name="left_attach">2</property>
-                        <property name="right_attach">4</property>
+                        <property name="right_attach">6</property>
                         <property name="top_attach">4</property>
                         <property name="bottom_attach">5</property>
                         <property name="x_options">GTK_FILL</property>
@@ -462,140 +525,99 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkAlignment" id="alignment23">
+                      <widget class="GtkAlignment" id="alignment18">
                         <property name="visible">True</property>
                         <property name="left_padding">10</property>
                         <child>
-                          <widget class="GtkSpinButton" id="TrackCount">
+                          <widget class="GtkEntry" id="Artist">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="adjustment">1 0 1000 1 10 10</property>
-                            <property name="climb_rate">1</property>
                           </widget>
                         </child>
                       </widget>
                       <packing>
                         <property name="left_attach">2</property>
-                        <property name="right_attach">3</property>
-                        <property name="top_attach">6</property>
-                        <property name="bottom_attach">7</property>
+                        <property name="right_attach">6</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkAlignment" id="alignment24">
+                      <widget class="GtkLabel" id="label44">
                         <property name="visible">True</property>
-                        <property name="left_padding">10</property>
-                        <child>
-                          <widget class="GtkSpinButton" id="Disc">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">1 0 1000 1 10 10</property>
-                            <property name="climb_rate">1</property>
-                          </widget>
-                        </child>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Track _Artist:&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">Artist</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">2</property>
-                        <property name="right_attach">3</property>
-                        <property name="top_attach">7</property>
-                        <property name="bottom_attach">8</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkAlignment" id="alignment25">
+                      <widget class="GtkLabel" id="label63">
                         <property name="visible">True</property>
-                        <property name="left_padding">10</property>
-                        <child>
-                          <widget class="GtkEntry" id="Year">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                          </widget>
-                        </child>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">&lt;b&gt;_Genre:&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">Genre</property>
                       </widget>
                       <packing>
-                        <property name="left_attach">2</property>
-                        <property name="right_attach">3</property>
-                        <property name="top_attach">8</property>
-                        <property name="bottom_attach">9</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">4</property>
+                        <property name="bottom_attach">5</property>
+                        <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkAlignment" id="alignment22">
+                      <widget class="GtkButton" id="GenreSync">
                         <property name="visible">True</property>
-                        <property name="left_padding">10</property>
+                        <property name="can_focus">True</property>
+                        <property name="relief">GTK_RELIEF_NONE</property>
+                        <property name="response_id">0</property>
                         <child>
-                          <widget class="GtkSpinButton" id="TrackNumber">
+                          <widget class="GtkImage" id="image9">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">1 0 1000 1 10 10</property>
-                            <property name="climb_rate">1</property>
+                            <property name="stock">gtk-copy</property>
+                            <property name="icon_size">1</property>
                           </widget>
                         </child>
                       </widget>
                       <packing>
-                        <property name="left_attach">2</property>
-                        <property name="right_attach">3</property>
-                        <property name="top_attach">5</property>
-                        <property name="bottom_attach">6</property>
+                        <property name="top_attach">4</property>
+                        <property name="bottom_attach">5</property>
+                        <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkAlignment" id="SyncAllAlignment">
+                      <widget class="GtkButton" id="ArtistSync">
                         <property name="visible">True</property>
-                        <property name="top_padding">10</property>
+                        <property name="can_focus">True</property>
+                        <property name="relief">GTK_RELIEF_NONE</property>
+                        <property name="response_id">0</property>
                         <child>
-                          <widget class="GtkButton" id="SyncAll">
+                          <widget class="GtkImage" id="image5">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="relief">GTK_RELIEF_NONE</property>
-                            <property name="response_id">0</property>
-                            <child>
-                              <widget class="GtkAlignment" id="alignment17">
-                                <property name="visible">True</property>
-                                <property name="xscale">0</property>
-                                <property name="yscale">0</property>
-                                <child>
-                                  <widget class="GtkHBox" id="hbox22">
-                                    <property name="visible">True</property>
-                                    <property name="spacing">2</property>
-                                    <child>
-                                      <widget class="GtkImage" id="image20">
-                                        <property name="visible">True</property>
-                                        <property name="stock">gtk-copy</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkLabel" id="label84">
-                                        <property name="visible">True</property>
-                                        <property name="label" translatable="yes">Apply common field values to all tracks</property>
-                                        <property name="use_underline">True</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                </child>
-                              </widget>
-                            </child>
+                            <property name="stock">gtk-copy</property>
+                            <property name="icon_size">1</property>
                           </widget>
                         </child>
                       </widget>
                       <packing>
-                        <property name="right_attach">4</property>
-                        <property name="top_attach">10</property>
-                        <property name="bottom_attach">11</property>
-                        <property name="x_options"></property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
@@ -614,10 +636,8 @@
                         </child>
                       </widget>
                       <packing>
-                        <property name="left_attach">3</property>
-                        <property name="right_attach">4</property>
                         <property name="top_attach">5</property>
-                        <property name="bottom_attach">7</property>
+                        <property name="bottom_attach">6</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options">GTK_FILL</property>
                       </packing>
@@ -637,8 +657,8 @@
                         </child>
                       </widget>
                       <packing>
-                        <property name="top_attach">9</property>
-                        <property name="bottom_attach">10</property>
+                        <property name="top_attach">8</property>
+                        <property name="bottom_attach">9</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
@@ -654,8 +674,8 @@
                       <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
-                        <property name="top_attach">9</property>
-                        <property name="bottom_attach">10</property>
+                        <property name="top_attach">8</property>
+                        <property name="bottom_attach">9</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
@@ -676,18 +696,100 @@
                       <packing>
                         <property name="left_attach">2</property>
                         <property name="right_attach">3</property>
-                        <property name="top_attach">9</property>
-                        <property name="bottom_attach">10</property>
+                        <property name="top_attach">8</property>
+                        <property name="bottom_attach">9</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment13">
+                        <property name="visible">True</property>
+                        <property name="left_padding">10</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox3">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkSpinButton" id="TrackNumber">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="width_chars">2</property>
+                                <property name="adjustment">1 0 1000 1 10 10</property>
+                                <property name="climb_rate">1</property>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label9">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">/</property>
+                              </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkButton" id="TrackCountSync">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="relief">GTK_RELIEF_NONE</property>
+                                <property name="response_id">0</property>
+                                <child>
+                                  <widget class="GtkImage" id="image1">
+                                    <property name="visible">True</property>
+                                    <property name="stock">gtk-copy</property>
+                                    <property name="icon_size">1</property>
+                                  </widget>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkSpinButton" id="TrackCount">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="width_chars">2</property>
+                                <property name="adjustment">1 0 1000 1 10 10</property>
+                                <property name="climb_rate">1</property>
+                              </widget>
+                              <packing>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="right_attach">3</property>
+                        <property name="top_attach">5</property>
+                        <property name="bottom_attach">6</property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label42">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Track _number:&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">TrackNumber</property>
+                      </widget>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">5</property>
+                        <property name="bottom_attach">6</property>
+                      </packing>
+                    </child>
                   </widget>
                 </child>
               </widget>
             </child>
             <child>
-              <widget class="GtkLabel" id="label63">
+              <widget class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Metadata</property>
               </widget>
@@ -721,50 +823,25 @@
                     <property name="column_spacing">10</property>
                     <property name="row_spacing">2</property>
                     <child>
-                      <widget class="GtkCheckButton" id="EmbedCoverArt">
+                      <widget class="GtkAlignment" id="alignment28">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Embed directly in song</property>
-                        <property name="use_underline">True</property>
-                        <property name="response_id">0</property>
-                        <property name="draw_indicator">True</property>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkVBox" id="vbox25">
-                        <property name="visible">True</property>
+                        <property name="top_padding">10</property>
                         <child>
-                          <widget class="GtkButton" id="CoverButton">
+                          <widget class="GtkCheckButton" id="CopyCoverArt">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="relief">GTK_RELIEF_NONE</property>
+                            <property name="label" translatable="yes">Save to song directory</property>
+                            <property name="use_underline">True</property>
                             <property name="response_id">0</property>
-                            <child>
-                              <widget class="GtkImage" id="CoverImage">
-                                <property name="visible">True</property>
-                                <property name="stock">gtk-missing-image</property>
-                                <property name="icon_size">6</property>
-                              </widget>
-                            </child>
+                            <property name="draw_indicator">True</property>
                           </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
                         </child>
                       </widget>
                       <packing>
-                        <property name="bottom_attach">3</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
@@ -852,23 +929,48 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkAlignment" id="alignment28">
+                      <widget class="GtkVBox" id="vbox25">
                         <property name="visible">True</property>
-                        <property name="top_padding">10</property>
                         <child>
-                          <widget class="GtkCheckButton" id="CopyCoverArt">
+                          <widget class="GtkButton" id="CoverButton">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Save to song directory</property>
-                            <property name="use_underline">True</property>
+                            <property name="relief">GTK_RELIEF_NONE</property>
                             <property name="response_id">0</property>
-                            <property name="draw_indicator">True</property>
+                            <child>
+                              <widget class="GtkImage" id="CoverImage">
+                                <property name="visible">True</property>
+                                <property name="stock">gtk-missing-image</property>
+                                <property name="icon_size">6</property>
+                              </widget>
+                            </child>
                           </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
                         </child>
                       </widget>
                       <packing>
+                        <property name="bottom_attach">3</property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options">GTK_FILL</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="EmbedCoverArt">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Embed directly in song</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
                         <property name="left_attach">1</property>
                         <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
@@ -908,128 +1010,184 @@
                 <property name="column_spacing">10</property>
                 <property name="row_spacing">5</property>
                 <child>
-                  <widget class="GtkLabel" id="label71">
+                  <widget class="GtkLabel" id="SampleRate">
                     <property name="visible">True</property>
+                    <property name="can_focus">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;File name:&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">Unknown</property>
+                    <property name="selectable">True</property>
                   </widget>
                   <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">8</property>
+                    <property name="bottom_attach">9</property>
                     <property name="x_options">GTK_FILL</property>
                     <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkEntry" id="Uri">
+                  <widget class="GtkLabel" id="Channels">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="editable">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Unknown</property>
+                    <property name="selectable">True</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
+                    <property name="top_attach">9</property>
+                    <property name="bottom_attach">10</property>
+                    <property name="x_options">GTK_FILL</property>
                     <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label72">
+                  <widget class="GtkAlignment" id="alignment8">
                     <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Location:&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="top_padding">10</property>
+                    <child>
+                      <widget class="GtkLabel" id="BitRate">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Unknown</property>
+                        <property name="selectable">True</property>
+                      </widget>
+                    </child>
                   </widget>
                   <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">7</property>
+                    <property name="bottom_attach">8</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkEntry" id="Location">
+                  <widget class="GtkAlignment" id="alignment7">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="editable">False</property>
+                    <property name="top_padding">10</property>
+                    <child>
+                      <widget class="GtkLabel" id="PlayCountLabel">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">0</property>
+                        <property name="use_markup">True</property>
+                        <property name="selectable">True</property>
+                      </widget>
+                    </child>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="y_options"></property>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label73">
+                  <widget class="GtkAlignment" id="alignment6">
                     <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Duration:&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="top_padding">10</property>
+                    <child>
+                      <widget class="GtkLabel" id="label81">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Bitrate:&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                    </child>
                   </widget>
                   <packing>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
+                    <property name="top_attach">7</property>
+                    <property name="bottom_attach">8</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label74">
+                  <widget class="GtkAlignment" id="alignment5">
                     <property name="visible">True</property>
+                    <property name="top_padding">10</property>
+                    <child>
+                      <widget class="GtkLabel" id="label76">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Play count:&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options">GTK_FILL</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label83">
+                    <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;File size:&lt;/b&gt;</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Channels:&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
                   </widget>
                   <packing>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
+                    <property name="top_attach">9</property>
+                    <property name="bottom_attach">10</property>
                     <property name="x_options">GTK_FILL</property>
                     <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="DurationLabel">
+                  <widget class="GtkLabel" id="label82">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">0:00</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Sample rate:&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
-                    <property name="selectable">True</property>
                   </widget>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
+                    <property name="top_attach">8</property>
+                    <property name="bottom_attach">9</property>
                     <property name="x_options">GTK_FILL</property>
                     <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="FileSize">
+                  <widget class="GtkLabel" id="ImportedLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">0 MB</property>
+                    <property name="label" translatable="yes">Unknown</property>
+                    <property name="use_markup">True</property>
                     <property name="selectable">True</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
+                    <property name="top_attach">6</property>
+                    <property name="bottom_attach">7</property>
                     <property name="x_options">GTK_FILL</property>
                     <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label77">
+                  <widget class="GtkLabel" id="LastPlayedLabel">
                     <property name="visible">True</property>
+                    <property name="can_focus">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Last played:&lt;/b&gt;</property>
+                    <property name="label" translatable="yes">Unknown</property>
                     <property name="use_markup">True</property>
+                    <property name="selectable">True</property>
                   </widget>
                   <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
                     <property name="top_attach">5</property>
                     <property name="bottom_attach">6</property>
                     <property name="x_options">GTK_FILL</property>
@@ -1051,17 +1209,13 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="LastPlayedLabel">
+                  <widget class="GtkLabel" id="label77">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Unknown</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Last played:&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
-                    <property name="selectable">True</property>
                   </widget>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
                     <property name="top_attach">5</property>
                     <property name="bottom_attach">6</property>
                     <property name="x_options">GTK_FILL</property>
@@ -1069,168 +1223,116 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="ImportedLabel">
+                  <widget class="GtkLabel" id="FileSize">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Unknown</property>
-                    <property name="use_markup">True</property>
+                    <property name="label" translatable="yes">0 MB</property>
                     <property name="selectable">True</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
-                    <property name="top_attach">6</property>
-                    <property name="bottom_attach">7</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
                     <property name="x_options">GTK_FILL</property>
                     <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label82">
+                  <widget class="GtkLabel" id="DurationLabel">
                     <property name="visible">True</property>
+                    <property name="can_focus">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Sample rate:&lt;/b&gt;</property>
+                    <property name="label" translatable="yes">0:00</property>
                     <property name="use_markup">True</property>
+                    <property name="selectable">True</property>
                   </widget>
                   <packing>
-                    <property name="top_attach">8</property>
-                    <property name="bottom_attach">9</property>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
                     <property name="x_options">GTK_FILL</property>
                     <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label83">
+                  <widget class="GtkLabel" id="label74">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Channels:&lt;/b&gt;</property>
+                    <property name="label" translatable="yes">&lt;b&gt;File size:&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
                   </widget>
                   <packing>
-                    <property name="top_attach">9</property>
-                    <property name="bottom_attach">10</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
                     <property name="x_options">GTK_FILL</property>
                     <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkAlignment" id="alignment5">
+                  <widget class="GtkLabel" id="label73">
                     <property name="visible">True</property>
-                    <property name="top_padding">10</property>
-                    <child>
-                      <widget class="GtkLabel" id="label76">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Play count:&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                    </child>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Duration:&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
                   </widget>
                   <packing>
-                    <property name="top_attach">4</property>
-                    <property name="bottom_attach">5</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options">GTK_FILL</property>
+                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkAlignment" id="alignment6">
+                  <widget class="GtkEntry" id="Location">
                     <property name="visible">True</property>
-                    <property name="top_padding">10</property>
-                    <child>
-                      <widget class="GtkLabel" id="label81">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Bitrate:&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                    </child>
+                    <property name="can_focus">True</property>
+                    <property name="editable">False</property>
                   </widget>
                   <packing>
-                    <property name="top_attach">7</property>
-                    <property name="bottom_attach">8</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkAlignment" id="alignment7">
-                    <property name="visible">True</property>
-                    <property name="top_padding">10</property>
-                    <child>
-                      <widget class="GtkLabel" id="PlayCountLabel">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">0</property>
-                        <property name="use_markup">True</property>
-                        <property name="selectable">True</property>
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
-                    <property name="top_attach">4</property>
-                    <property name="bottom_attach">5</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options">GTK_FILL</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkAlignment" id="alignment8">
+                  <widget class="GtkLabel" id="label72">
                     <property name="visible">True</property>
-                    <property name="top_padding">10</property>
-                    <child>
-                      <widget class="GtkLabel" id="BitRate">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Unknown</property>
-                        <property name="selectable">True</property>
-                      </widget>
-                    </child>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Location:&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
                   </widget>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">7</property>
-                    <property name="bottom_attach">8</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options">GTK_FILL</property>
+                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="Channels">
+                  <widget class="GtkEntry" id="Uri">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Unknown</property>
-                    <property name="selectable">True</property>
+                    <property name="editable">False</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
-                    <property name="top_attach">9</property>
-                    <property name="bottom_attach">10</property>
-                    <property name="x_options">GTK_FILL</property>
                     <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="SampleRate">
+                  <widget class="GtkLabel" id="label71">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Unknown</property>
-                    <property name="selectable">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;File name:&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
                   </widget>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">8</property>
-                    <property name="bottom_attach">9</property>
                     <property name="x_options">GTK_FILL</property>
                     <property name="y_options"></property>
                   </packing>
@@ -1415,31 +1517,33 @@
             <property name="column_spacing">16</property>
             <property name="row_spacing">12</property>
             <child>
-              <widget class="GtkLabel" id="MessageLabel">
+              <widget class="GtkCheckButton" id="DoNotShowCheckBox">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Your media library is empty. You may import new music and videos into your library now, or choose to do so later.</property>
-                <property name="wrap">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Do not show this dialog again</property>
+                <property name="use_underline">True</property>
+                <property name="response_id">0</property>
+                <property name="draw_indicator">True</property>
               </widget>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="y_options"></property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_EXPAND</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="label64">
+              <widget class="GtkImage" id="ImportIcon">
                 <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Import Media to Library&lt;/b&gt;&lt;/big&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="yalign">0</property>
+                <property name="stock">gtk-harddisk</property>
+                <property name="icon_size">6</property>
               </widget>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="y_options"></property>
+                <property name="bottom_attach">4</property>
+                <property name="x_options"></property>
               </packing>
             </child>
             <child>
@@ -1447,7 +1551,7 @@
                 <property name="visible">True</property>
                 <property name="spacing">4</property>
                 <child>
-                  <widget class="GtkLabel" id="label66">
+                  <widget class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Choose an import source:</property>
@@ -1468,33 +1572,31 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkImage" id="ImportIcon">
+              <widget class="GtkLabel" id="label64">
                 <property name="visible">True</property>
-                <property name="yalign">0</property>
-                <property name="stock">gtk-harddisk</property>
-                <property name="icon_size">6</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Import Media to Library&lt;/b&gt;&lt;/big&gt;</property>
+                <property name="use_markup">True</property>
               </widget>
               <packing>
-                <property name="bottom_attach">4</property>
-                <property name="x_options"></property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="y_options"></property>
               </packing>
             </child>
             <child>
-              <widget class="GtkCheckButton" id="DoNotShowCheckBox">
+              <widget class="GtkLabel" id="MessageLabel">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Do not show this dialog again</property>
-                <property name="use_underline">True</property>
-                <property name="response_id">0</property>
-                <property name="draw_indicator">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Your media library is empty. You may import new music and videos into your library now, or choose to do so later.</property>
+                <property name="wrap">True</property>
               </widget>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="right_attach">2</property>
-                <property name="top_attach">3</property>
-                <property name="bottom_attach">4</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_EXPAND</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="y_options"></property>
               </packing>
             </child>
           </widget>
@@ -1508,7 +1610,7 @@
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="CancelButton">
+              <widget class="GtkButton" id="CancelButton1">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -1816,52 +1918,52 @@
                           <placeholder/>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="disc_drive_label">
+                          <widget class="GtkEntry" id="disc_name_entry">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Write disc to:</property>
+                            <property name="can_focus">True</property>
                           </widget>
                           <packing>
-                            <property name="x_options">GTK_FILL</property>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label72">
+                          <widget class="GtkLabel" id="disc_name_label">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Disc format:</property>
+                            <property name="label" translatable="yes">Disc name:</property>
                           </widget>
                           <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="disc_name_label">
+                          <widget class="GtkLabel" id="label3">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Disc name:</property>
+                            <property name="label" translatable="yes">Disc format:</property>
                           </widget>
                           <packing>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkEntry" id="disc_name_entry">
+                          <widget class="GtkLabel" id="disc_drive_label">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Write disc to:</property>
                           </widget>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
+                            <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
@@ -1870,7 +1972,7 @@
                   </widget>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label69">
+                  <widget class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">&lt;b&gt;Session Information&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
@@ -1910,17 +2012,6 @@
                           <placeholder/>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label76">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Write speed:</property>
-                          </widget>
-                          <packing>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
                           <widget class="GtkCheckButton" id="eject_checkbutton">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -1938,12 +2029,23 @@
                             <property name="y_options"></property>
                           </packing>
                         </child>
+                        <child>
+                          <widget class="GtkLabel" id="label5">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Write speed:</property>
+                          </widget>
+                          <packing>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
                       </widget>
                     </child>
                   </widget>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label70">
+                  <widget class="GtkLabel" id="label6">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">&lt;b&gt;Write Options&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
@@ -1992,7 +2094,7 @@
                         <property name="visible">True</property>
                         <property name="spacing">2</property>
                         <child>
-                          <widget class="GtkImage" id="image10">
+                          <widget class="GtkImage" id="image2">
                             <property name="visible">True</property>
                             <property name="stock">gtk-cdrom</property>
                           </widget>
@@ -2037,7 +2139,7 @@
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox1">
+      <widget class="GtkVBox" id="dialog-vbox6">
         <property name="visible">True</property>
         <property name="spacing">8</property>
         <child>
@@ -2049,7 +2151,7 @@
               <widget class="GtkHBox" id="hbox1">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkLabel" id="label1">
+                  <widget class="GtkLabel" id="label7">
                     <property name="visible">True</property>
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes">Playlist _Name: </property>
@@ -2093,14 +2195,14 @@
                 <property name="visible">True</property>
                 <property name="left_padding">22</property>
                 <child>
-                  <widget class="GtkVBox" id="vbox1">
+                  <widget class="GtkVBox" id="vbox2">
                     <property name="visible">True</property>
                     <property name="spacing">8</property>
                     <child>
                       <widget class="GtkHBox" id="adv_box">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkScrolledWindow" id="scrolledwindow1">
+                          <widget class="GtkScrolledWindow" id="scrolledwindow2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
@@ -2129,7 +2231,7 @@
                                   <widget class="GtkHBox" id="hbox2">
                                     <property name="visible">True</property>
                                     <child>
-                                      <widget class="GtkImage" id="image1">
+                                      <widget class="GtkImage" id="image7">
                                         <property name="visible">True</property>
                                         <property name="stock">gtk-open</property>
                                       </widget>
@@ -2139,7 +2241,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="label2">
+                                      <widget class="GtkLabel" id="label8">
                                         <property name="visible">True</property>
                                         <property name="label" translatable="yes">Open in editor</property>
                                       </widget>
@@ -2227,11 +2329,11 @@
           </packing>
         </child>
         <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area1">
+          <widget class="GtkHButtonBox" id="dialog-action_area6">
             <property name="visible">True</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
-              <widget class="GtkButton" id="button1">
+              <widget class="GtkButton" id="button3">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>

