[dasher] * Reorder "comments" in UI files so intltoolize can find them. * Remove some vestiges of NodeManager

[Patrick Welche <pwelche src gnome org>]

commit 5d24d37e7ae2a28d129313e441e6b98ed7c71d10
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Thu Jan 7 19:36:44 2010 +0000

    * Reorder "comments" in UI files so intltoolize can find them.
    * Remove some vestiges of NodeManager.h / DasherView.inl

 ChangeLog                           |    2 ++
 Data/GUI/dasher.preferences.ui      |   12 ++++++------
 Data/GUI/dashermaemo.preferences.ui |    2 +-
 Data/GUI/dashermaemo.ui             |    2 +-
 Src/DasherCore/Makefile.am          |    2 --
 5 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 207bd17..3103bfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 	* Remove some more deprecated last_modification properties
 	  in the UI files while solving some of the problems posed
 	  by F Wolff in #565774.
+	* Reorder "comments" in UI files so intltoolize can find them.
+	* Remove some vestiges of NodeManager.h / DasherView.inl
 
 2009-01-07  Philip Withnall <bugzilla tecnocode co uk>
 
diff --git a/Data/GUI/dasher.preferences.ui b/Data/GUI/dasher.preferences.ui
index 3349562..2b371cb 100644
--- a/Data/GUI/dasher.preferences.ui
+++ b/Data/GUI/dasher.preferences.ui
@@ -121,7 +121,7 @@
                                       <object class="GtkRadioButton" id="radiobutton6">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property comments="PPM = Prediction by Partial Match, a statistical language model." name="label" translatable="yes">Standard letter-based PPM</property>
+                                        <property name="label" translatable="yes" comments="PPM = Prediction by Partial Match, a statistical language model.">Standard letter-based PPM</property>
                                         <property name="use_underline">True</property>
                                         <property name="draw_indicator">True</property>
                                         <signal handler="languagemodel" name="clicked"/>
@@ -151,7 +151,7 @@
                                       <object class="GtkRadioButton" id="radiobutton8">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property comments="PPM =  Prediction by Partial Match, a statistical language model." name="label" translatable="yes">Mixture model (PPM/dictionary)</property>
+                                        <property name="label" translatable="yes" comments="PPM = Prediction by Partial Match, a statistical language model.">Mixture model (PPM/dictionary)</property>
                                         <property name="use_underline">True</property>
                                         <property name="draw_indicator">True</property>
                                         <property name="group">radiobutton6</property>
@@ -269,7 +269,7 @@
                                         <property name="xalign">0</property>
                                         <property name="xpad">2</property>
                                         <property name="ypad">2</property>
-                                        <property name="label" translatable="yes">Use this control to adjust the relative sizes of the
+                                        <property name="label" translatable="yes" comments="Line wrapping not necessary, but looks better for English">Use this control to adjust the relative sizes of the
 letter boxes. Note that selecting high values will slow
 your writing speed.</property>
                                         <property name="wrap">True</property>
@@ -332,7 +332,7 @@ your writing speed.</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="border_width">2</property>
-                                        <property comments="The default display orientation for the selected alphabet, ie left to right for English, right to left for Arabic, etc." name="label" translatable="yes">Alphabet Default</property>
+                                        <property name="label" translatable="yes" comments="The default display orientation for the selected alphabet, i.e., left to right for English, right to left for Arabic, etc.">Alphabet Default</property>
                                         <property name="use_underline">True</property>
                                         <property name="draw_indicator">True</property>
                                         <signal handler="orientation" name="clicked"/>
@@ -479,7 +479,7 @@ your writing speed.</property>
                           <object class="GtkLabel" id="label115">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Control Style&lt;/b&gt;</property>
+                            <property name="label" translatable="yes" comments="The way in which you would like to control dasher, e.g., using buttons for up/down, buttons for select, etc.">&lt;b&gt;Control Style&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </object>
                           <packing>
@@ -817,7 +817,7 @@ your writing speed.</property>
                 <child type="tab">
                   <object class="GtkLabel" id="label114">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Control</property>
+                    <property name="label" translatable="yes" comments="Abbreviation for Control Style">Control</property>
                   </object>
                   <packing>
                     <property name="position">1</property>
diff --git a/Data/GUI/dashermaemo.preferences.ui b/Data/GUI/dashermaemo.preferences.ui
index 941c656..a9f9fcf 100644
--- a/Data/GUI/dashermaemo.preferences.ui
+++ b/Data/GUI/dashermaemo.preferences.ui
@@ -252,7 +252,7 @@
                 <child type="tab">
                   <object class="GtkLabel" id="label17">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Control</property>
+                    <property name="label" translatable="yes" comments="The way in which you would like to control dasher, e.g., using buttons for up/down, buttons for select, etc.">Control</property>
                   </object>
                   <packing>
                     <property name="position">1</property>
diff --git a/Data/GUI/dashermaemo.ui b/Data/GUI/dashermaemo.ui
index b35a80e..5a17075 100644
--- a/Data/GUI/dashermaemo.ui
+++ b/Data/GUI/dashermaemo.ui
@@ -63,7 +63,7 @@
               <object class="GtkButton" id="button17">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="label" translatable="yes">P</property>
+                <property name="label" translatable="yes" comments="Abbreviation for Preferences">P</property>
                 <property name="use_underline">True</property>
                 <property name="relief">GTK_RELIEF_NORMAL</property>
                 <property name="focus_on_click">True</property>
diff --git a/Src/DasherCore/Makefile.am b/Src/DasherCore/Makefile.am
index 3fc85b8..fac7858 100644
--- a/Src/DasherCore/Makefile.am
+++ b/Src/DasherCore/Makefile.am
@@ -62,7 +62,6 @@ libdashercore_a_SOURCES = \
 		DasherTypes.h \
 		DasherView.cpp \
 		DasherView.h \
-		DasherView.inl \
 		DasherViewSquare.cpp \
 		DasherViewSquare.h \
 		DasherViewSquare.inl \
@@ -97,7 +96,6 @@ libdashercore_a_SOURCES = \
 		ModuleManager.h \
 		NodeCreationManager.cpp \
 		NodeCreationManager.h \
-		NodeManager.h \
 		ExpansionPolicy.cpp \
 		ExpansionPolicy.h \
 		OneButtonDynamicFilter.cpp \