Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

configure.in.in

@@ -407,5 +407,5 @@ if test "x$with_utempter" != xno; then
   fi
 fi
 
-KDE_INIT_DOXYGEN([The KDE API Reference], [Version $VERSION])
+KDE_INIT_DOXYGEN([The TDE API Reference], [Version $VERSION])
 KDE_CHECK_BINUTILS

tdeio/tdefile/tdefilespeedbar.cpp

@@ -97,7 +97,7 @@ KFileSpeedBar::KFileSpeedBar( TQWidget *parent, const char *name )
 			}
 			// now add in the speedbar
 			if (!download.isEmpty())
-                insertItem( download, i18n( "Download" ), false, "folder_html" );
+                insertItem( download, i18n( "Downloads" ), false, "folder_html" );
 			if (!music.isEmpty())
                 insertItem( music, i18n( "Music" ), false, "folder_sound" );
 			if (!pictures.isEmpty())