Presenting GNOME 2.16.1 for FreeBSD. This release represents a massive

amount of work by the FreeBSD GNOME Team and our testers.

On top of the usual GNOME update, we have taken this opportunity to move
GNOME from X11BASE to LOCALBASE.  This means roughly 600 ports NOT part of
the GNOME Desktop also need to be changed.  The bulk of the move was carried
out by ahze, mezz, and pav, but it would not have been possible without
cooperation from the FreeBSD KDE team who worked with us to make sure
GNOME and KDE can still coexist happily.  We would also like to send a
shout out to kris and pointyhat for putting up with multiple test runs
until we got something that was solid.

Back to GNOME 2.16.  This release brings a huge amount of new functionality
to FreeBSD.  The standard release notes can be read at
http://www.gnome.org/start/2.16/ .  But on top of what you will read there,
jylefort and marcus have completed work on a port of HAL to FreeBSD.  This
will allow FreeBSD to take advantage of closer hardware interaction such
as auto-mounting CD-ROMs, USB drives, and music players; auto-playing
audio CDs; and managing laptop power consumption.

But where would this all be without our loyal testers and contributors?
Therefore, the FreeBSD GNOME team would like to thank the following users:

Phillip Neumann <pneumann@gmail.com>
tmclaugh
mux
Yuri Pankov <yuri.pankov@gmail.com>
chinsan
Thomas <freebsdlists@bsdunix.ch>
Brian Gruber <knightbg@yahoo.com>
Franz Klammer <klammer@webonaut.com>
Dominique Goncalves <dominique.goncalves@gmail.com>
Pascal Hofstee <caelian@gmail.com>
Yasuda Keisuke <kysd@po.harenet.ne.jp>
backyard <backyard1454-bsd@yahoo.com>
Andris Raugulis <endrju@null.lv> <endrju@null.lv>
Eric L. Chen <d9364104@mail.nchu.edu.tw>
Pawel Worach <pawel.worach@gmail.com>
QuiRK on #freebsd-gnome
Shane Bell <decept0@gmail.com>
luigi
sajd on #freebsd-gnome
sat
Chris Coleman <chrisc@vmunix.com>
kaeru on #freebsd-gnome
crsd_ via irc.freenode.org/#FreeBSD-GNOME
Joel Diaz <joeldiaz@mac.com>

Enjoy!

Approved by:	portmgr (implicit, kris)

9 files changed, 160 insertions, 207 deletions

diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index 54303b847da0..da0fda1728aa 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -3,11 +3,11 @@
 # Whom:					lewiz <purple@lewiz.net>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/dasher/Makefile,v 1.34 2006/04/13 07:52:29 bland Exp $
+#   $MCom: ports/accessibility/dasher/Makefile,v 1.44 2006/09/03 21:33:52 marcus Exp $
 #
 
 PORTNAME=	dasher
-PORTVERSION=	4.0.4
+PORTVERSION=	4.2.0
 PORTEPOCH=	1
 CATEGORIES=	accessibility editors x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -22,14 +22,14 @@ RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier libgnomeui atspi \
-		libwnck
+		libwnck gnomedocutils
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
+INSTALLS_OMF=	yes
 USE_GCC=	3.4+
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/accessibility/dasher/distinfo b/accessibility/dasher/distinfo
index aefbdf60e7a1..86d91ceee590 100644
--- a/accessibility/dasher/distinfo
+++ b/accessibility/dasher/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/dasher-4.0.4.tar.bz2) = 6ab865403d29d9d3714e85840ed89dc7
-SHA256 (gnome2/dasher-4.0.4.tar.bz2) = 0862cc25e3f3e19d07d5f39b95abbb19abd99eff5220e1b23d92d3a05f1ca875
-SIZE (gnome2/dasher-4.0.4.tar.bz2) = 5707882
+MD5 (gnome2/dasher-4.2.0.tar.bz2) = 9db6f0ac46041300e7126a073a40530e
+SHA256 (gnome2/dasher-4.2.0.tar.bz2) = 1664de06b3090b762ae5292a6ccf01681e857a8f8e320fb552aad810256e76ca
+SIZE (gnome2/dasher-4.2.0.tar.bz2) = 5632602
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp b/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp
index da5a022d06c5..6b5fdba4a5ad 100644
--- a/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp
+++ b/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp
@@ -1,36 +1,20 @@
---- Src/DasherCore/FileLogger.cpp.orig	Tue Jan 17 01:41:44 2006
-+++ Src/DasherCore/FileLogger.cpp	Tue Jan 17 01:51:33 2006
-@@ -17,7 +17,7 @@ static char THIS_FILE[] = __FILE__;
- #include <windows.h>
- #endif
- 
--#include <sys/timeb.h>
-+#include <sys/time.h>
- 
- CFileLogger::CFileLogger(const std::string& strFilenamePath, eLogLevel iLogLevel, int iOptionsMask)
- {
-@@ -492,12 +492,12 @@ std::string CFileLogger::GetTimeDateStam
- 
-   if ((m_bTimeStamp) || (m_bDateStamp))
-   {
--    struct timeb sTimeBuffer;
-+    struct timeval sTimeBuffer;
-     char* szTimeLine = NULL;
- 
--    ftime(&sTimeBuffer);
-+    gettimeofday(&sTimeBuffer, NULL);
- 
--    szTimeLine = ctime(&(sTimeBuffer.time));
+--- Src/DasherCore/FileLogger.cpp.orig	Fri Apr 21 17:41:01 2006
++++ Src/DasherCore/FileLogger.cpp	Sun Jun 11 07:33:19 2006
+@@ -511,7 +511,7 @@
+     szTimeLine = ctime(&(sTimeBuffer.time));
+ #else
+     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+-    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
 +    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
- 
+ #endif
+  
      // Format is:
-     // Wed Jun 22 10:22:00 2005
-@@ -520,7 +520,7 @@ std::string CFileLogger::GetTimeDateStam
-           strTimeStamp += szTimeLine[i];
-         strTimeStamp += ".";
-         char strMs[16];
--        sprintf(strMs, "%d", sTimeBuffer.millitm);
+@@ -538,7 +538,7 @@
+ #ifdef _WIN32
+         sprintf(strMs, "%d", sTimeBuffer.millitm);
+ #else
+-        sprintf(strMs, "%d", sTimeBuffer.tv_usec / 1000);
 +        sprintf(strMs, "%d", (int) (sTimeBuffer.tv_usec / 1000));
+ #endif
          if (strlen(strMs) == 1)
            strTimeStamp += "00";
-         else if (strlen(strMs) == 2)
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp b/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp
index d8679afaed3e..745c41f85a5e 100644
--- a/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp
+++ b/accessibility/dasher/files/patch-Src_DasherCore_SimpleTimer.cpp
@@ -1,44 +1,24 @@
---- Src/DasherCore/SimpleTimer.cpp.orig	Tue Jan 17 01:43:17 2006
-+++ Src/DasherCore/SimpleTimer.cpp	Tue Jan 17 01:46:24 2006
-@@ -1,6 +1,6 @@
- #include "SimpleTimer.h"
+--- Src/DasherCore/SimpleTimer.cpp.orig	Wed May 31 00:14:12 2006
++++ Src/DasherCore/SimpleTimer.cpp	Wed May 31 00:14:23 2006
+@@ -34,8 +34,8 @@ CSimpleTimer::CSimpleTimer()
+     m_iStartSecond   = sTimeBuffer.time;
+ #else
+     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+-    m_iStartMs       = sTimeBuffer.tv_usec / 1000;
+-    m_iStartSecond   = sTimeBuffer.tv_sec;
++    m_iStartMs       = (int) sTimeBuffer.tv_usec / 1000;
++    m_iStartSecond   = (int) sTimeBuffer.tv_sec;
+ #endif
  
--#include <sys/timeb.h>
-+#include <sys/time.h>
- 
- // Track memory leaks on Windows to the line that new'd the memory
- #ifdef _WIN32
-@@ -14,12 +14,12 @@ static char THIS_FILE[] = __FILE__;
- 
- CSimpleTimer::CSimpleTimer()
- {
--  struct timeb sTimeBuffer;
-+  struct timeval sTimeBuffer;
- 
--  ftime(&sTimeBuffer);
-+  gettimeofday(&sTimeBuffer, NULL);
- 
--  m_iStartMs       = sTimeBuffer.millitm;
--  m_iStartSecond   = sTimeBuffer.time;
-+  m_iStartMs       = (int) (sTimeBuffer.tv_usec / 1000);
-+  m_iStartSecond   = (int) sTimeBuffer.tv_sec;
  }
- 
- CSimpleTimer::~CSimpleTimer()
-@@ -28,12 +28,12 @@ CSimpleTimer::~CSimpleTimer()
- 
- double CSimpleTimer::GetElapsed()
- {
--  struct timeb sTimeBuffer;
-+  struct timeval sTimeBuffer;
- 
--  ftime(&sTimeBuffer);
-+  gettimeofday(&sTimeBuffer, NULL);
- 
--  int     iEndMs       = sTimeBuffer.millitm;
--  int     iEndSecond   = sTimeBuffer.time;
-+  int     iEndMs       = (int) (sTimeBuffer.tv_usec / 1000);
+@@ -59,8 +59,8 @@ double CSimpleTimer::GetElapsed()
+   int     iEndSecond   = sTimeBuffer.time;
+ #else
+   gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+-  int     iEndMs       = sTimeBuffer.tv_usec / 1000;
+-  int     iEndSecond   = sTimeBuffer.tv_sec;
++  int     iEndMs       = (int) sTimeBuffer.tv_usec / 1000;
 +  int     iEndSecond   = (int) sTimeBuffer.tv_sec;
+ #endif
+ 
  
-   return  ((double) iEndMs     / 1000.0 + (double) iEndSecond) - 
-           ((double) m_iStartMs / 1000.0 + (double) m_iStartSecond);
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp b/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp
index d5bf37daf0d2..d41cf9bed26b 100644
--- a/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp
+++ b/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp
@@ -1,51 +1,29 @@
---- Src/DasherCore/TimeSpan.cpp.orig	Tue Jan 17 01:47:12 2006
-+++ Src/DasherCore/TimeSpan.cpp	Tue Jan 17 01:48:47 2006
-@@ -1,6 +1,6 @@
- 
- #include "TimeSpan.h"
--#include <sys/timeb.h>
-+#include <sys/time.h>
- 
- #ifdef _WIN32
- // In order to track leaks to line number, we need this at the top of every file
-@@ -102,12 +102,12 @@ string CTimeSpan::GetXML(const string& s
- string CTimeSpan::GetTimeStamp()
- {
-   string strTimeStamp = "";
--  struct timeb sTimeBuffer;
-+  struct timeval sTimeBuffer;
-   char* szTimeLine = NULL;
- 
--  ftime(&sTimeBuffer);
-+  gettimeofday(&sTimeBuffer, NULL);
- 
--  szTimeLine = ctime(&(sTimeBuffer.time));
-+  szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
- 
+--- Src/DasherCore/TimeSpan.cpp.orig	Fri Apr 21 17:41:02 2006
++++ Src/DasherCore/TimeSpan.cpp	Sun Jun 11 09:21:30 2006
+@@ -122,7 +122,7 @@
+     szTimeLine = ctime(&(sTimeBuffer.time));
+ #else
+     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+-    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
++    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
+ #endif
+   
    if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18))
-   {
-@@ -115,7 +115,7 @@ string CTimeSpan::GetTimeStamp()
-       strTimeStamp += szTimeLine[i];
-     strTimeStamp += ".";
-     char szMs[16];
--    sprintf(szMs, "%d", sTimeBuffer.millitm);
+@@ -134,7 +134,7 @@
+ #ifdef _WIN32
+     sprintf(szMs, "%d", sTimeBuffer.millitm);
+ #else
+-    sprintf(szMs, "%d", sTimeBuffer.tv_usec / 1000);
 +    sprintf(szMs, "%d", (int) (sTimeBuffer.tv_usec / 1000));
+ #endif
      if (strlen(szMs) == 1)
        strTimeStamp += "00";
-     else if (strlen(szMs) == 2)
-@@ -163,12 +163,12 @@ string CTimeSpan::GetDateStamp()
- {
-   std::string strDateStamp = "";
- 
--  struct timeb sTimeBuffer;
-+  struct timeval sTimeBuffer;
-   char* szTimeLine = NULL;
- 
--  ftime(&sTimeBuffer);
-+  gettimeofday(&sTimeBuffer, NULL);
- 
--  szTimeLine = ctime(&(sTimeBuffer.time));
-+  szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
- 
-   // Format is:
-   // Wed Jun 22 10:22:00 2005
+@@ -196,7 +196,7 @@
+     szTimeLine = ctime(&(sTimeBuffer.time));
+ #else
+     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+-    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
++    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
+ #endif
+ 
+  
diff --git a/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp b/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp
index 2ba6fec10fff..663e5426ef34 100644
--- a/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp
+++ b/accessibility/dasher/files/patch-Src_DasherCore_UserLog.cpp
@@ -1,41 +1,20 @@
---- Src/DasherCore/UserLog.cpp.orig	Tue Jan 17 01:49:12 2006
-+++ Src/DasherCore/UserLog.cpp	Tue Jan 17 01:50:11 2006
-@@ -1,7 +1,7 @@
- 
- #include "UserLog.h"
- #include <fstream>
--#include <sys/timeb.h>
-+#include <sys/time.h>
- 
- // Track memory leaks on Windows to the line that new'd the memory
- #ifdef _WIN32
-@@ -624,12 +624,12 @@ void CUserLog::SetOuputFilename(const st
-   {
-     m_strFilename = USER_LOG_DETAILED_PREFIX;
- 
--    struct timeb sTimeBuffer;
-+    struct timeval sTimeBuffer;
-     char* szTimeLine = NULL;
- 
--    ftime(&sTimeBuffer);
-+    gettimeofday(&sTimeBuffer, NULL);
- 
--    szTimeLine = ctime(&(sTimeBuffer.time));
+--- Src/DasherCore/UserLog.cpp.orig	Fri Apr 21 17:41:02 2006
++++ Src/DasherCore/UserLog.cpp	Sun Jun 11 10:43:33 2006
+@@ -668,7 +668,7 @@
+     szTimeLine = ctime(&(sTimeBuffer.time));
+ #else
+     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+-    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
 +    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
+ #endif
  
      if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18))
-     {
-@@ -829,10 +829,10 @@ bool CUserLog::UpdateMouseLocation()
- {
-   //CFunctionLogger f1("CUserLog::UpdateMouseLocation", g_pLogger);
- 
--  struct timeb sTimeBuffer;
--  ftime(&sTimeBuffer);
-+  struct timeval sTimeBuffer;
-+  gettimeofday(&sTimeBuffer, NULL);
- 
--  double dTime = (sTimeBuffer.time * 1000.0) + sTimeBuffer.millitm;
+@@ -881,7 +881,7 @@
+   double dTime = (sTimeBuffer.time * 1000.0) + sTimeBuffer.millitm;
+ #else
+   gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+-  double dTime = (sTimeBuffer.tv_sec * 1000.0) + sTimeBuffer.tv_usec / 1000;
 +  double dTime = (sTimeBuffer.tv_sec * 1000.0) + (int) (sTimeBuffer.tv_usec / 1000);
+ #endif
  
-   if ((dTime - m_dLastMouseUpdate) > LOG_MOUSE_EVERY_MS)
-   {
+   
diff --git a/accessibility/dasher/files/patch-Src_Gtk2_speech.cc b/accessibility/dasher/files/patch-Src_Gtk2_speech.cc
deleted file mode 100644
index 9817b2f11bb1..000000000000
--- a/accessibility/dasher/files/patch-Src_Gtk2_speech.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- Src/Gtk2/speech.cc.orig	Thu Jan 12 15:52:50 2006
-+++ Src/Gtk2/speech.cc	Tue Jan 17 01:29:35 2006
-@@ -74,6 +74,7 @@ void setup_speech() {
- void teardown_speech() {
- 
-   bonobo_object_release_unref(speaker, NULL);
-+  if (voices != NULL && !BONOBO_EX (&ev) && voices->_length != 0)
-   CORBA_free(voices);
-   GNOME_Speech_SynthesisDriver_unref(rv, &ev);
-   CORBA_exception_free(&ev);
diff --git a/accessibility/dasher/files/patch-configure b/accessibility/dasher/files/patch-configure
index 982daaac6663..7ade63c80eaf 100644
--- a/accessibility/dasher/files/patch-configure
+++ b/accessibility/dasher/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Tue Jan 31 01:13:42 2006
-+++ configure	Tue Jan 31 01:14:07 2006
-@@ -24818,7 +24818,7 @@
- 
- 
- GTK2BUILD_CFLAGS="$GTK2_CFLAGS $SETTINGS_CFLAGS $gthread_CFLAGS $gnome_speech_CFLAGS $gnome_a11y_CFLAGS $glade_CFLAGS $gnome_CFLAGS $wnck_CFLAGS $hildon_CFLAGS"
--GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS  -Wl,--export-dynamic,"
-+GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS  -Wl,--export-dynamic"
- 
+--- configure.orig	Wed May 17 00:00:16 2006
++++ configure	Wed May 17 00:01:21 2006
+@@ -24000,7 +24000,7 @@ GTK2BUILD_CFLAGS="$GTK2_CFLAGS $SETTINGS
+ if [ x"$WITHDARWIN" = xtrue ]; then
+       GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS"
+ else
+-      GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS -Wl,--export-dynamic,"
++      GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS -Wl,--export-dynamic"
+ fi
  
  
diff --git a/accessibility/dasher/pkg-plist b/accessibility/dasher/pkg-plist
index 90e5f81a82ea..27fbfaa616ba 100644
--- a/accessibility/dasher/pkg-plist
+++ b/accessibility/dasher/pkg-plist
@@ -7,7 +7,6 @@ share/gnome/dasher/alphabet.Austen.xml
 share/gnome/dasher/alphabet.Azerbaijani.xml
 share/gnome/dasher/alphabet.Belarusian.xml
 share/gnome/dasher/alphabet.Bulgarian.xml
-share/gnome/dasher/alphabet.C.xml
 share/gnome/dasher/alphabet.Esperanto.xml
 share/gnome/dasher/alphabet.Estonian.xml
 share/gnome/dasher/alphabet.Filipino.xml
@@ -42,6 +41,7 @@ share/gnome/dasher/alphabet.Tajik.xml
 share/gnome/dasher/alphabet.Tamil.xml
 share/gnome/dasher/alphabet.Telugu.xml
 share/gnome/dasher/alphabet.Thai.xml
+share/gnome/dasher/alphabet.Thai2.xml
 share/gnome/dasher/alphabet.Tsonga.xml
 share/gnome/dasher/alphabet.Tswana.xml
 share/gnome/dasher/alphabet.Turkish.xml
@@ -70,12 +70,10 @@ share/gnome/dasher/alphabet.corsican.xml
 share/gnome/dasher/alphabet.croatian.xml
 share/gnome/dasher/alphabet.czech.xml
 share/gnome/dasher/alphabet.danish.xml
-share/gnome/dasher/alphabet.danish2.xml
 share/gnome/dasher/alphabet.dtd
 share/gnome/dasher/alphabet.dutch.xml
 share/gnome/dasher/alphabet.english.xml
 share/gnome/dasher/alphabet.englishC.xml
-share/gnome/dasher/alphabet.englishLC.xml
 share/gnome/dasher/alphabet.ethiopic.xml
 share/gnome/dasher/alphabet.ewe.xml
 share/gnome/dasher/alphabet.faroese.xml
@@ -143,13 +141,13 @@ share/gnome/dasher/colour.euroasian.xml
 share/gnome/dasher/colour.euroasian2.xml
 share/gnome/dasher/colour.jamie.xml
 share/gnome/dasher/colour.rainbow.xml
+share/gnome/dasher/colour.thai.xml
 share/gnome/dasher/colour.vowels.xml
 share/gnome/dasher/colour.vowels2.xml
 share/gnome/dasher/colour.xml
 share/gnome/dasher/controllabels.dtd
 share/gnome/dasher/controllabels.xml
 share/gnome/dasher/dasher.glade
-share/gnome/dasher/dashermaemo.glade
 share/gnome/dasher/training_albanian_SQ.txt
 share/gnome/dasher/training_basque_EU.txt
 share/gnome/dasher/training_bengali_BD.txt
@@ -179,25 +177,22 @@ share/gnome/dasher/training_swedish_SE.txt
 share/gnome/dasher/training_turkish_TR.txt
 share/gnome/dasher/training_welsh_GB.txt
 share/gnome/help/dasher/C/dasher.xml
+share/gnome/help/dasher/C/figures/a-z.gif
+share/gnome/help/dasher/C/figures/aa-az.gif
+share/gnome/help/dasher/C/figures/ala-alz.gif
+share/gnome/help/dasher/C/figures/exampleHad2.png
+share/gnome/help/dasher/C/figures/exampleHad2a.png
+share/gnome/help/dasher/C/figures/exampleHad3a.png
+share/gnome/help/dasher/C/figures/exampleHad4.png
 share/gnome/help/dasher/C/figures/figure2.png
 share/gnome/help/dasher/C/figures/main.png
+share/gnome/help/dasher/C/figures/object.gif
 share/gnome/help/dasher/C/figures/prefs1.png
 share/gnome/help/dasher/C/figures/prefs2.png
 share/gnome/help/dasher/C/figures/prefs3.png
 share/gnome/help/dasher/C/figures/prefs4.png
 share/gnome/help/dasher/C/figures/prefs5.png
-share/gnome/help/dasher/C/version.xml
-share/gnome/help/dasher/eu/dasher.xml
-share/gnome/help/dasher/eu/figures/figure2.png
-share/gnome/help/dasher/eu/figures/main.png
-share/gnome/help/dasher/eu/figures/prefs1.png
-share/gnome/help/dasher/eu/figures/prefs2.png
-share/gnome/help/dasher/eu/figures/prefs3.png
-share/gnome/help/dasher/eu/figures/prefs4.png
-share/gnome/help/dasher/eu/figures/prefs5.png
-share/gnome/help/dasher/eu/version.xml
 share/gnome/omf/dasher/dasher-C.omf
-share/gnome/omf/dasher/dasher-eu.omf
 share/icons/hicolor/48x48/apps/dasher.png
 share/icons/hicolor/scalable/apps/dasher.svg
 share/locale/ar/LC_MESSAGES/dasher.mo
@@ -205,7 +200,7 @@ share/locale/az/LC_MESSAGES/dasher.mo
 share/locale/be/LC_MESSAGES/dasher.mo
 share/locale/bg/LC_MESSAGES/dasher.mo
 share/locale/bn/LC_MESSAGES/dasher.mo
-share/locale/br/LC_MESSAGES/dasher.mo
+share/locale/bn_IN/LC_MESSAGES/dasher.mo
 share/locale/bs/LC_MESSAGES/dasher.mo
 share/locale/ca/LC_MESSAGES/dasher.mo
 share/locale/cs/LC_MESSAGES/dasher.mo
@@ -234,17 +229,21 @@ share/locale/it/LC_MESSAGES/dasher.mo
 share/locale/ja/LC_MESSAGES/dasher.mo
 share/locale/ka/LC_MESSAGES/dasher.mo
 share/locale/ko/LC_MESSAGES/dasher.mo
+share/locale/ku/LC_MESSAGES/dasher.mo
 share/locale/ky/LC_MESSAGES/dasher.mo
 share/locale/lt/LC_MESSAGES/dasher.mo
 share/locale/lv/LC_MESSAGES/dasher.mo
+share/locale/mg/LC_MESSAGES/dasher.mo
 share/locale/mk/LC_MESSAGES/dasher.mo
+share/locale/ml/LC_MESSAGES/dasher.mo
 share/locale/mn/LC_MESSAGES/dasher.mo
+share/locale/mr/LC_MESSAGES/dasher.mo
 share/locale/ms/LC_MESSAGES/dasher.mo
 share/locale/nb/LC_MESSAGES/dasher.mo
 share/locale/ne/LC_MESSAGES/dasher.mo
 share/locale/nl/LC_MESSAGES/dasher.mo
-share/locale/no/LC_MESSAGES/dasher.mo
 share/locale/nn/LC_MESSAGES/dasher.mo
+share/locale/or/LC_MESSAGES/dasher.mo
 share/locale/pa/LC_MESSAGES/dasher.mo
 share/locale/pl/LC_MESSAGES/dasher.mo
 share/locale/pt/LC_MESSAGES/dasher.mo
@@ -253,6 +252,7 @@ share/locale/ro/LC_MESSAGES/dasher.mo
 share/locale/ru/LC_MESSAGES/dasher.mo
 share/locale/rw/LC_MESSAGES/dasher.mo
 share/locale/sk/LC_MESSAGES/dasher.mo
+share/locale/sl/LC_MESSAGES/dasher.mo
 share/locale/sq/LC_MESSAGES/dasher.mo
 share/locale/sr/LC_MESSAGES/dasher.mo
 share/locale/sr@Latn/LC_MESSAGES/dasher.mo
@@ -267,22 +267,64 @@ share/locale/vi/LC_MESSAGES/dasher.mo
 share/locale/zh_CN/LC_MESSAGES/dasher.mo
 share/locale/zh_HK/LC_MESSAGES/dasher.mo
 share/locale/zh_TW/LC_MESSAGES/dasher.mo
+@dirrm share/gnome/omf/dasher
+@dirrm share/gnome/help/dasher/C/figures
+@dirrm share/gnome/help/dasher/C
+@dirrm share/gnome/help/dasher
+@dirrm share/gnome/dasher
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
 @dirrmtry share/locale/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
-@dirrm share/gnome/omf/dasher
-@dirrm share/gnome/help/dasher/eu/figures
-@dirrm share/gnome/help/dasher/eu
-@dirrm share/gnome/help/dasher/C/figures
-@dirrm share/gnome/help/dasher/C
-@dirrm share/gnome/help/dasher
-@dirrm share/gnome/dasher
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be