+++ /dev/null
-diff -aurN gnome-panel-2.4.2.orig/gnome-panel/ChangeLog gnome-panel-2.4.2/gnome-panel/ChangeLog
---- gnome-panel-2.4.2.orig/gnome-panel/ChangeLog 2004-01-15 13:48:07.000000000 +0100
-+++ gnome-panel-2.4.2/gnome-panel/ChangeLog 2004-01-15 18:40:24.351547832 +0100
-@@ -131,6 +131,13 @@
-
- ==================== 2.4.1 ====================
-
-+2003-11-28 Marcin Krzyzanowski <krzak@linux.net.pl>
-+
-+ * menu.c: (create_applets_menu):
-+ Guess untranslated categories based on translated ones, what give
-+ us better menu order with translated and untranslated (the same)
-+ categories. Fix bug #127732
-+
- 2003-10-13 Owen Taylor <otaylor@redhat.com>
-
- * gnome-panel/panel-stock-icons.c (panel_init_stock_icons):
-diff -aurN gnome-panel-2.4.2.orig/gnome-panel/menu.c gnome-panel-2.4.2/gnome-panel/menu.c
---- gnome-panel-2.4.2.orig/gnome-panel/menu.c 2003-10-14 12:46:30.000000000 +0200
-+++ gnome-panel-2.4.2/gnome-panel/menu.c 2004-01-15 18:41:41.280852800 +0100
-@@ -2711,7 +2711,7 @@
- {
- GtkWidget *prev_menu = NULL;
- const char *prev_category = NULL;
-- int i;
-+ int i,j,k;
- const GList *langs_glist;
- GSList *langs_gslist;
- GSList *applets = NULL;
-@@ -2771,6 +2771,20 @@
-
- applets = g_slist_append (applets, applet);
- }
-+
-+ /* try to guess translations looking for already translated categories */
-+ for (j = 0; j < g_slist_length(applets); j++) {
-+ AppletMenuInfo *appletA = (AppletMenuInfo *) g_slist_nth_data (applets,j);
-+
-+ if (!g_utf8_collate (appletA->category,appletA->untranslated_category)) {
-+ for (k = 0; k < g_slist_length(applets); k++) {
-+ AppletMenuInfo *appletB = (AppletMenuInfo *) g_slist_nth_data (applets,k);
-+
-+ if (!g_utf8_collate (appletA->untranslated_category,appletB->untranslated_category))
-+ appletA->category = appletB->category;
-+ }
-+ }
-+ }
-
- /* add internal action buttons */
- applets = append_internal_applets (applets);
+++ /dev/null
-diff -urN aa/gnome-panel-2.7.4.1/gnome-panel/gnome-panel-preferences.desktop.in gnome-panel-2.7.4.1/gnome-panel/gnome-panel-preferences.desktop.in
---- aa/gnome-panel-2.7.4.1/gnome-panel/gnome-panel-preferences.desktop.in 2004-04-20 12:38:38.000000000 +0200
-+++ gnome-panel-2.7.4.1/gnome-panel/gnome-panel-preferences.desktop.in 2004-07-26 12:58:49.131850352 +0200
-@@ -8,7 +8,7 @@
- Type=Application
- StartupNotify=true
- OnlyShowIn=GNOME;
--Categories=Application;Settings;AdvancedSettings;
-+Categories=GTK;GNOME;Settings;AdvancedSettings;
- X-GNOME-DocPath=panel/globalpanelprefs.html
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-panel
+++ /dev/null
-diff -urN aa/gnome-panel-2.5.5/configure.in gnome-panel-2.5.5/configure.in
---- aa/gnome-panel-2.5.5/configure.in 2004-02-16 13:28:31.000000000 +0100
-+++ gnome-panel-2.5.5/configure.in 2004-02-17 00:14:03.491349480 +0100
-@@ -190,7 +190,7 @@
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
- AC_SUBST(GETTEXT_PACKAGE)
-
--ALL_LINGUAS="af am ar az be bg bn ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id it ja ko li lt lv mi mk ml mn mr ms nl nn no pa pl pt pt_BR ro ru sk sl sq sr sr@ije sr@Latn sv ta th tr uk wa vi yi zh_CN zh_TW"
-+ALL_LINGUAS="af am ar az be bg bn ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id it ja ko li lt lv mi mk ml mn mr ms nb nl nn pa pl pt pt_BR ro ru sk sl sq sr sr@ije sr@Latn sv ta th tr uk wa vi yi zh_CN zh_TW"
- AM_GLIB_GNU_GETTEXT
-
-
+++ /dev/null
-diff -urN aa/gnome-panel-2.6.0/applets/clock/clock.schemas.in gnome-panel-2.6.0/applets/clock/clock.schemas.in
---- aa/gnome-panel-2.6.0/applets/clock/clock.schemas.in 2004-01-09 13:56:03.000000000 +0100
-+++ gnome-panel-2.6.0/applets/clock/clock.schemas.in 2004-03-23 02:25:29.397225544 +0100
-@@ -108,8 +108,8 @@
- <key>/schemas/apps/clock_applet/prefs/hour_format</key>
- <owner>clock-applet</owner>
- <type>int</type>
-+ <default>24</default>
- <locale name="C">
-- <default>24</default>
- <short>Hour format</short>
- <long>
- The use of this key was deprecated in GNOME 2.6 in favour of the