--- a/ChangeLog Tue Mar 16 03:30:33 2004 +0000
+++ b/ChangeLog Tue Mar 16 04:30:13 2004 +0000
@@ -1,3 +1,24 @@
+2004-03-16 Glynn Foster <[email protected]>
+
+ * gnome-applets.spec: Bump to 2.5.8
+ * patches/gnome-applets-02-gkb-window-icon-current.diff: Rename.
+ * patches/gnome-applets-02-stickynotes-icon.diff: Upstream, remove. Stupid.
+ * patches/gnome-applets-03-geyes-themes.diff: Upstream.
+ * patches/gnome-applets-03-mount-floppy-location.diff: Rename.
+ * patches/gnome-applets-04-g11n-i18n-ui.diff: Rename.
+ * patches/gnome-applets-04-gkb-window-icon-current.diff: Remove.
+ * patches/gnome-applets-05-mount-floppy-location.diff: Remove.
+ * patches/gnome-applets-05-non_portable_CFLAGS.diff: Rename, upstream, will
+ catch it on next release.
+ * patches/gnome-applets-06-add-l10n-docs.diff: Remove, upstream will catch
+ it on next release.
+ * patches/gnome-applets-06-g11n-schemas.diff: Rename.
+ * patches/gnome-applets-07-l10n-online-help.diff: Remove, upstream will catch
+ it on next release.
+ * patches/gnome-applets-08-g11n-i18n-ui.diff: Remove.
+ * patches/gnome-applets-09-non_portable_CFLAGS.diff: Remove.
+ * patches/gnome-applets-10-g11n-schemas.diff: Remove.
+
2004-03-16 Glynn Foster <[email protected]>
* gnome-address-applet.spec: Bump to 0.0.2 - which fixes a bunch of
--- a/gnome-applets.spec Tue Mar 16 03:30:33 2004 +0000
+++ b/gnome-applets.spec Tue Mar 16 04:30:13 2004 +0000
@@ -1,8 +1,8 @@
Name: gnome-applets
License: GPL
Group: System/GUI/GNOME
-Version: 2.5.6
-Release: 8
+Version: 2.5.8
+Release: 1
Distribution: Cinnabar
Vendor: Sun Microsystems, Inc.
Summary: GNOME Applets
@@ -10,17 +10,12 @@
Source1: gnome-applets-l10n-po-0.8.tar.bz2
Source2: gnome-mixer.png
Source3: gnome-applets_docs-0.3.tar.bz2
-Source4: gnome-applets-l10n-online-help-qs.tar.bz2
Patch1: gnome-applets-01-g11n-potfiles.diff
-Patch2: gnome-applets-02-stickynotes-icon.diff
-Patch3: gnome-applets-03-geyes-themes.diff
-Patch4: gnome-applets-04-gkb-window-icon-current.diff
-Patch5: gnome-applets-05-mount-floppy-location.diff
-Patch6: gnome-applets-06-add-l10n-docs.diff
-Patch7: gnome-applets-07-l10n-online-help.diff
-Patch8: gnome-applets-08-g11n-i18n-ui.diff
-Patch9: gnome-applets-09-non_portable_CFLAGS.diff
-Patch10: gnome-applets-10-g11n-schemas.diff
+Patch2: gnome-applets-02-gkb-window-icon-current.diff
+Patch3: gnome-applets-03-mount-floppy-location.diff
+Patch4: gnome-applets-04-g11n-i18n-ui.diff
+Patch5: gnome-applets-05-non_portable_CFLAGS.diff
+Patch6: gnome-applets-06-g11n-schemas.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/gnome-applets
@@ -54,13 +49,8 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
+%patch5 -p1 -b .non_portable_CFLAGS
%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1 -b .non_portable_CFLAGS
-%patch10 -p1
-bzcat %SOURCE4 | tar xvf -
%build
libtoolize --force
@@ -148,6 +138,9 @@
%{_libexecdir}/*
%changelog
+* Tue Mar 16 2004 - [email protected]
+- Updated version to 2.5.8, killed off a few patches that
+ we know are going to make 2.6.0, and sanitize things a little.
* Mon Mar 15 2004 - [email protected]
- Replaced gnome-applets-01-potfiles.diff with
gnome-applets-01-g11n-potfiles.diff
@@ -159,7 +152,6 @@
- Remerged all patches
- Brought forward NEW changes from patch
gnome-applets-19-i18n-ui.diff, This should have been ported to HEAD by Wipro !!!
-
* Tue Feb 17 2004 - <[email protected]>
- added patch to remove non-portable CFLAGS hardcoded in a Makefile.am
* Wed Feb 04 2004 - <[email protected]>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-02-gkb-window-icon-current.diff Tue Mar 16 04:30:13 2004 +0000
@@ -0,0 +1,62 @@
+--- ../gnome-applets-2.3.6.old/gkb-new/gkb.schemas.in 2003-08-11 15:39:58.000000000 +0100
++++ ./gkb-new/gkb.schemas.in 2003-08-11 15:48:38.000000000 +0100
+@@ -160,5 +160,15 @@
+ <long>This should be like "gkb_xmmap us", "setxkbmap us" or "xmodmap something.xmm"</long>
+ </locale>
+ </schema>
++ <schema>
++ <key>/schemas/apps/gkb-applet/prefs/current</key>
++ <owner>gkb-applet</owner>
++ <type>int</type>
++ <default>0</default>
++ <locale name="C">
++ <short>The default keymap</short>
++ <long>The default keymap for the applet</long>
++ </locale>
++ </schema>
+ </schemalist>
+ </gconfschemafile>
+--- ../gnome-applets-2.3.6.old/gkb-new/prop.c 2003-08-11 15:39:58.000000000 +0100
++++ ./gkb-new/prop.c 2003-08-11 15:46:17.000000000 +0100
+@@ -403,8 +403,8 @@
+ /* Create property box */
+ pbi->box = pbi->gkb->propwindow =
+ gtk_dialog_new_with_buttons ( include_applet_options
+- ? _("Keyboard Layout Switcher Preferences")
+- : _("Keyboard Layout Selector"),
++ ? _("Keyboard Layout")
++ : _("Keyboard Layout"),
+ NULL,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_HELP, GTK_RESPONSE_HELP,
+--- ../gnome-applets-2.3.6.old/gkb-new/gkb.c 2003-08-11 15:39:55.000000000 +0100
++++ ./gkb-new/gkb.c 2003-08-11 15:51:34.000000000 +0100
+@@ -195,6 +195,7 @@
+ if (gkb->update != NULL)
+ (gkb->update) (gkb, TRUE);
+ gkb_system_set_keymap (gkb);
++ gconf_applet_set_int ("current", gkb->cur);
+ }
+
+ /* When a size request is made, we need to redraw the pixbufs with the new
+@@ -459,13 +460,17 @@
+
+ gkb = g_new0 (GKB, 1);
+ gkb->n = 0;
+- gkb->cur = 0;
++ gkb->cur = gconf_applet_get_int ("current");
+
+ do_at_first_run ();
+ load_properties (gkb);
+- gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gkb.png");
++ gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-keyboard-layout.png");
+
+- gkb->keymap = g_list_nth_data (gkb->maps, 0);
++ gkb->keymap = g_list_nth_data (gkb->maps, gkb->cur);
++ if (!gkb->keymap) {
++ gkb->keymap = g_list_nth_data(gkb->maps, 0);
++ gkb->cur = 0;
++ }
+
+ gconf_client_notify_add (gconf_client_get_default (),
+ GKB_GCONF_ROOT, config_notify, gkb, NULL, NULL);
--- a/patches/gnome-applets-02-stickynotes-icon.diff Tue Mar 16 03:30:33 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
---- ../gnome-applets-2.5.5.old/stickynotes/Makefile.am 2004-02-03 17:07:28.000000000 +0000
-+++ ./stickynotes/Makefile.am 2004-02-03 17:08:04.000000000 +0000
-@@ -11,6 +11,7 @@
- $(GNOME_APPLETS_CFLAGS) \
- $(LIBGLADE_CFLAGS) \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-+ -DGNOMEICONDIR=\""$(datadir)/pixmaps"\" \
- -DSTICKYNOTES_GLADEDIR=\"$(gladedir)\" \
- -DSTICKYNOTES_ICONDIR=\"$(icondir)\"
-
---- ../gnome-applets-2.5.5.old/stickynotes/GNOME_StickyNotesApplet.server.in.in 2004-02-03 17:07:28.000000000 +0000
-+++ ./stickynotes/GNOME_StickyNotesApplet.server.in.in 2004-02-03 17:10:21.000000000 +0000
-@@ -16,7 +16,7 @@
- <oaf_attribute name="name" type="string" _value="Sticky Notes"/>
- <oaf_attribute name="description" type="string" _value="Create, view, and manage sticky notes on the desktop"/>
- <oaf_attribute name="panel:category" type="string" _value="Accessories"/>
-- <oaf_attribute name="panel:icon" type="string" value="stock_notes"/>
-+ <oaf_attribute name="panel:icon" type="string" value="gnome-note.png"/>
- <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
- <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
- <oaf_attribute name="bugzilla:component" type="string" value="stickynotes"/>
---- ../gnome-applets-2.5.5.old/stickynotes/stickynotes_applet.c 2004-02-03 17:07:28.000000000 +0000
-+++ ./stickynotes/stickynotes_applet.c 2004-02-03 17:19:11.000000000 +0000
-@@ -122,16 +122,7 @@
- stickynotes->notes = NULL;
- stickynotes->applets = NULL;
-
-- icon_theme = gnome_icon_theme_new ();
-- sticky_icon = gnome_icon_theme_lookup_icon (icon_theme, "stock_notes", 48, NULL, NULL);
--
-- if (sticky_icon) {
-- gnome_window_icon_set_default_from_file(sticky_icon);
-- stickynotes->icon_normal = gdk_pixbuf_new_from_file(sticky_icon, NULL);
-- }
-- g_free (sticky_icon);
-- g_object_unref (icon_theme);
--
-+ stickynotes->icon_normal = gdk_pixbuf_new_from_file(GNOMEICONDIR "/gnome-note.png", NULL);
- stickynotes->icon_prelight = gdk_pixbuf_new(gdk_pixbuf_get_colorspace (stickynotes->icon_normal),
- gdk_pixbuf_get_has_alpha (stickynotes->icon_normal),
- gdk_pixbuf_get_bits_per_sample (stickynotes->icon_normal),
-@@ -144,6 +135,9 @@
- stickynotes_applet_init_icons();
- stickynotes_applet_init_prefs();
-
-+ /* Set default icon for all sticky note windows */
-+ gnome_window_icon_set_default_from_file(GNOMEICONDIR "/gnome-note.png");
-+
- /* Watch GConf values */
- gconf_client_add_dir(stickynotes->gconf, GCONF_PATH, GCONF_CLIENT_PRELOAD_NONE, NULL);
- gconf_client_notify_add(stickynotes->gconf, GCONF_PATH "/defaults", (GConfClientNotifyFunc) preferences_apply_cb, NULL, NULL, NULL);
--- a/patches/gnome-applets-03-geyes-themes.diff Tue Mar 16 03:30:33 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
---- ../gnome-applets-2.5.6.old/geyes/themes/Makefile.am 2004-02-23 14:08:36.000000000 +0000
-+++ ./geyes/themes/Makefile.am 2004-02-23 14:11:36.000000000 +0000
-@@ -1,29 +1,20 @@
--#SUBDIRS = Default Default-tiny Bizarre Bloodshot Horrid
--
--Defaultdir = $(datadir)/geyes/Default
--Default_DATA = Default/config \
-- Default/Default-eye.png \
-- Default/Default-pupil.png
--
--Default_tinydir = $(datadir)/geyes/Default-tiny
--Default_tiny_DATA = Default-tiny/config \
-- Default-tiny/Default-tiny-eye.png \
-- Default-tiny/Default-tiny-pupil.png
--
--Bizarredir = $(datadir)/geyes/Bizarre
--Bizarre_DATA = Bizarre/config \
-- Bizarre/Bizarre-eye.png \
-- Bizarre/Bizarre-pupil.png
--
--Bloodshotdir = $(datadir)/geyes/Bloodshot
--Bloodshot_DATA = Bloodshot/config \
-- Bloodshot/Bloodshot-eye.png \
-- Bloodshot/Bloodshot-pupil.png
--
--Horriddir = $(datadir)/geyes/Horrid
--Horrid_DATA = Horrid/config \
-- Horrid/horrid_eye.png \
-- Horrid/horrid_pupil.png
--
--EXTRA_DIST = $(Default_DATA) $(Default_tiny_DATA) $(Bizarre_DATA) $(Bloodshot_DATA) \
-- $(Horrid_DATA)
-+THEMES= \
-+ Default \
-+ Default-tiny \
-+ Bizarre \
-+ Bloodshot \
-+ Horrid
-+
-+THEME_DIR=$(datadir)/geyes
-+
-+install-data-local:
-+ $(mkinstalldirs) $(DESTDIR)$(THEME_DIR); \
-+ for THEME in $(THEMES); do \
-+ echo '-- Installing theme '$$THEME; \
-+ $(mkinstalldirs) $(DESTDIR)$(THEME_DIR)/$$THEME; \
-+ (installfiles=`find $(srcdir)/$$THEME -name "*.png" -o -name "config"`; \
-+ for i in $$installfiles; do \
-+ echo '-- Installing '$$i; \
-+ $(INSTALL_DATA) $$i $(DESTDIR)$(THEME_DIR)/$$THEME ; \
-+ done) \
-+ done
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-03-mount-floppy-location.diff Tue Mar 16 04:30:13 2004 +0000
@@ -0,0 +1,28 @@
+--- ../gnome-applets-2.3.6.old/drivemount/properties.c 2003-08-11 15:39:58.000000000 +0100
++++ ./drivemount/properties.c 2003-08-11 15:55:25.000000000 +0100
+@@ -112,12 +112,12 @@
+ dd->auto_eject = panel_applet_gconf_get_bool(PANEL_APPLET(dd->applet), "auto_eject", NULL);
+ dd->mount_point = panel_applet_gconf_get_string(PANEL_APPLET(dd->applet), "mount_point", NULL);
+ if (!dd->mount_point)
+- dd->mount_point = g_strdup ("/mnt/floppy");
++ dd->mount_point = g_strdup ("/media/floppy");
+ dd->autofs_friendly = panel_applet_gconf_get_bool(PANEL_APPLET(dd->applet), "autofs_friendly", NULL);
+ dd->custom_icon_in = panel_applet_gconf_get_string(PANEL_APPLET(dd->applet), "custom_icon_mounted", NULL);
+ dd->custom_icon_out = panel_applet_gconf_get_string(PANEL_APPLET(dd->applet), "custom_icon_unmounted", NULL);
+ } else {
+- dd->mount_point = g_strdup("/mnt/floppy");
++ dd->mount_point = g_strdup("/media/floppy");
+ dd->interval = 10;
+ }
+ g_object_unref (G_OBJECT (client));
+--- ../gnome-applets-2.3.6.old/drivemount/drivemount.schemas.in 2003-08-11 15:39:58.000000000 +0100
++++ ./drivemount/drivemount.schemas.in 2003-08-11 15:55:40.000000000 +0100
+@@ -44,7 +44,7 @@
+ <key>/schemas/apps/drivemount-applet/prefs/mount_point</key>
+ <owner>drivemount-applet</owner>
+ <type>string</type>
+- <default>/mnt/floppy</default>
++ <default>/media/floppy</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-04-g11n-i18n-ui.diff Tue Mar 16 04:30:13 2004 +0000
@@ -0,0 +1,4156 @@
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/AM_Armenian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/AM_Armenian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/AM_Armenian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/AM_Armenian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Armenian xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap am
++
++[Country 0]
++Flag=am.png
++Label=am
++_Language=Armenian
++_Country=Armenia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/AR_Arabic.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/AR_Arabic.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/AR_Arabic.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/AR_Arabic.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,134 @@
++[Keymap Entry]
++Countries=21
++_Language=Arabic
++_Name=Arabic xkb keymap
++Codepage=Arabiciso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap ar
++
++[Country 0]
++Flag=dz.png
++Label=dz
++_Language=Arabic
++_Country=Algeria
++
++[Country 1]
++Flag=bh.png
++Label=bh
++_Language=Arabic
++_Country=Bahrain
++
++[Country 2]
++Flag=dj.png
++Label=dj
++_Language=Arabic
++_Country=Djibouti
++
++[Country 3]
++Flag=km.png
++Label=km
++_Language=Arabic
++_Country=Comoros
++
++[Country 4]
++Flag=eg.png
++Label=eg
++_Language=Arabic
++_Country=Egypt
++
++[Country 5]
++Flag=iq.png
++Label=iq
++_Language=Arabic
++_Country=Iraq
++
++[Country 6]
++Flag=jo.png
++Label=jo
++_Language=Arabic
++_Country=Jordan
++
++[Country 7]
++Flag=kw.png
++Label=kw
++_Language=Arabic
++_Country=Kuwait
++
++[Country 8]
++Flag=lb.png
++Label=lb
++_Language=Arabic
++_Country=Lebanon
++
++[Country 9]
++Flag=ly.png
++Label=ly
++_Language=Arabic
++_Country=Libyan Arab Jamahiriya
++
++[Country 10]
++Flag=ma.png
++Label=ma
++_Language=Arabic
++_Country=Marocco
++
++[Country 11]
++Flag=om.png
++Label=om
++_Language=Arabic
++_Country=Oman
++
++[Country 12]
++Flag=ps.png
++Label=ps
++_Language=Arabic
++_Country=Palestinian Territory
++
++[Country 13]
++Flag=qa.png
++Label=qa
++_Language=Arabic
++_Country=Qatar
++
++[Country 14]
++Flag=sa.png
++Label=sa
++_Language=Arabic
++_Country=Saudi Arabia
++
++[Country 15]
++Flag=so.png
++Label=so
++_Language=Arabic
++_Country=Somalia
++
++[Country 16]
++Flag=su.png
++Label=su
++_Language=Arabic
++_Country=Sudan
++
++[Country 17]
++Flag=sy.png
++Label=sy
++_Language=Arabic
++_Country=Syria
++
++[Country 18]
++Flag=tn.png
++Label=tn
++_Language=Arabic
++_Country=Tunisia
++
++[Country 19]
++Flag=ae.png
++Label=ae
++_Language=Arabic
++_Country=United Arab Emirates
++
++[Country 20]
++Flag=ye.png
++Label=ye
++_Language=Arabic
++_Country=Yemen
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/AR_Arabic_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/AR_Arabic_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/AR_Arabic_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/AR_Arabic_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,134 @@
++[Keymap Entry]
++Countries=21
++_Language=Arabic
++_Name=Arabic keymap
++Codepage=Arabic-iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap ar
++
++[Country 0]
++Flag=dz.png
++Label=dz
++_Language=Arabic
++_Country=Algeria
++
++[Country 1]
++Flag=bh.png
++Label=bh
++_Language=Arabic
++_Country=Bahrain
++
++[Country 2]
++Flag=dj.png
++Label=dj
++_Language=Arabic
++_Country=Djibouti
++
++[Country 3]
++Flag=km.png
++Label=km
++_Language=Arabic
++_Country=Comoros
++
++[Country 4]
++Flag=eg.png
++Label=eg
++_Language=Arabic
++_Country=Egypt
++
++[Country 5]
++Flag=iq.png
++Label=iq
++_Language=Arabic
++_Country=Iraq
++
++[Country 6]
++Flag=jo.png
++Label=jo
++_Language=Arabic
++_Country=Jordan
++
++[Country 7]
++Flag=kw.png
++Label=kw
++_Language=Arabic
++_Country=Kuwait
++
++[Country 8]
++Flag=lb.png
++Label=lb
++_Language=Arabic
++_Country=Lebanon
++
++[Country 9]
++Flag=ly.png
++Label=ly
++_Language=Arabic
++_Country=Libyan Arab Jamahiriya
++
++[Country 10]
++Flag=ma.png
++Label=ma
++_Language=Arabic
++_Country=Marocco
++
++[Country 11]
++Flag=om.png
++Label=om
++_Language=Arabic
++_Country=Oman
++
++[Country 12]
++Flag=ps.png
++Label=ps
++_Language=Arabic
++_Country=Palestinian Territory
++
++[Country 13]
++Flag=qa.png
++Label=qa
++_Language=Arabic
++_Country=Qatar
++
++[Country 14]
++Flag=sa.png
++Label=sa
++_Language=Arabic
++_Country=Saudi Arabia
++
++[Country 15]
++Flag=so.png
++Label=so
++_Language=Arabic
++_Country=Somalia
++
++[Country 16]
++Flag=su.png
++Label=su
++_Language=Arabic
++_Country=Sudan
++
++[Country 17]
++Flag=sy.png
++Label=sy
++_Language=Arabic
++_Country=Syria
++
++[Country 18]
++Flag=tn.png
++Label=tn
++_Language=Arabic
++_Country=Tunisia
++
++[Country 19]
++Flag=ae.png
++Label=ae
++_Language=Arabic
++_Country=United Arab Emirates
++
++[Country 20]
++Flag=ye.png
++Label=ye
++_Language=Arabic
++_Country=Yemen
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/AZ_Azerbaidjani_Turkic.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/AZ_Azerbaidjani_Turkic.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/AZ_Azerbaidjani_Turkic.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/AZ_Azerbaidjani_Turkic.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Azerbaidjani Turkic xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap az
++
++[Country 0]
++Flag=az.png
++Label=az
++_Language=Azerbaidjani Turkic
++_Country=Azerbaidjan
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Armenian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Armenian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Armenian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Armenian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Armenian
++Codepage=am-armscii8
++Type=105
++Arch=ix86
++Command=gkb_xmmap am
++
++[Country 0]
++Label=am
++Flag=am.png
++_Language=Armenian
++_Country=Armenia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/BE_Dutch.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/BE_Dutch.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/BE_Dutch.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/BE_Dutch.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Dutch xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap be
++
++[Country 0]
++Flag=be.png
++Label=be
++_Language=Dutch
++_Country=Belgium
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/BG_Bulgarian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/BG_Bulgarian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/BG_Bulgarian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/BG_Bulgarian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Bulgarian xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap bg
++
++[Country 0]
++Flag=bg.png
++Label=bg
++_Language=Bulgarian
++_Country=Bulgaria
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/BG_Bulgarian_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/BG_Bulgarian_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/BG_Bulgarian_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/BG_Bulgarian_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Bulgarian keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap bg
++
++[Country 0]
++Flag=bg.png
++Label=bg
++_Language=Bulgarian
++_Country=Bulgaria
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/BR_Portuguese.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/BR_Portuguese.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/BR_Portuguese.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/BR_Portuguese.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Brazil Portuguese xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap br
++
++[Country 0]
++Flag=br.png
++Label=br
++_Language=Portuguese
++_Country=Brazil
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/BR_Portuguese_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/BR_Portuguese_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/BR_Portuguese_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/BR_Portuguese_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Brazil Portuguese keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap br
++
++[Country 0]
++Flag=br.png
++Label=br
++_Language=Portuguese
++_Country=Brazil
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/BY_Belarussian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/BY_Belarussian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/BY_Belarussian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/BY_Belarussian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Belarussian xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap by
++
++[Country 0]
++Flag=by.png
++Label=by
++_Language=Belarussian
++_Country=Belarus
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Basque.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Basque.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Basque.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Basque.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Basque
++Codepage=iso-8859-1
++Type=102
++Arch=ix86
++Command=gkb_xmmap es
++
++[Country 0]
++Flag=eu.png
++Label=eu
++_Language=Basque
++_Country=Euskadi
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Belgian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Belgian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Belgian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Belgian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,25 @@
++[Keymap Entry]
++Countries=3
++_Name=Belgian
++Codepage=be-latin1
++Type=105
++Arch=ix86
++Command=gkb_xmmap be
++
++[Country 0]
++Flag=be.png
++Label=be
++_Language=French
++_Country=Belgium
++
++[Country 1]
++Flag=be.png
++Label=be
++_Language=Dutch
++_Country=Belgium
++
++[Country 2]
++Flag=be.png
++Label=be
++_Language=Wallon
++_Country=Belgium
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/BulgarianCyril.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/BulgarianCyril.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/BulgarianCyril.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/BulgarianCyril.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Bulgarian Cyrillic
++Codepage=cp1251
++Type=105
++Arch=ix86
++Command=gkb_xmmap ru_yawerty
++
++[Country 0]
++Flag=bg.png
++Label=bg
++_Language=Bulgarian
++_Country=Bulgaria
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/CA_English.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/CA_English.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/CA_English.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/CA_English.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Canadian xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap ca
++
++[Country 0]
++Flag=ca.png
++Label=ca
++_Language=English
++_Country=Canada
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/CH_German_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/CH_German_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/CH_German_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/CH_German_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Swiss keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap ch
++
++[Country 0]
++Flag=ch.png
++Label=ch
++_Language=German
++_Country=Switzerland
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/CZ_Czech.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/CZ_Czech.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/CZ_Czech.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/CZ_Czech.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Czech qwertz xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap cs
++
++[Country 0]
++Flag=cz.png
++Label=cz
++_Language=Czech
++_Country=Former Czechoslovakia Czech Republic
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/CZ_Czech_Slovak.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/CZ_Czech_Slovak.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/CZ_Czech_Slovak.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/CZ_Czech_Slovak.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,19 @@
++[Keymap Entry]
++Countries=2
++_Name=Czech and Slovak xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap czsk
++
++[Country 0]
++Flag=cz.png
++Label=cz
++_Language=Czech
++_Country=Czech Republic
++
++[Country 1]
++Flag=sk.png
++Label=sk
++_Language=Slovak
++_Country=Slovak Republic
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/CZ_Czech_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/CZ_Czech_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/CZ_Czech_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/CZ_Czech_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Czech keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap cz
++
++[Country 0]
++Flag=cz.png
++Label=cz
++_Language=Czech
++_Country=Czech Republic
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/DE_German.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/DE_German.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/DE_German.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/DE_German.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=German xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap de
++
++[Country 0]
++Flag=de.png
++Label=de
++_Language=German
++_Country=Germany
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/DE_German_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/DE_German_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/DE_German_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/DE_German_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=German keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap de
++
++[Country 0]
++Flag=de.png
++Label=de
++_Language=German
++_Country=Germany
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/DK_Danish.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/DK_Danish.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/DK_Danish.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/DK_Danish.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Danish xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap dk
++
++[Country 0]
++Flag=dk.png
++Label=dk
++_Language=Danish
++_Country=Denmark
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/DK_Danish_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/DK_Danish_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/DK_Danish_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/DK_Danish_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Danish keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap dk
++
++[Country 0]
++Flag=dk.png
++Label=dk
++_Language=Danish
++_Country=Denmark
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Default.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Default.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Default.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Default.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Gnome Keyboard default
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=xmodmap $HOME/.gkb_default.xmm
++
++[Country 0]
++Flag=gkb.png
++_Label=Default
++_Language=International
++_Country=International
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Dvorak.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Dvorak.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Dvorak.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Dvorak.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Dvorak xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap dvorak
++
++[Country 0]
++Flag=gkb.png
++Label=dvr
++_Language=International
++_Country=International
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/EE_Estonian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/EE_Estonian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/EE_Estonian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/EE_Estonian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Estonian xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap ee
++
++[Country 0]
++Flag=ee.png
++Label=ee
++_Language=Estonian
++_Country=Estonia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/EE_Estonian_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/EE_Estonian_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/EE_Estonian_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/EE_Estonian_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Estonian keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap ee
++
++[Country 0]
++Flag=ee.png
++Label=ee
++_Language=Estonian
++_Country=Estonia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/ES_Spanish-x86.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/ES_Spanish-x86.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/ES_Spanish-x86.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/ES_Spanish-x86.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Spanish PC/AT 101 keyboard
++Codepage=iso-8859-1
++Type=101
++Arch=ix86
++Command=setxkbmap es_x86
++
++[Country 0]
++Flag=es.png
++Label=es
++_Language=Spanish
++_Country=Spain
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/ES_Spanish.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/ES_Spanish.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/ES_Spanish.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/ES_Spanish.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Spanish xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap es
++
++[Country 0]
++Flag=es.png
++Label=es
++_Language=Spanish
++_Country=Spain
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/ES_Spanish_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/ES_Spanish_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/ES_Spanish_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/ES_Spanish_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Spanish keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap es
++
++[Country 0]
++Flag=es.png
++Label=es
++_Language=Spanish
++_Country=Spain
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/FI_Finnish.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/FI_Finnish.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/FI_Finnish.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/FI_Finnish.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Finnish xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap fi
++
++[Country 0]
++Flag=fi.png
++Label=fi
++_Language=Finnish
++_Country=Finland
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/FI_Finnish_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/FI_Finnish_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/FI_Finnish_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/FI_Finnish_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Finnish keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap fi
++
++[Country 0]
++Flag=fi.png
++Label=fi
++_Language=Finnish
++_Country=Finland
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/FR_French-x86.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/FR_French-x86.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/FR_French-x86.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/FR_French-x86.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=French PC/AT 101 keyboard
++Codepage=iso-8859-1
++Type=101
++Arch=ix86
++Command=setxkbmap fr_x86
++
++[Country 0]
++Flag=fr.png
++Label=fr
++_Language=French
++_Country=France
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/FR_French.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/FR_French.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/FR_French.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/FR_French.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=French xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap fr
++
++[Country 0]
++Flag=fr.png
++Label=fr
++_Language=French
++_Country=France
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/FR_French_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/FR_French_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/FR_French_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/FR_French_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=French keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap fr
++
++[Country 0]
++Flag=fr.png
++Label=fr
++_Language=French
++_Country=France
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/FrenchCanadian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/FrenchCanadian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/FrenchCanadian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/FrenchCanadian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=French-Canadian 105-key
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap qc-2
++
++[Country 0]
++Flag=qc.png
++Label=qc
++_Language=French
++_Country=Canada
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/FrenchCanadian2.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/FrenchCanadian2.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/FrenchCanadian2.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/FrenchCanadian2.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=French Swiss
++Codepage=iso-8859-1
++Type=102
++Arch=ix86
++Command=gkb_xmmap sf
++
++[Country 0]
++Flag=ch.png
++Label=ch
++_Language=French
++_Country=Switzerland
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/FrenchSwiss.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/FrenchSwiss.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/FrenchSwiss.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/FrenchSwiss.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=French Swiss keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap sf
++
++[Country 0]
++Flag=ch.png
++Label=ch
++_Language=French
++_Country=Switzerland
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/GE_Georgian_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/GE_Georgian_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/GE_Georgian_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/GE_Georgian_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Georgian keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap ge
++
++[Country 0]
++Flag=ge.png
++Label=ge
++_Language=Georgian
++_Country=Georgia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/GR_Greek.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/GR_Greek.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/GR_Greek.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/GR_Greek.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Greek xkb keymap
++Codepage=iso-8859-7
++Type=105
++Arch=ix86
++Command=setxkbmap el
++
++[Country 0]
++Flag=gr.png
++Label=gr
++_Language=Greek
++_Country=Greece
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/GR_Greek_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/GR_Greek_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/GR_Greek_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/GR_Greek_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Greek keymap
++Codepage=iso-8859-7
++Type=105
++Arch=ix86
++Command=gkb_xmmap gr
++
++[Country 0]
++Flag=gr.png
++Label=gr
++_Language=Greek
++_Country=Greece
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/GeorgianLatin.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/GeorgianLatin.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/GeorgianLatin.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/GeorgianLatin.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Georgian Latin
++Codepage=georgian-academy
++Type=105
++Arch=ix86
++Command=gkb_xmmap ge_la
++
++[Country 0]
++Flag=ge.png
++Label=ge-la
++_Language=Georgian
++_Country=Georgia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/GeorgianRussian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/GeorgianRussian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/GeorgianRussian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/GeorgianRussian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Georgian Russian layout
++Codepage=georgian-academy
++Type=105
++Arch=ix86
++Command=gkb_xmmap ge_ru
++
++[Country 0]
++Flag=ge.png
++Label=ge-ru
++_Language=Georgian
++_Country=Georgia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/German.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/German.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/German.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/German.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,25 @@
++[Keymap Entry]
++Countries=3
++_Name=German
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap sg
++
++[Country 0]
++Label=de
++Flag=de.png
++_Language=German
++_Country=Germany
++
++[Country 1]
++Label=at
++Flag=at.png
++_Language=German
++_Country=Austria
++
++[Country 2]
++Label=ch
++Flag=ch.png
++_Language=German
++_Country=Switzerland
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/GermanSwiss.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/GermanSwiss.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/GermanSwiss.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/GermanSwiss.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=German Swiss with Euro
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap sg
++
++[Country 0]
++Flag=ch.png
++Label=ch-e
++_Language=German
++_Country=Switzerland
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/HR_Croatian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/HR_Croatian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/HR_Croatian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/HR_Croatian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Croatian keymap
++Codepage=iso-8859-2
++Type=105
++Arch=ix86
++Command=setxkbmap hr
++
++[Country 0]
++Flag=hr.png
++Label=hr
++_Language=Croatian
++_Country=Croatia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/HU_Hungarian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/HU_Hungarian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/HU_Hungarian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/HU_Hungarian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Hungarian latin2 xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap hu
++
++[Country 0]
++Flag=hu.png
++Label=hu
++_Language=Hungarian
++_Country=Hungary
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian-101.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Hungarian-101.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian-101.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Hungarian-101.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,10 @@
++[Keymap Entry]
++_Name=Hungarian latin1
++_Language=Hungarian
++_Country=Hungary
++Codepage=iso-8859-1
++Flag=hu.png
++Label=hu-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap hu-lat1
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian-lat1.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Hungarian-lat1.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian-lat1.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Hungarian-lat1.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Hungarian 105-key latin 1
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap hu-lat1
++
++[Country 0]
++Flag=hu.png
++Label=hu1-l1
++_Language=Hungarian
++_Country=Hungary
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian-sun.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Hungarian-sun.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian-sun.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Hungarian-sun.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Sun (!not PC!) type5 Hungarian latin 2
++Codepage=iso-8859-2
++Type=type5
++Arch=Sun
++Command=gkb_xmmap hu-sun-lat2
++
++[Country 0]
++Flag=hu.png
++Label=hu-l1
++_Language=Hungarian
++_Country=Hungary
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian-x86.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Hungarian-x86.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian-x86.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Hungarian-x86.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Hungarian PC/AT 101 keyboard
++Codepage=iso-8859-2
++Type=101
++Arch=ix86
++Command=gkb_xmmap hu_x86
++
++[Country 0]
++Flag=hu.png
++Label=hu-l1
++_Language=Hungarian
++_Country=Hungary
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Hungarian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Hungarian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Hungarian 105-key latin 2
++Codepage=iso-8859-2
++Type=105
++Arch=ix86
++Command=gkb_xmmap hu
++
++[Country 0]
++Flag=hu.png
++Label=hu-l1
++_Language=Hungarian
++_Country=Hungary
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian101-1.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Hungarian101-1.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian101-1.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Hungarian101-1.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Hungarian 101-key latin 1
++Codepage=iso-8859-1
++Type=101
++Arch=ix86
++Command=gkb_xmmap hu-101-lat1
++
++[Country 0]
++Flag=hu.png
++Label=hu1
++_Language=Hungarian
++_Country=Hungary
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian101.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Hungarian101.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian101.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Hungarian101.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Hungarian 101-key latin 2
++Codepage=iso-8859-2
++Type=101
++Arch=ix86
++Command=gkb_xmmap hu-101-lat2
++
++[Country 0]
++Flag=hu.png
++Label=hu-1
++_Language=Hungarian
++_Country=Hungary
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/IL_Hebrew.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/IL_Hebrew.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/IL_Hebrew.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/IL_Hebrew.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Hebrew xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap il
++
++[Country 0]
++Flag=il.png
++Label=il
++_Language=Hebrew
++_Country=Israel
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/IL_Hebrew_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/IL_Hebrew_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/IL_Hebrew_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/IL_Hebrew_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Hebrew keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap il
++
++[Country 0]
++Flag=il.png
++Label=il
++_Language=Hebrew
++_Country=Israel
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/IS_Icelandic.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/IS_Icelandic.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/IS_Icelandic.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/IS_Icelandic.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Icelandic xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap is
++
++[Country 0]
++Flag=is.png
++Label=is
++_Language=Icelandic
++_Country=Iceland
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/IS_Icelandic_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/IS_Icelandic_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/IS_Icelandic_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/IS_Icelandic_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Icelandic keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap is
++
++[Country 0]
++Flag=is.png
++Label=is
++_Language=Icelandic
++_Country=Iceland
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/IT_Italian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/IT_Italian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/IT_Italian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/IT_Italian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Italian xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap it
++
++[Country 0]
++Flag=it.png
++Label=it
++_Language=Italian
++_Country=Italy
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/IT_Italian_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/IT_Italian_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/IT_Italian_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/IT_Italian_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Italian keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap it
++
++[Country 0]
++Flag=it.png
++Label=it
++_Language=Italian
++_Country=Italy
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/JP_Japanese.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/JP_Japanese.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/JP_Japanese.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/JP_Japanese.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Japanese xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap jp
++
++[Country 0]
++Flag=jp.png
++Label=jp
++_Language=Japanese
++_Country=Japan
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/JP_Japanese_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/JP_Japanese_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/JP_Japanese_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/JP_Japanese_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Japanese keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap jp
++
++[Country 0]
++Flag=jp.png
++Label=jp
++_Language=Japanese
++_Country=Japan
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/KR_Korean.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/KR_Korean.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/KR_Korean.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/KR_Korean.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Korean 106 keyboard
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap kr
++
++[Country 0]
++Flag=kr.png
++Label=kr
++_Language=Korean
++_Country=South Korea
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/LA_Lao_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/LA_Lao_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/LA_Lao_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/LA_Lao_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Lao keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap la
++
++[Country 0]
++Flag=la.png
++Label=la
++_Language=Lao
++_Country=Laos
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/LT_Lithuanian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/LT_Lithuanian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/LT_Lithuanian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/LT_Lithuanian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Lithuanian qwerty xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap lt
++
++[Country 0]
++Flag=lt.png
++Label=lt
++_Language=Lithuanian
++_Country=Lithuania
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/LT_Lithuanian_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/LT_Lithuanian_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/LT_Lithuanian_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/LT_Lithuanian_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Lithuanian keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap lt
++
++[Country 0]
++Flag=lt.png
++Label=lt
++_Language=Lithuanian
++_Country=Lithuania
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/LT_Prog.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/LT_Prog.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/LT_Prog.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/LT_Prog.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Lithuanian programmers xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap lt_p
++
++[Country 0]
++Flag=lt.png
++Label=lt-p
++_Language=Lithuanian
++_Country=Lithuania
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/LT_Standard.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/LT_Standard.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/LT_Standard.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/LT_Standard.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Lithuanian standard xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap lt_std
++
++[Country 0]
++Flag=lt.png
++Label=lt-s
++_Language=Lithuanian
++_Country=Lithuania
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/MK_Macedonian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/MK_Macedonian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/MK_Macedonian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/MK_Macedonian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Macedonian xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap mk
++
++[Country 0]
++Flag=mk.png
++Label=mk
++_Language=Macedonian
++_Country=Macedonia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/MN_Mongolian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/MN_Mongolian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/MN_Mongolian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/MN_Mongolian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Mongolian keyboard
++Codepage=iso-8859-5
++Type=105
++Arch=ix86
++Command=gkb_xmmap mn
++
++[Country 0]
++Flag=mn.png
++Label=mn
++_Language=Mongolian
++_Country=Mongolia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/MN_Mongolian_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/MN_Mongolian_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/MN_Mongolian_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/MN_Mongolian_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Mongolian keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap mn
++
++[Country 0]
++Flag=mn.png
++Label=mn
++_Language=Mongolian
++_Country=Mongolia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/MN_Mongolian_x_rev.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/MN_Mongolian_x_rev.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/MN_Mongolian_x_rev.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/MN_Mongolian_x_rev.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Plain Mongolian keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap mn-rev
++
++[Country 0]
++Flag=mn.png
++Label=mn
++_Language=Mongolian
++_Country=Mongolia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/MN_Mongolian_x_uni.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/MN_Mongolian_x_uni.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/MN_Mongolian_x_uni.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/MN_Mongolian_x_uni.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Unicode Mongolian Keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap mn-uni
++
++[Country 0]
++Flag=mn.png
++Label=mn
++_Language=Mongolian
++_Country=Mongolia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Macedonian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Macedonian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Macedonian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Macedonian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Macedonian
++Codepage=iso-8859-5
++Type=105
++Arch=ix86
++Command=gkb_xmmap mk
++
++[Country 0]
++Flag=mk.png
++Label=mk
++_Language=Macedonian
++_Country=Macedonia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Makefile.am gnome-applets-2.5.6/gkb-new/descs/Makefile.am
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Makefile.am 2004-03-16 05:01:24.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Makefile.am 2004-03-16 05:09:51.000000000 +0900
+@@ -1,74 +1,74 @@
+-%.keyprop: %.keyprop.in
++%.keyprop: %.keyprop.desktop.in
+ $(top_builddir)/intltool-merge -d -p $(top_srcdir)/po $< $(srcdir)/$*.keyprop
+
+ preset_data_predata = \
+- AM_Armenian.keyprop.in AR_Arabic.keyprop.in \
+- AR_Arabic_x.keyprop.in Armenian.keyprop.in \
+- AZ_Azerbaidjani_Turkic.keyprop.in Basque.keyprop.in \
+- BE_Dutch.keyprop.in Belgian.keyprop.in \
+- BG_Bulgarian.keyprop.in BG_Bulgarian_x.keyprop.in \
+- BR_Portuguese.keyprop.in BR_Portuguese_x.keyprop.in \
+- BulgarianCyril.keyprop.in BY_Belarussian.keyprop.in \
+- CA_English.keyprop.in CH_German_x.keyprop.in \
+- CZ_Czech.keyprop.in CZ_Czech_Slovak.keyprop.in \
+- CZ_Czech_x.keyprop.in Default.keyprop.in \
+- DE_German.keyprop.in DE_German_x.keyprop.in \
+- DK_Danish.keyprop.in DK_Danish_x.keyprop.in \
+- Dvorak.keyprop.in EE_Estonian.keyprop.in \
+- EE_Estonian_x.keyprop.in ES_Spanish.keyprop.in \
+- ES_Spanish-x86.keyprop.in ES_Spanish_x.keyprop.in \
+- FI_Finnish.keyprop.in FI_Finnish_x.keyprop.in \
+- FrenchCanadian2.keyprop.in FrenchCanadian.keyprop.in \
+- FrenchSwiss.keyprop.in FR_French.keyprop.in \
+- FR_French-x86.keyprop.in FR_French_x.keyprop.in \
+- GE_Georgian_x.keyprop.in GeorgianLatin.keyprop.in \
+- GeorgianRussian.keyprop.in German.keyprop.in \
+- GermanSwiss.keyprop.in GR_Greek.keyprop.in \
+- GR_Greek_x.keyprop.in HR_Croatian.keyprop.in \
+- HU_Hungarian.keyprop.in Hungarian101-1.keyprop.in \
+- Hungarian-101.keyprop.in Hungarian101.keyprop.in \
+- Hungarian.keyprop.in Hungarian-lat1.keyprop.in \
+- Hungarian-sun.keyprop.in Hungarian-x86.keyprop.in \
+- IL_Hebrew.keyprop.in IL_Hebrew_x.keyprop.in \
+- IS_Icelandic.keyprop.in IS_Icelandic_x.keyprop.in \
+- IT_Italian.keyprop.in IT_Italian_x.keyprop.in \
+- JP_Japanese.keyprop.in JP_Japanese_x.keyprop.in \
+- KR_Korean.keyprop.in LA_Lao_x.keyprop.in \
+- LT_Lithuanian.keyprop.in LT_Lithuanian_x.keyprop.in \
+- LT_Prog.keyprop.in LT_Standard.keyprop.in \
+- Macedonian.keyprop.in MK_Macedonian.keyprop.in \
+- MN_Mongolian.keyprop.in MN_Mongolian_x.keyprop.in \
+- MN_Mongolian_x_rev.keyprop.in MN_Mongolian_x_uni.keyprop.in \
+- NL_Dutch_x.keyprop.in NO_Norwegian.keyprop.in \
+- Norwegian.keyprop.in PL_Polish.keyprop.in \
+- PolishDeadkeys.keyprop.in Polish.keyprop.in \
+- PortugalDeadkeys.keyprop.in Portugal.keyprop.in \
+- PT_Portuguese.keyprop.in PT_Portuguese_x.keyprop.in \
+- RO_Romanian.keyprop.in RU_Russian.keyprop.in \
+- RU_Russian_x.keyprop.in RU_Russian_x_rev.keyprop.in \
+- RussianCyril.keyprop.in SE_Swedish.keyprop.in \
+- SE_Swedish_x.keyprop.in SI_Slovenian.keyprop.in \
+- SI_Slovenian_x.keyprop.in Slovak.keyprop.in \
+- Slovene.keyprop.in Slovenian.keyprop.in \
+- SR_Dutch.keyprop.in Swedish.keyprop.in \
+- Syriac.keyprop.in Syriac_Phonetic.keyprop.in \
+- Thai2.keyprop.in Thai.keyprop.in TH_Thai.keyprop.in \
+- TH_Thai_x.keyprop.in TR-f.keyprop.in TR-q.keyprop.in \
+- TR_Turkish.keyprop.in TR_Turkish_x.keyprop.in \
+- UA_Ukrainian.keyprop.in UK-102.keyprop.in \
+- UK_English.keyprop.in UK_English_x.keyprop.in UK.keyprop.in \
+- UK_United_Kingdom.keyprop.in UK-x86.keyprop.in \
+- US-101A-x86.keyprop.in US-101.keyprop.in US-84.keyprop.in \
+- US-dec.keyprop.in US_English.keyprop.in US-ibm.keyprop.in \
+- US_international.keyprop.in US-int.keyprop.in US.keyprop.in \
+- US-mac.keyprop.in US-sgi-101.keyprop.in US-sun.keyprop.in \
+- VN_Vietnamese.keyprop.in Yugoslav.keyprop.in \
+- YU_Serbo-Croatian_x.keyprop.in YU_Serb_x.keyprop.in
++ AM_Armenian.keyprop.desktop.in AR_Arabic.keyprop.desktop.in \
++ AR_Arabic_x.keyprop.desktop.in Armenian.keyprop.desktop.in \
++ AZ_Azerbaidjani_Turkic.keyprop.desktop.in Basque.keyprop.desktop.in \
++ BE_Dutch.keyprop.desktop.in Belgian.keyprop.desktop.in \
++ BG_Bulgarian.keyprop.desktop.in BG_Bulgarian_x.keyprop.desktop.in \
++ BR_Portuguese.keyprop.desktop.in BR_Portuguese_x.keyprop.desktop.in \
++ BulgarianCyril.keyprop.desktop.in BY_Belarussian.keyprop.desktop.in \
++ CA_English.keyprop.desktop.in CH_German_x.keyprop.desktop.in \
++ CZ_Czech.keyprop.desktop.in CZ_Czech_Slovak.keyprop.desktop.in \
++ CZ_Czech_x.keyprop.desktop.in Default.keyprop.desktop.in \
++ DE_German.keyprop.desktop.in DE_German_x.keyprop.desktop.in \
++ DK_Danish.keyprop.desktop.in DK_Danish_x.keyprop.desktop.in \
++ Dvorak.keyprop.desktop.in EE_Estonian.keyprop.desktop.in \
++ EE_Estonian_x.keyprop.desktop.in ES_Spanish.keyprop.desktop.in \
++ ES_Spanish-x86.keyprop.desktop.in ES_Spanish_x.keyprop.desktop.in \
++ FI_Finnish.keyprop.desktop.in FI_Finnish_x.keyprop.desktop.in \
++ FrenchCanadian2.keyprop.desktop.in FrenchCanadian.keyprop.desktop.in \
++ FrenchSwiss.keyprop.desktop.in FR_French.keyprop.desktop.in \
++ FR_French-x86.keyprop.desktop.in FR_French_x.keyprop.desktop.in \
++ GE_Georgian_x.keyprop.desktop.in GeorgianLatin.keyprop.desktop.in \
++ GeorgianRussian.keyprop.desktop.in German.keyprop.desktop.in \
++ GermanSwiss.keyprop.desktop.in GR_Greek.keyprop.desktop.in \
++ GR_Greek_x.keyprop.desktop.in HR_Croatian.keyprop.desktop.in \
++ HU_Hungarian.keyprop.desktop.in Hungarian101-1.keyprop.desktop.in \
++ Hungarian-101.keyprop.desktop.in Hungarian101.keyprop.desktop.in \
++ Hungarian.keyprop.desktop.in Hungarian-lat1.keyprop.desktop.in \
++ Hungarian-sun.keyprop.desktop.in Hungarian-x86.keyprop.desktop.in \
++ IL_Hebrew.keyprop.desktop.in IL_Hebrew_x.keyprop.desktop.in \
++ IS_Icelandic.keyprop.desktop.in IS_Icelandic_x.keyprop.desktop.in \
++ IT_Italian.keyprop.desktop.in IT_Italian_x.keyprop.desktop.in \
++ JP_Japanese.keyprop.desktop.in JP_Japanese_x.keyprop.desktop.in \
++ KR_Korean.keyprop.desktop.in LA_Lao_x.keyprop.desktop.in \
++ LT_Lithuanian.keyprop.desktop.in LT_Lithuanian_x.keyprop.desktop.in \
++ LT_Prog.keyprop.desktop.in LT_Standard.keyprop.desktop.in \
++ Macedonian.keyprop.desktop.in MK_Macedonian.keyprop.desktop.in \
++ MN_Mongolian.keyprop.desktop.in MN_Mongolian_x.keyprop.desktop.in \
++ MN_Mongolian_x_rev.keyprop.desktop.in MN_Mongolian_x_uni.keyprop.desktop.in \
++ NL_Dutch_x.keyprop.desktop.in NO_Norwegian.keyprop.desktop.in \
++ Norwegian.keyprop.desktop.in PL_Polish.keyprop.desktop.in \
++ PolishDeadkeys.keyprop.desktop.in Polish.keyprop.desktop.in \
++ PortugalDeadkeys.keyprop.desktop.in Portugal.keyprop.desktop.in \
++ PT_Portuguese.keyprop.desktop.in PT_Portuguese_x.keyprop.desktop.in \
++ RO_Romanian.keyprop.desktop.in RU_Russian.keyprop.desktop.in \
++ RU_Russian_x.keyprop.desktop.in RU_Russian_x_rev.keyprop.desktop.in \
++ RussianCyril.keyprop.desktop.in SE_Swedish.keyprop.desktop.in \
++ SE_Swedish_x.keyprop.desktop.in SI_Slovenian.keyprop.desktop.in \
++ SI_Slovenian_x.keyprop.desktop.in Slovak.keyprop.desktop.in \
++ Slovene.keyprop.desktop.in Slovenian.keyprop.desktop.in \
++ SR_Dutch.keyprop.desktop.in Swedish.keyprop.desktop.in \
++ Syriac.keyprop.desktop.in Syriac_Phonetic.keyprop.desktop.in \
++ Thai2.keyprop.desktop.in Thai.keyprop.desktop.in TH_Thai.keyprop.desktop.in \
++ TH_Thai_x.keyprop.desktop.in TR-f.keyprop.desktop.in TR-q.keyprop.desktop.in \
++ TR_Turkish.keyprop.desktop.in TR_Turkish_x.keyprop.desktop.in \
++ UA_Ukrainian.keyprop.desktop.in UK-102.keyprop.desktop.in \
++ UK_English.keyprop.desktop.in UK_English_x.keyprop.desktop.in UK.keyprop.desktop.in \
++ UK_United_Kingdom.keyprop.desktop.in UK-x86.keyprop.desktop.in \
++ US-101A-x86.keyprop.desktop.in US-101.keyprop.desktop.in US-84.keyprop.desktop.in \
++ US-dec.keyprop.desktop.in US_English.keyprop.desktop.in US-ibm.keyprop.desktop.in \
++ US_international.keyprop.desktop.in US-int.keyprop.desktop.in US.keyprop.desktop.in \
++ US-mac.keyprop.desktop.in US-sgi-101.keyprop.desktop.in US-sun.keyprop.desktop.in \
++ VN_Vietnamese.keyprop.desktop.in Yugoslav.keyprop.desktop.in \
++ YU_Serbo-Croatian_x.keyprop.desktop.in YU_Serb_x.keyprop.desktop.in
+
+ presetdir = $(datadir)/gnome/gkb
+ preset_in_files = $(preset_data_predata)
+-preset_DATA = $(preset_in_files:.keyprop.in=.keyprop)
+-EXTRA_DIST = $(preset_DATA) $(xml_DATA)
++preset_DATA = $(preset_in_files:.keyprop.desktop.in=.keyprop)
++EXTRA_DIST = $(preset_DATA) $(xml_DATA) $(preset_in_files) $(xml_in_files)
+
+ xml_in_files = presets.xml.in
+ XMLS = $(xml_in_files:.xml.in=.xml)
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/NL_Dutch_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/NL_Dutch_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/NL_Dutch_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/NL_Dutch_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Dutch keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap nl
++
++[Country 0]
++Flag=nl.png
++Label=nl
++_Language=Dutch
++_Country=Netherlands
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/NO_Norwegian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/NO_Norwegian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/NO_Norwegian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/NO_Norwegian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Norwegian xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap no
++
++[Country 0]
++Flag=no.png
++Label=no
++_Language=Norwegian
++_Country=Norway
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Norwegian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Norwegian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Norwegian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Norwegian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Norwegian
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap no
++
++[Country 0]
++Flag=no.png
++Label=no
++_Language=Norwegian
++_Country=Norway
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/PL_Polish.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/PL_Polish.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/PL_Polish.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/PL_Polish.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Polish xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap pl
++
++[Country 0]
++Flag=pl.png
++Label=pl
++_Language=Polish
++_Country=Poland
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/PT_Portuguese.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/PT_Portuguese.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/PT_Portuguese.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/PT_Portuguese.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Portuguese xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap pt
++
++[Country 0]
++Flag=pt.png
++Label=pt
++_Language=Portuguese
++_Country=Portugal
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/PT_Portuguese_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/PT_Portuguese_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/PT_Portuguese_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/PT_Portuguese_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Portuguese keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap pt
++
++[Country 0]
++Flag=pt.png
++Label=pt
++_Language=Portuguese
++_Country=Portugal
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Polish.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Polish.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Polish.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Polish.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Polish
++Codepage=iso-8859-2
++Type=105
++Arch=ix86
++Command=gkb_xmmap pl
++
++[Country 0]
++Flag=pl.png
++Label=pl
++_Language=Polish
++_Country=Poland
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/PolishDeadkeys.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/PolishDeadkeys.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/PolishDeadkeys.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/PolishDeadkeys.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Polish deadkeys
++Codepage=iso-8859-2
++Type=105
++Arch=ix86
++Command=gkb_xmmap pl2
++
++[Country 0]
++Flag=pl.png
++Label=pl
++_Language=Polish
++_Country=Poland
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Portugal.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Portugal.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Portugal.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Portugal.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,19 @@
++[Keymap Entry]
++Countries=2
++_Name=Portugal
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap pt
++
++[Country 0]
++Flag=pt.png
++Label=pt
++_Language=Portuguese
++_Country=Portugal
++
++[Country 1]
++Flag=pt.png
++Label=pt
++_Language=Portuguese
++_Country=Brazil
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/PortugalDeadkeys.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/PortugalDeadkeys.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/PortugalDeadkeys.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/PortugalDeadkeys.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,19 @@
++[Keymap Entry]
++Countries=2
++_Name=Portugal Deadkeys
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap pt-dead
++
++[Country 0]
++Flag=pt.png
++Label=pt
++_Language=Portuguese
++_Country=Portugal
++
++[Country 1]
++Flag=pt.png
++Label=pt
++_Language=Portuguese
++_Country=Brazil
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/RO_Romanian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/RO_Romanian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/RO_Romanian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/RO_Romanian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Romanian xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap ro
++
++[Country 0]
++Flag=ro.png
++Label=ro
++_Language=Romanian
++_Country=Romania
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/RU_Russian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/RU_Russian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/RU_Russian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/RU_Russian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Russian xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap ru
++
++[Country 0]
++Flag=ru.png
++Label=ru
++_Language=Russian
++_Country=Russia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/RU_Russian_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/RU_Russian_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/RU_Russian_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/RU_Russian_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Russian keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap ru
++
++[Country 0]
++Flag=ru.png
++Label=ru
++_Language=Russian
++_Country=Russia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/RU_Russian_x_rev.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/RU_Russian_x_rev.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/RU_Russian_x_rev.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/RU_Russian_x_rev.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Plain Russian keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap ru-rev
++
++[Country 0]
++Flag=ru.png
++Label=ru
++_Language=Russian
++_Country=Russia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/RussianCyril.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/RussianCyril.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/RussianCyril.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/RussianCyril.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Russian Cyrillic
++Codepage=koi8-r
++Type=105
++Arch=ix86
++Command=gkb_xmmap ru
++
++[Country 0]
++Flag=ru.png
++Label=ru
++_Language=Russian
++_Country=Russia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/SE_Swedish.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/SE_Swedish.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/SE_Swedish.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/SE_Swedish.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Swedish xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap se
++
++[Country 0]
++Flag=se.png
++Label=se
++_Language=Swedish
++_Country=Sweden
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/SE_Swedish_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/SE_Swedish_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/SE_Swedish_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/SE_Swedish_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Swedish keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap se
++
++[Country 0]
++Flag=se.png
++Label=se
++_Language=Swedish
++_Country=Sweden
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/SI_Slovenian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/SI_Slovenian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/SI_Slovenian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/SI_Slovenian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Slovenian xkb keymap
++Codepage=iso-8859-2
++Type=105
++Arch=ix86
++Command=setxkbmap si
++
++[Country 0]
++Flag=si.png
++Label=si
++_Language=Slovenian
++_Country=Slovenia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/SI_Slovenian_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/SI_Slovenian_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/SI_Slovenian_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/SI_Slovenian_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Slovenian keymap
++Codepage=iso-8859-2
++Type=105
++Arch=ix86
++Command=gkb_xmmap si
++
++[Country 0]
++Flag=si.png
++Label=si
++_Language=Slovenian
++_Country=Slovenia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/SR_Dutch.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/SR_Dutch.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/SR_Dutch.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/SR_Dutch.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Serbian standard xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap sr
++
++[Country 0]
++Flag=yu.png
++Label=sr
++_Language=Serb
++_Country=Serbia and Montenegro
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Slovak.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Slovak.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Slovak.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Slovak.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Slovak
++Codepage=iso-8859-2
++Type=105
++Arch=ix86
++Command=gkb_xmmap sk
++
++[Country 0]
++Flag=sk.png
++Label=sk
++_Language=Slovak
++_Country=Slovak Republic
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Slovene.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Slovene.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Slovene.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Slovene.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Slovenian
++Codepage=iso-8859-2
++Type=105
++Arch=ix86
++Command=gkb_xmmap si
++
++[Country 0]
++Flag=si.png
++Label=si
++_Language=Slovenian
++_Country=Slovenia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Slovenian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Slovenian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Slovenian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Slovenian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Slovenian
++Codepage=iso-8859-2
++Type=105
++Arch=ix86
++Command=gkb_xmmap si
++
++[Country 0]
++Flag=si.png
++Label=si
++_Language=Slovenian
++_Country=Slovenia
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Swedish.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Swedish.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Swedish.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Swedish.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Swedish
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap se
++
++[Country 0]
++Flag=se.png
++Label=se
++_Language=Swedish
++_Country=Sweden
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Syriac.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Syriac.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Syriac.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Syriac.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Syriac xkb keymap
++Codepage=UTF-8
++Type=105
++Arch=ix86
++Command=setxkbmap syr
++
++[Country 0]
++Flag=gkb.png
++Label=syr
++_Language=Syriac
++_Country=Syriac
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Syriac_Phonetic.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Syriac_Phonetic.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Syriac_Phonetic.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Syriac_Phonetic.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Syriac Phonetic xkb keymap
++Codepage=UTF-8
++Type=105
++Arch=ix86
++Command=setxkbmap syr_phonetic
++
++[Country 0]
++Flag=gkb.png
++Label=syrp
++_Language=Syriac
++_Country=Syriac
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/TH_Thai.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/TH_Thai.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/TH_Thai.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/TH_Thai.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Thai xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap th
++
++[Country 0]
++Flag=th.png
++Label=th
++_Language=Thai
++_Country=Thailand
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/TH_Thai_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/TH_Thai_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/TH_Thai_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/TH_Thai_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Thai keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap th
++
++[Country 0]
++Flag=th.png
++Label=th
++_Language=Thai
++_Country=Thailand
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/TR-f.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/TR-f.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/TR-f.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/TR-f.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Turkish "F" keyboard
++Codepage=iso-8859-9
++Type=105
++Arch=ix86
++Command=gkb_xmmap tr_f
++
++[Country 0]
++Flag=tr.png
++Label=tr
++_Language=Turkish
++_Country=Turkey
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/TR-q.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/TR-q.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/TR-q.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/TR-q.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Turkish "Q" keyboard
++Codepage=iso-8859-9
++Type=105
++Arch=ix86
++Command=gkb_xmmap tr_q
++
++[Country 0]
++Flag=tr.png
++Label=tr
++_Language=Turkish
++_Country=Turkey
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/TR_Turkish.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/TR_Turkish.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/TR_Turkish.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/TR_Turkish.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Turkish xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap tr
++
++[Country 0]
++Flag=tr.png
++Label=tr
++_Language=Turkish
++_Country=Turkey
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/TR_Turkish_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/TR_Turkish_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/TR_Turkish_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/TR_Turkish_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Turkish keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap tr
++
++[Country 0]
++Flag=tr.png
++Label=tr
++_Language=Turkish
++_Country=Turkey
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Thai.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Thai.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Thai.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Thai.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Thai Kedmanee
++Codepage=tis620
++Type=105
++Arch=ix86
++Command=gkb_xmmap th
++
++[Country 0]
++Flag=th.png
++Label=th
++_Language=Thai
++_Country=Thailand
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Thai2.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Thai2.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Thai2.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Thai2.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Thai
++Codepage=tis620
++Type=105
++Arch=ix86
++Command=gkb_xmmap th2
++
++[Country 0]
++Flag=th.png
++Label=th
++_Language=Thai
++_Country=Thailand
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/UA_Ukrainian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/UA_Ukrainian.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/UA_Ukrainian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/UA_Ukrainian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Ukrainian xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap ua
++
++[Country 0]
++Flag=ua.png
++Label=ua
++_Language=Ukrainian
++_Country=Ukraine
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/UK-102.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/UK-102.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/UK-102.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/UK-102.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=GB 102-key
++Codepage=iso-8859-1
++Type=102
++Arch=ix86
++Command=gkb_xmmap gb-102
++
++[Country 0]
++Flag=uk.png
++Label=uk
++_Language=English
++_Country=United Kingdom
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/UK-x86.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/UK-x86.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/UK-x86.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/UK-x86.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=UK PC/AT keyboard
++Codepage=iso-8859-1
++Type=101
++Arch=ix86
++Command=gkb_xmmap uk_x86
++
++[Country 0]
++Flag=gb.png
++Label=uk
++_Language=English
++_Country=United Kingdom
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/UK.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/UK.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/UK.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/UK.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=UK 105-key
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap uk
++
++[Country 0]
++Flag=gb.png
++Label=uk
++_Language=English
++_Country=United Kingdom
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/UK_English.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/UK_English.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/UK_English.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/UK_English.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=United Kingdom xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap gb
++
++[Country 0]
++Flag=uk.png
++Label=uk
++_Language=English
++_Country=United Kingdom
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/UK_English_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/UK_English_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/UK_English_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/UK_English_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=English keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap gb
++
++[Country 0]
++Flag=uk.png
++Label=uk
++_Language=English
++_Country=United Kingdom
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/UK_United_Kingdom.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/UK_United_Kingdom.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/UK_United_Kingdom.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/UK_United_Kingdom.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=GB 105-key
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap gb-105
++
++[Country 0]
++Flag=uk.png
++Label=uk
++_Language=English
++_Country=United Kingdom
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US-101.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US-101.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/US-101.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/US-101.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=US 101-key keyboard
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap us-101
++
++[Country 0]
++Flag=us.png
++Label=us101
++_Language=English
++_Country=United States
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US-101A-x86.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US-101A-x86.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/US-101A-x86.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/US-101A-x86.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=US PC/AT 101 keyboard
++Codepage=iso-8859-1
++Type=101
++Arch=ix86
++Command=gkb_xmmap us101A_x86
++
++[Country 0]
++Flag=us.png
++Label=us
++_Language=English
++_Country=United States
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US-84.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US-84.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/US-84.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/US-84.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=US 84-key
++Codepage=iso-8859-1
++Type=84
++Arch=ix86
++Command=gkb_xmmap us-84
++
++[Country 0]
++Flag=us.png
++Label=us
++_Language=English
++_Country=United States
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US-dec.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US-dec.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/US-dec.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/US-dec.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=US DEC 450
++Codepage=iso-8859-1
++Type=450
++Arch=dec
++Command=gkb_xmmap us-dec
++
++[Country 0]
++Flag=us.png
++Label=us
++_Language=English
++_Country=United States
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US-ibm.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US-ibm.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/US-ibm.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/US-ibm.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=US IBM RS/6000
++Codepage=iso-8859-1
++Type=105
++Arch=ibm
++Command=gkb_xmmap us-ibm
++
++[Country 0]
++Flag=us.png
++Label=us
++_Language=English
++_Country=United States
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US-int.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US-int.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/US-int.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/US-int.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=US International
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap us-int
++
++[Country 0]
++Flag=us.png
++Label=us
++_Language=English
++_Country=United States
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US-mac.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US-mac.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/US-mac.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/US-mac.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=US Macintosh
++Codepage=iso-8859-1
++Type=mklinux
++Arch=mac
++Command=gkb_xmmap us-mac
++
++[Country 0]
++Flag=us.png
++Label=us
++_Language=English
++_Country=United States
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US-sgi-101.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US-sgi-101.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/US-sgi-101.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/US-sgi-101.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=US Silicon Graphics 101-key
++Codepage=iso-8859-1
++Type=101
++Arch=sgi
++Command=gkb_xmmap us-sgi-101
++
++[Country 0]
++Flag=us.png
++Label=us
++_Language=English
++_Country=United States
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US-sun.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US-sun.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/US-sun.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/US-sun.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=US Sun type5
++Codepage=iso-8859-1
++Type=type5
++Arch=Sun
++Command=gkb_xmmap us-sun
++
++[Country 0]
++Flag=us.png
++Label=us
++_Language=English
++_Country=United States
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/US.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/US.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=US 105-key keyboard (with windows keys)
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap us
++
++[Country 0]
++Flag=us.png
++Label=us
++_Language=English
++_Country=United States
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US_English.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US_English.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/US_English.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/US_English.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=US xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap us
++
++[Country 0]
++Flag=us.png
++Label=us
++_Language=English
++_Country=United States
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US_international.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US_international.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/US_international.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/US_international.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=US International xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap us_intl
++
++[Country 0]
++Flag=us.png
++Label=us-i
++_Language=English
++_Country=United States
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/VN_Vietnamese.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/VN_Vietnamese.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/VN_Vietnamese.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/VN_Vietnamese.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Vietnamese xkb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=setxkbmap vn
++
++[Country 0]
++Flag=vn.png
++Label=vn
++_Language=Vietnamese
++_Country=Vietnam
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/YU_Serb_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/YU_Serb_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/YU_Serb_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/YU_Serb_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Serb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap yu
++
++[Country 0]
++Flag=yu.png
++Label=yu
++_Language=Serb
++_Country=Serbia and Montenegro
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/YU_Serbo-Croatian_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/YU_Serbo-Croatian_x.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/YU_Serbo-Croatian_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/YU_Serbo-Croatian_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Serb keymap
++Codepage=iso-8859-1
++Type=105
++Arch=ix86
++Command=gkb_xmmap yu
++
++[Country 0]
++Flag=yu.png
++Label=yu
++_Language=Serb
++_Country=Serbia and Montenegro
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Yugoslav.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Yugoslav.keyprop.desktop.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/Yugoslav.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/Yugoslav.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,13 @@
++[Keymap Entry]
++Countries=1
++_Name=Serb keymap
++Codepage=iso-8859-2
++Type=105
++Arch=ix86
++Command=gkb_xmmap yu
++
++[Country 0]
++Flag=sr.png
++Label=sr
++_Language=Serb
++_Country=Serbia and Montenegro
+diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/presets.xml.in gnome-applets-2.5.6/gkb-new/descs/presets.xml.in
+--- gnome-applets-2.5.6-orig/gkb-new/descs/presets.xml.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/descs/presets.xml.in 2004-03-16 05:29:04.000000000 +0900
+@@ -0,0 +1,1333 @@
++<keymaps>
++ <keymap>
++ <_name>Armenian xkb keymap</_name>
++ <command>setxkbmap am</command>
++ <_language>Armenian</_language>
++ <country>
++ <flag>am.png</flag>
++ <_name>Armenia</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Arabic xkb keymap</_name>
++ <command>setxkbmap ar</command>
++ <_language>Arabic</_language>
++ <country>
++ <flag>dz.png</flag>
++ <_name>Algeria</_name>
++ </country>
++ <country>
++ <flag>bh.png</flag>
++ <_name>Bahrain</_name>
++ </country>
++ <country>
++ <flag>dj.png</flag>
++ <_name>Djibouti</_name>
++ </country>
++ <country>
++ <flag>km.png</flag>
++ <_name>Comoros</_name>
++ </country>
++ <country>
++ <flag>eg.png</flag>
++ <_name>Egypt</_name>
++ </country>
++ <country>
++ <flag>iq.png</flag>
++ <_name>Iraq</_name>
++ </country>
++ <country>
++ <flag>jo.png</flag>
++ <_name>Jordan</_name>
++ </country>
++ <country>
++ <flag>kw.png</flag>
++ <_name>Kuwait</_name>
++ </country>
++ <country>
++ <flag>lb.png</flag>
++ <_name>Lebanon</_name>
++ </country>
++ <country>
++ <flag>ly.png</flag>
++ <_name>Libyan Arab Jamahiriya</_name>
++ </country>
++ <country>
++ <flag>ma.png</flag>
++ <_name>Marocco</_name>
++ </country>
++ <country>
++ <flag>om.png</flag>
++ <_name>Oman</_name>
++ </country>
++ <country>
++ <flag>ps.png</flag>
++ <_name>Palestinian Territory</_name>
++ </country>
++ <country>
++ <flag>qa.png</flag>
++ <_name>Qatar</_name>
++ </country>
++ <country>
++ <flag>sa.png</flag>
++ <_name>Saudi Arabia</_name>
++ </country>
++ <country>
++ <flag>so.png</flag>
++ <_name>Somalia</_name>
++ </country>
++ <country>
++ <flag>sd.png</flag>
++ <_name>Sudan</_name>
++ </country>
++ <country>
++ <flag>sy.png</flag>
++ <_name>Syria</_name>
++ </country>
++ <country>
++ <flag>tn.png</flag>
++ <_name>Tunisia</_name>
++ </country>
++ <country>
++ <flag>ae.png</flag>
++ <_name>United Arab Emirates</_name>
++ </country>
++ <country>
++ <flag>ye.png</flag>
++ <_name>Yemen</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Arabic keymap</_name>
++ <command>gkb_xmmap ar</command>
++ <_language>Arabic</_language>
++ <country>
++ <flag>dz.png</flag>
++ <_name>Algeria</_name>
++ </country>
++ <country>
++ <flag>bh.png</flag>
++ <_name>Bahrain</_name>
++ </country>
++ <country>
++ <flag>dj.png</flag>
++ <_name>Djibouti</_name>
++ </country>
++ <country>
++ <flag>km.png</flag>
++ <_name>Comoros</_name>
++ </country>
++ <country>
++ <flag>eg.png</flag>
++ <_name>Egypt</_name>
++ </country>
++ <country>
++ <flag>iq.png</flag>
++ <_name>Iraq</_name>
++ </country>
++ <country>
++ <flag>jo.png</flag>
++ <_name>Jordan</_name>
++ </country>
++ <country>
++ <flag>kw.png</flag>
++ <_name>Kuwait</_name>
++ </country>
++ <country>
++ <flag>lb.png</flag>
++ <_name>Lebanon</_name>
++ </country>
++ <country>
++ <flag>ly.png</flag>
++ <_name>Libyan Arab Jamahiriya</_name>
++ </country>
++ <country>
++ <flag>ma.png</flag>
++ <_name>Marocco</_name>
++ </country>
++ <country>
++ <flag>om.png</flag>
++ <_name>Oman</_name>
++ </country>
++ <country>
++ <flag>ps.png</flag>
++ <_name>Palestinian Territory</_name>
++ </country>
++ <country>
++ <flag>qa.png</flag>
++ <_name>Qatar</_name>
++ </country>
++ <country>
++ <flag>sa.png</flag>
++ <_name>Saudi Arabia</_name>
++ </country>
++ <country>
++ <flag>so.png</flag>
++ <_name>Somalia</_name>
++ </country>
++ <country>
++ <flag>sd.png</flag>
++ <_name>Sudan</_name>
++ </country>
++ <country>
++ <flag>sy.png</flag>
++ <_name>Syria</_name>
++ </country>
++ <country>
++ <flag>tn.png</flag>
++ <_name>Tunisia</_name>
++ </country>
++ <country>
++ <flag>ae.png</flag>
++ <_name>United Arab Emirates</_name>
++ </country>
++ <country>
++ <flag>ye.png</flag>
++ <_name>Yemen</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Armenian</_name>
++ <command>gkb_xmmap am</command>
++ <_language>Armenian</_language>
++ <country>
++ <flag>am.png</flag>
++ <_name>Armenia</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Azerbaidjani Turkic xkb keymap</_name>
++ <command>setxkbmap az</command>
++ <_language>Azerbaidjani Turkic</_language>
++ <country>
++ <flag>az.png</flag>
++ <_name>Azerbaidjan</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Basque</_name>
++ <command>gkb_xmmap es</command>
++ <_language>Basque</_language>
++ <country>
++ <flag>eu.png</flag>
++ <_name>Euskadi</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Dutch xkb keymap</_name>
++ <command>setxkbmap be</command>
++ <_language>Dutch</_language>
++ <country>
++ <flag>be.png</flag>
++ <_name>Belgium</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Belgian</_name>
++ <command>gkb_xmmap be</command>
++ <_language>French</_language>
++ <country>
++ <flag>be.png</flag>
++ <_name>Belgium</_name>
++ </country>
++ <country>
++ <flag>be.png</flag>
++ <_name>Belgium</_name>
++ </country>
++ <country>
++ <flag>be.png</flag>
++ <_name>Belgium</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Bulgarian xkb keymap</_name>
++ <command>setxkbmap bg</command>
++ <_language>Bulgarian</_language>
++ <country>
++ <flag>bg.png</flag>
++ <_name>Bulgaria</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Bulgarian keymap</_name>
++ <command>gkb_xmmap bg</command>
++ <_language>Bulgarian</_language>
++ <country>
++ <flag>bg.png</flag>
++ <_name>Bulgaria</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Brazil Portuguese xkb keymap</_name>
++ <command>setxkbmap br</command>
++ <_language>Portuguese</_language>
++ <country>
++ <flag>br.png</flag>
++ <_name>Brazil</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Brazil Portuguese keymap</_name>
++ <command>gkb_xmmap br</command>
++ <_language>Portuguese</_language>
++ <country>
++ <flag>br.png</flag>
++ <_name>Brazil</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Bulgarian Cyrillic</_name>
++ <command>gkb_xmmap ru_yawerty</command>
++ <_language>Bulgarian</_language>
++ <country>
++ <flag>bg.png</flag>
++ <_name>Bulgaria</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Belarussian xkb keymap</_name>
++ <command>setxkbmap by</command>
++ <_language>Belarussian</_language>
++ <country>
++ <flag>by.png</flag>
++ <_name>Belarus</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Canadian xkb keymap</_name>
++ <command>setxkbmap ca</command>
++ <_language>English</_language>
++ <country>
++ <flag>ca.png</flag>
++ <_name>Canada</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Swiss keymap</_name>
++ <command>gkb_xmmap ch</command>
++ <_language>German</_language>
++ <country>
++ <flag>ch.png</flag>
++ <_name>Switzerland</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Czech and Slovak xkb keymap</_name>
++ <command>setxkbmap czsk</command>
++ <_language>Czech</_language>
++ <country>
++ <flag>cz.png</flag>
++ <_name>Czech Republic</_name>
++ </country>
++ <country>
++ <flag>sk.png</flag>
++ <_name>Slovak Republic</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Czech keymap</_name>
++ <command>gkb_xmmap cz</command>
++ <_language>Czech</_language>
++ <country>
++ <flag>cz.png</flag>
++ <_name>Czech Republic</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Czech qwertz xkb keymap</_name>
++ <command>setxkbmap cs</command>
++ <_language>Czech</_language>
++ <country>
++ <flag>cz.png</flag>
++ <_name>Former Czechoslovakia</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Gnome Keyboard default</_name>
++ <command>xmodmap $HOME/.gkb_default.xmm</command>
++ <_language>International</_language>
++ <country>
++ <flag>gkb.png</flag>
++ <_name>International</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>German xkb keymap</_name>
++ <command>setxkbmap de</command>
++ <_language>German</_language>
++ <country>
++ <flag>de.png</flag>
++ <_name>Germany</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>German keymap</_name>
++ <command>gkb_xmmap de</command>
++ <_language>German</_language>
++ <country>
++ <flag>de.png</flag>
++ <_name>Germany</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Danish xkb keymap</_name>
++ <command>setxkbmap dk</command>
++ <_language>Danish</_language>
++ <country>
++ <flag>dk.png</flag>
++ <_name>Denmark</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Danish keymap</_name>
++ <command>gkb_xmmap dk</command>
++ <_language>Danish</_language>
++ <country>
++ <flag>dk.png</flag>
++ <_name>Denmark</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Dvorak xkb keymap</_name>
++ <command>setxkbmap dvorak</command>
++ <_language>International</_language>
++ <country>
++ <flag>gkb.png</flag>
++ <_name>International</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Estonian xkb keymap</_name>
++ <command>setxkbmap ee</command>
++ <_language>Estonian</_language>
++ <country>
++ <flag>ee.png</flag>
++ <_name>Estonia</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Estonian keymap</_name>
++ <command>gkb_xmmap ee</command>
++ <_language>Estonian</_language>
++ <country>
++ <flag>ee.png</flag>
++ <_name>Estonia</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Spanish xkb keymap</_name>
++ <command>setxkbmap es</command>
++ <_language>Spanish</_language>
++ <country>
++ <flag>es.png</flag>
++ <_name>Spain</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Spanish PC/AT 101 keyboard</_name>
++ <command>setxkbmap es_x86</command>
++ <_language>Spanish</_language>
++ <country>
++ <flag>es.png</flag>
++ <_name>Spain</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Spanish keymap</_name>
++ <command>gkb_xmmap es</command>
++ <_language>Spanish</_language>
++ <country>
++ <flag>es.png</flag>
++ <_name>Spain</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Finnish xkb keymap</_name>
++ <command>setxkbmap fi</command>
++ <_language>Finnish</_language>
++ <country>
++ <flag>fi.png</flag>
++ <_name>Finland</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Finnish keymap</_name>
++ <command>gkb_xmmap fi</command>
++ <_language>Finnish</_language>
++ <country>
++ <flag>fi.png</flag>
++ <_name>Finland</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>French Swiss</_name>
++ <command>gkb_xmmap sf</command>
++ <_language>French</_language>
++ <country>
++ <flag>ch.png</flag>
++ <_name>Switzerland</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>French-Canadian 105-key</_name>
++ <command>gkb_xmmap qc-2</command>
++ <_language>French</_language>
++ <country>
++ <flag>qc.png</flag>
++ <_name>Canada</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>French Swiss keymap</_name>
++ <command>gkb_xmmap sf</command>
++ <_language>French</_language>
++ <country>
++ <flag>ch.png</flag>
++ <_name>Switzerland</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>French xkb keymap</_name>
++ <command>setxkbmap fr</command>
++ <_language>French</_language>
++ <country>
++ <flag>fr.png</flag>
++ <_name>France</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>French PC/AT 101 keyboard</_name>
++ <command>setxkbmap fr_x86</command>
++ <_language>French</_language>
++ <country>
++ <flag>fr.png</flag>
++ <_name>France</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>French keymap</_name>
++ <command>gkb_xmmap fr</command>
++ <_language>French</_language>
++ <country>
++ <flag>fr.png</flag>
++ <_name>France</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>GB 102-key</_name>
++ <command>gkb_xmmap gb-102</command>
++ <_language>English</_language>
++ <country>
++ <flag>uk.png</flag>
++ <_name>United Kingdom</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>United Kingdom xkb keymap</_name>
++ <command>setxkbmap gb</command>
++ <_language>English</_language>
++ <country>
++ <flag>uk.png</flag>
++ <_name>United Kingdom</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>English keymap</_name>
++ <command>gkb_xmmap gb</command>
++ <_language>English</_language>
++ <country>
++ <flag>uk.png</flag>
++ <_name>United Kingdom</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>GB 105-key</_name>
++ <command>gkb_xmmap gb-105</command>
++ <_language>English</_language>
++ <country>
++ <flag>uk.png</flag>
++ <_name>United Kingdom</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Georgian keymap</_name>
++ <command>gkb_xmmap ge</command>
++ <_language>Georgian</_language>
++ <country>
++ <flag>ge.png</flag>
++ <_name>Georgia</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Georgian Latin</_name>
++ <command>gkb_xmmap ge_la</command>
++ <_language>Georgian</_language>
++ <country>
++ <flag>ge.png</flag>
++ <_name>Georgia</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Georgian Russian layout</_name>
++ <command>gkb_xmmap ge_ru</command>
++ <_language>Georgian</_language>
++ <country>
++ <flag>ge.png</flag>
++ <_name>Georgia</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>German</_name>
++ <command>gkb_xmmap sg</command>
++ <_language>German</_language>
++ <country>
++ <flag>de.png</flag>
++ <_name>Germany</_name>
++ </country>
++ <country>
++ <flag>at.png</flag>
++ <_name>Austria</_name>
++ </country>
++ <country>
++ <flag>ch.png</flag>
++ <_name>Switzerland</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>German Swiss with Euro</_name>
++ <command>gkb_xmmap sg</command>
++ <_language>German</_language>
++ <country>
++ <flag>ch.png</flag>
++ <_name>Switzerland</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Greek xkb keymap</_name>
++ <command>setxkbmap el</command>
++ <_language>Greek</_language>
++ <country>
++ <flag>gr.png</flag>
++ <_name>Greece</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Greek keymap</_name>
++ <command>gkb_xmmap gr</command>
++ <_language>Greek</_language>
++ <country>
++ <flag>gr.png</flag>
++ <_name>Greece</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Croatian keymap</_name>
++ <command>setxkbmap hr</command>
++ <_language>Croatian</_language>
++ <country>
++ <flag>hr.png</flag>
++ <_name>Croatia</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Hungarian latin2 xkb keymap</_name>
++ <command>setxkbmap hu</command>
++ <_language>Hungarian</_language>
++ <country>
++ <flag>hu.png</flag>
++ <_name>Hungary</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Hungarian 101-key latin 1</_name>
++ <command>gkb_xmmap hu-101-lat1</command>
++ <_language>Hungarian</_language>
++ <country>
++ <flag>hu.png</flag>
++ <_name>Hungary</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Hungarian latin1</_name>
++ <_language>Hungarian</_language>
++ <country>
++ <flag>hu.png</flag>
++ <_name>Hungary</_name>
++ </country>
++ <command>gkb_xmmap hu-lat1</command>
++ </keymap>
++ <keymap>
++ <_name>Hungarian 101-key latin 2</_name>
++ <command>gkb_xmmap hu-101-lat2</command>
++ <_language>Hungarian</_language>
++ <country>
++ <flag>hu.png</flag>
++ <_name>Hungary</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Hungarian 105-key latin 2</_name>
++ <command>gkb_xmmap hu</command>
++ <_language>Hungarian</_language>
++ <country>
++ <flag>hu.png</flag>
++ <_name>Hungary</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Hungarian 105-key latin 1</_name>
++ <command>gkb_xmmap hu-lat1</command>
++ <_language>Hungarian</_language>
++ <country>
++ <flag>hu.png</flag>
++ <_name>Hungary</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Sun (!not PC!) type5 Hungarian latin 2</_name>
++ <command>gkb_xmmap hu-sun-lat2</command>
++ <_language>Hungarian</_language>
++ <country>
++ <flag>hu.png</flag>
++ <_name>Hungary</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Hungarian PC/AT 101 keyboard</_name>
++ <command>gkb_xmmap hu_x86</command>
++ <_language>Hungarian</_language>
++ <country>
++ <flag>hu.png</flag>
++ <_name>Hungary</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Hebrew xkb keymap</_name>
++ <command>setxkbmap il</command>
++ <_language>Hebrew</_language>
++ <country>
++ <flag>il.png</flag>
++ <_name>Israel</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Hebrew keymap</_name>
++ <command>gkb_xmmap il</command>
++ <_language>Hebrew</_language>
++ <country>
++ <flag>il.png</flag>
++ <_name>Israel</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Icelandic xkb keymap</_name>
++ <command>setxkbmap is</command>
++ <_language>Icelandic</_language>
++ <country>
++ <flag>is.png</flag>
++ <_name>Iceland</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Icelandic keymap</_name>
++ <command>gkb_xmmap is</command>
++ <_language>Icelandic</_language>
++ <country>
++ <flag>is.png</flag>
++ <_name>Iceland</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Italian xkb keymap</_name>
++ <command>setxkbmap it</command>
++ <_language>Italian</_language>
++ <country>
++ <flag>it.png</flag>
++ <_name>Italy</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Italian keymap</_name>
++ <command>gkb_xmmap it</command>
++ <_language>Italian</_language>
++ <country>
++ <flag>it.png</flag>
++ <_name>Italy</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Japanese xkb keymap</_name>
++ <command>setxkbmap jp</command>
++ <_language>Japanese</_language>
++ <country>
++ <flag>jp.png</flag>
++ <_name>Japan</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Japanese keymap</_name>
++ <command>gkb_xmmap jp</command>
++ <_language>Japanese</_language>
++ <country>
++ <flag>jp.png</flag>
++ <_name>Japan</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Lao keymap</_name>
++ <command>gkb_xmmap la</command>
++ <_language>Lao</_language>
++ <country>
++ <flag>la.png</flag>
++ <_name>Laos</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Lithuanian qwerty xkb keymap</_name>
++ <command>setxkbmap lt</command>
++ <_language>Lithuanian</_language>
++ <country>
++ <flag>lt.png</flag>
++ <_name>Lithuania</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Lithuanian keymap</_name>
++ <command>gkb_xmmap lt</command>
++ <_language>Lithuanian</_language>
++ <country>
++ <flag>lt.png</flag>
++ <_name>Lithuania</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Lithuanian programmers xkb keymap</_name>
++ <command>setxkbmap lt_p</command>
++ <_language>Lithuanian</_language>
++ <country>
++ <flag>lt.png</flag>
++ <_name>Lithuania</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Lithuanian standard xkb keymap</_name>
++ <command>setxkbmap lt_std</command>
++ <_language>Lithuanian</_language>
++ <country>
++ <flag>lt.png</flag>
++ <_name>Lithuania</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Macedonian</_name>
++ <command>gkb_xmmap mk</command>
++ <_language>Macedonian</_language>
++ <country>
++ <flag>mk.png</flag>
++ <_name>Macedonia</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Macedonian xkb keymap</_name>
++ <command>setxkbmap mk</command>
++ <_language>Macedonian</_language>
++ <country>
++ <flag>mk.png</flag>
++ <_name>Macedonia</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Dutch keymap</_name>
++ <command>gkb_xmmap nl</command>
++ <_language>Dutch</_language>
++ <country>
++ <flag>nl.png</flag>
++ <_name>Netherlands</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Norwegian xkb keymap</_name>
++ <command>setxkbmap no</command>
++ <_language>Norwegian</_language>
++ <country>
++ <flag>no.png</flag>
++ <_name>Norway</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Norwegian</_name>
++ <command>gkb_xmmap no</command>
++ <_language>Norwegian</_language>
++ <country>
++ <flag>no.png</flag>
++ <_name>Norway</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Polish xkb keymap</_name>
++ <command>setxkbmap pl</command>
++ <_language>Polish</_language>
++ <country>
++ <flag>pl.png</flag>
++ <_name>Poland</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Polish deadkeys</_name>
++ <command>gkb_xmmap pl2</command>
++ <_language>Polish</_language>
++ <country>
++ <flag>pl.png</flag>
++ <_name>Poland</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Polish</_name>
++ <command>gkb_xmmap pl</command>
++ <_language>Polish</_language>
++ <country>
++ <flag>pl.png</flag>
++ <_name>Poland</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Portugal Deadkeys</_name>
++ <command>gkb_xmmap pt-dead</command>
++ <_language>Portuglese</_language>
++ <country>
++ <flag>pt.png</flag>
++ <_name>Portugal</_name>
++ </country>
++ <country>
++ <flag>pt.png</flag>
++ <_name>Brazil</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Portugal</_name>
++ <command>gkb_xmmap pt</command>
++ <_language>Portuguese</_language>
++ <country>
++ <flag>pt.png</flag>
++ <_name>Portugal</_name>
++ </country>
++ <country>
++ <flag>pt.png</flag>
++ <_name>Brazil</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Portuguese xkb keymap</_name>
++ <command>setxkbmap pt</command>
++ <_language>Portuguese</_language>
++ <country>
++ <flag>pt.png</flag>
++ <_name>Portugal</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Portuguese keymap</_name>
++ <command>gkb_xmmap pt</command>
++ <_language>Portuguese</_language>
++ <country>
++ <flag>pt.png</flag>
++ <_name>Portugal</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Romanian xkb keymap</_name>
++ <command>setxkbmap ro</command>
++ <_language>Romanian</_language>
++ <country>
++ <flag>ro.png</flag>
++ <_name>Romania</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Russian xkb keymap</_name>
++ <command>setxkbmap ru</command>
++ <_language>Russian</_language>
++ <country>
++ <flag>ru.png</flag>
++ <_name>Russia</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Russian keymap</_name>
++ <command>gkb_xmmap ru</command>
++ <_language>Russian</_language>
++ <country>
++ <flag>ru.png</flag>
++ <_name>Russia</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Plain Russian keymap</_name>
++ <command>gkb_xmmap ru-rev</command>
++ <_language>Russian</_language>
++ <country>
++ <flag>ru.png</flag>
++ <_name>Russia</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Russian Cyrillic</_name>
++ <command>gkb_xmmap ru</command>
++ <_language>Russian</_language>
++ <country>
++ <flag>ru.png</flag>
++ <_name>Russia</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Swedish xkb keymap</_name>
++ <command>setxkbmap se</command>
++ <_language>Swedish</_language>
++ <country>
++ <flag>se.png</flag>
++ <_name>Sweden</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Swedish keymap</_name>
++ <command>gkb_xmmap se</command>
++ <_language>Swedish</_language>
++ <country>
++ <flag>se.png</flag>
++ <_name>Sweden</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Slovenian xkb keymap</_name>
++ <command>setxkbmap si</command>
++ <_language>Slovenian</_language>
++ <country>
++ <flag>si.png</flag>
++ <_name>Slovenia</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Slovenian keymap</_name>
++ <command>gkb_xmmap si</command>
++ <_language>Slovenian</_language>
++ <country>
++ <flag>si.png</flag>
++ <_name>Slovenia</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Slovak keymap</_name>
++ <command>gkb_xmmap sk</command>
++ <_language>Slovak</_language>
++ <country>
++ <flag>sk.png</flag>
++ <_name>Slovak Republic</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Slovenian</_name>
++ <command>gkb_xmmap si</command>
++ <_language>Slovenian</_language>
++ <country>
++ <flag>si.png</flag>
++ <_name>Slovenia</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Serb standard xkb keymap</_name>
++ <command>setxkbmap sr</command>
++ <_language>Serb</_language>
++ <country>
++ <flag>yu.png</flag>
++ <_name>Serbia and Montenegro</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Swedish</_name>
++ <command>gkb_xmmap se</command>
++ <_language>Swedish</_language>
++ <country>
++ <flag>se.png</flag>
++ <_name>Sweden</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Syriac</_name>
++ <command>setxkbmap syr</command>
++ <_language>Syriac</_language>
++ <country>
++ <flag>gkb.png</flag>
++ <_name>Syriac</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Syriac Phonetic</_name>
++ <command>setxkbmap syr_phonetic</command>
++ <_language>Syriac</_language>
++ <country>
++ <flag>gkb.png</flag>
++ <_name>Syriac</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Thai</_name>
++ <command>gkb_xmmap th2</command>
++ <_language>Thai</_language>
++ <country>
++ <flag>th.png</flag>
++ <_name>Thailand</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Thai Kedmanee</_name>
++ <command>gkb_xmmap th</command>
++ <_language>Thai</_language>
++ <country>
++ <flag>th.png</flag>
++ <_name>Thailand</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Thai xkb keymap</_name>
++ <command>setxkbmap th</command>
++ <_language>Thai</_language>
++ <country>
++ <flag>th.png</flag>
++ <_name>Thailand</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Thai keymap</_name>
++ <command>gkb_xmmap th</command>
++ <_language>Thai</_language>
++ <country>
++ <flag>th.png</flag>
++ <_name>Thailand</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Turkish "F" keyboard</_name>
++ <command>gkb_xmmap tr_f</command>
++ <_language>Turkish</_language>
++ <country>
++ <flag>tr.png</flag>
++ <_name>Turkey</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Turkish "Q" keyboard</_name>
++ <command>gkb_xmmap tr_q</command>
++ <_language>Turkish</_language>
++ <country>
++ <flag>tr.png</flag>
++ <_name>Turkey</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Turkish xkb keymap</_name>
++ <command>setxkbmap tr</command>
++ <_language>Turkish</_language>
++ <country>
++ <flag>tr.png</flag>
++ <_name>Turkey</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Turkish keymap</_name>
++ <command>gkb_xmmap tr</command>
++ <_language>Turkish</_language>
++ <country>
++ <flag>tr.png</flag>
++ <_name>Turkey</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Ukrainian xkb keymap</_name>
++ <command>setxkbmap ua</command>
++ <_language>Ukrainian</_language>
++ <country>
++ <flag>ua.png</flag>
++ <_name>Ukraine</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>UK 105-key</_name>
++ <command>gkb_xmmap uk</command>
++ <_language>English</_language>
++ <country>
++ <flag>uk.png</flag>
++ <_name>United Kingdom</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>UK PC/AT keyboard</_name>
++ <command>gkb_xmmap uk_x86</command>
++ <_language>English</_language>
++ <country>
++ <flag>uk.png</flag>
++ <_name>United Kingdom</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>US PC/AT 101 keyboard</_name>
++ <command>gkb_xmmap us101A_x86</command>
++ <_language>English</_language>
++ <country>
++ <flag>us.png</flag>
++ <_name>United States</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>US 101-key keyboard</_name>
++ <command>gkb_xmmap us-101</command>
++ <_language>English</_language>
++ <country>
++ <flag>us.png</flag>
++ <_name>United States</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>US 84-key</_name>
++ <command>gkb_xmmap us-84</command>
++ <_language>English</_language>
++ <country>
++ <flag>us.png</flag>
++ <_name>United States</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>US DEC 450</_name>
++ <command>gkb_xmmap us-dec</command>
++ <_language>English</_language>
++ <country>
++ <flag>us.png</flag>
++ <_name>United States</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>US xkb keymap</_name>
++ <command>setxkbmap us</command>
++ <_language>English</_language>
++ <country>
++ <flag>us.png</flag>
++ <_name>United States</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>US IBM RS/6000</_name>
++ <command>gkb_xmmap us-ibm</command>
++ <_language>English</_language>
++ <country>
++ <flag>us.png</flag>
++ <_name>United States</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>US International xkb keymap</_name>
++ <command>setxkbmap us_intl</command>
++ <_language>English</_language>
++ <country>
++ <flag>us.png</flag>
++ <_name>United States</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>US International</_name>
++ <command>gkb_xmmap us-int</command>
++ <_language>English</_language>
++ <country>
++ <flag>us.png</flag>
++ <_name>United States</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>US 105-key keyboard (with windows keys)</_name>
++ <command>gkb_xmmap us</command>
++ <_language>English</_language>
++ <country>
++ <flag>us.png</flag>
++ <_name>United States</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>US Macintosh</_name>
++ <command>gkb_xmmap us-mac</command>
++ <_language>English</_language>
++ <country>
++ <flag>us.png</flag>
++ <_name>United States</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>US Silicon Graphics 101-key</_name>
++ <command>gkb_xmmap us-sgi-101</command>
++ <_language>English</_language>
++ <country>
++ <flag>us.png</flag>
++ <_name>United States</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>US Sun type5</_name>
++ <command>gkb_xmmap us-sun</command>
++ <_language>English</_language>
++ <country>
++ <flag>us.png</flag>
++ <_name>United States</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Vietnamese xkb keymap</_name>
++ <command>setxkbmap vn</command>
++ <_language>Vietnamese</_language>
++ <country>
++ <flag>vn.png</flag>
++ <_name>Vietnam</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Serb keymap</_name>
++ <command>gkb_xmmap yu</command>
++ <_language>Serb</_language>
++ <country>
++ <flag>yu.png</flag>
++ <_name>Serbia and Montenegro</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Serb keymap</_name>
++ <command>gkb_xmmap yu</command>
++ <_language>Serb</_language>
++ <country>
++ <flag>yu.png</flag>
++ <_name>Serbia and Montenegro</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Mongolian alt keymap</_name>
++ <command>gkb_xmmap mn</command>
++ <_language>Mongolian</_language>
++ <country>
++ <flag>mn.png</flag>
++ <_name>Mongolia</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Mongolian phonetic keymap</_name>
++ <command>gkb_xmmap mn-phone</command>
++ <_language>Mongolian</_language>
++ <country>
++ <flag>mn.png</flag>
++ <_name>Mongolia</_name>
++ </country>
++ </keymap>
++ <keymap>
++ <_name>Mongolian keymap</_name>
++ <command>gkb_xmmap mn-rev</command>
++ <_language>Mongolian</_language>
++ <country>
++ <flag>mn.png</flag>
++ <_name>Mongolia</_name>
++ </country>
++ </keymap>
++</keymaps>
+diff -urN gnome-applets-2.5.6-orig/gkb-new/gkb.c gnome-applets-2.5.6/gkb-new/gkb.c
+--- gnome-applets-2.5.6-orig/gkb-new/gkb.c 2004-03-16 05:01:24.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/gkb.c 2004-03-16 05:29:04.000000000 +0900
+@@ -350,19 +350,19 @@
+
+
+ buf = g_strdup_printf ("name_%d",i);
+- actdata->name = gkb_load_pref (gkb, buf, (i?"US 105 key keyboard":"Gnome Keyboard Default"));
++ actdata->name = gkb_load_pref (gkb, buf, (i?_("US 105 key keyboard"):_("Gnome Keyboard Default")));
+ g_free (buf);
+
+ buf = g_strdup_printf ("label_%d", i);
+- actdata->label = gkb_load_pref (gkb, buf, (i?"us":"default"));
++ actdata->label = gkb_load_pref (gkb, buf, (i?"us":_("default")));
+ g_free (buf);
+
+ buf = g_strdup_printf ("country_%d", i);
+- actdata->country = gkb_load_pref (gkb, buf, (i?"United States":"Gnome Keyboard"));
++ actdata->country = gkb_load_pref (gkb, buf, (i?_("United States"):_("Gnome Keyboard")));
+ g_free (buf);
+
+ buf = g_strdup_printf ("lang_%d", i);
+- actdata->lang = gkb_load_pref (gkb, buf, (i?"English":"International"));
++ actdata->lang = gkb_load_pref (gkb, buf, (i?_("English"):_("International")));
+ g_free (buf);
+
+ buf = g_strdup_printf ("flag_%d", i);
+diff -urN gnome-applets-2.5.6-orig/gkb-new/preset.c gnome-applets-2.5.6/gkb-new/preset.c
+--- gnome-applets-2.5.6-orig/gkb-new/preset.c 2004-03-16 05:01:24.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/preset.c 2004-03-16 05:29:04.000000000 +0900
+@@ -149,7 +149,8 @@
+ val->command = g_strdup (tcommand);
+
+ val->flag = gnome_config_get_string ("Flag");
+- val->label = gnome_config_get_string ("Label");
++ val->label = gnome_config_get_translated_string ("Label");
++ if (val->label == NULL) val->label = g_strdup(_("Undefined"));
+
+ val->lang = gnome_config_get_translated_string ("Language");
+ if (val->lang == NULL) val->lang = g_strdup(_("Undefined"));
+diff -urN gnome-applets-2.5.6-orig/gkb-new/system.c gnome-applets-2.5.6/gkb-new/system.c
+--- gnome-applets-2.5.6-orig/gkb-new/system.c 2004-03-16 05:01:24.000000000 +0900
++++ gnome-applets-2.5.6/gkb-new/system.c 2004-03-16 05:29:04.000000000 +0900
+@@ -25,6 +25,7 @@
+ *
+ */
+
++#include <config.h>
+ #include "gkb.h"
+
+ /**
+diff -urN gnome-applets-2.5.6-orig/gweather/gweather-dialog.c gnome-applets-2.5.6/gweather/gweather-dialog.c
+--- gnome-applets-2.5.6-orig/gweather/gweather-dialog.c 2004-03-16 05:01:25.000000000 +0900
++++ gnome-applets-2.5.6/gweather/gweather-dialog.c 2004-03-16 05:13:08.000000000 +0900
+@@ -389,7 +389,7 @@
+ gw_applet->dialog_pixbuf);
+
+ /* Update current condition fields and forecast */
+- gtk_label_set_text(GTK_LABEL(gw_applet->cond_location), weather_info_get_location(gw_applet->gweather_info));
++ gtk_label_set_text(GTK_LABEL(gw_applet->cond_location), _(weather_info_get_location(gw_applet->gweather_info)));
+ gtk_label_set_text(GTK_LABEL(gw_applet->cond_update), weather_info_get_update(gw_applet->gweather_info));
+ gtk_label_set_text(GTK_LABEL(gw_applet->cond_cond), weather_info_get_conditions(gw_applet->gweather_info));
+ gtk_label_set_text(GTK_LABEL(gw_applet->cond_sky), weather_info_get_sky(gw_applet->gweather_info));
+diff -urN gnome-applets-2.5.6-orig/gweather/gweather-pref.c gnome-applets-2.5.6/gweather/gweather-pref.c
+--- gnome-applets-2.5.6-orig/gweather/gweather-pref.c 2004-03-16 05:01:25.000000000 +0900
++++ gnome-applets-2.5.6/gweather/gweather-pref.c 2004-03-16 05:19:14.000000000 +0900
+@@ -289,7 +289,7 @@
+ name = gnome_config_get_string (name_key);
+
+ gtk_tree_store_insert (model, ®ion_iter, parent_iter, 0);
+- gtk_tree_store_set (model, ®ion_iter, COL_LOC, name, -1);
++ gtk_tree_store_set (model, ®ion_iter, COL_LOC, _(name), -1);
+
+ subregions_key = g_strconcat (region_key, "/regions", NULL);
+ gnome_config_get_vector (subregions_key, &nsubregions, &subregions);
+@@ -318,7 +318,7 @@
+ locdata[2],
+ locdata[3]);
+ gtk_tree_store_insert (model, &loc_iter, ®ion_iter, 0);
+- gtk_tree_store_set (model, &loc_iter, COL_LOC, locdata[0],
++ gtk_tree_store_set (model, &loc_iter, COL_LOC, _(locdata[0]),
+ COL_POINTER, weather_location, -1);
+
+ if (gw_applet->gweather_pref.location && weather_location_equal (weather_location, gw_applet->gweather_pref.location)) {
+diff -urN gnome-applets-2.5.6-orig/gweather/weather.c gnome-applets-2.5.6/gweather/weather.c
+--- gnome-applets-2.5.6-orig/gweather/weather.c 2004-03-16 05:01:24.000000000 +0900
++++ gnome-applets-2.5.6/gweather/weather.c 2004-03-16 05:26:35.000000000 +0900
+@@ -51,7 +51,7 @@
+
+ #define TEMP_F_TO_C(f) (((f) - 32.0) * 0.555556)
+ #define TEMP_C_TO_F(c) (((c) * 1.8) + 32.0)
+-#define TEMP_UNIT_STR(units) (((units) == UNITS_IMPERIAL) ? "\302\260 F" : "\302\260 C")
++#define TEMP_UNIT_STR(units) (((units) == UNITS_IMPERIAL) ? _("F") : _("C"))
+
+ #define WINDSPEED_KNOTS_TO_KPH(knots) ((knots) * 1.851965)
+ #define WINDSPEED_KPH_TO_KNOTS(kph) ((kph) * 0.539967)
+@@ -1923,6 +1923,8 @@
+ const gchar *weather_info_get_update (WeatherInfo *info)
+ {
+ static gchar buf[200];
++ static gchar *native_format;
++ static gchar *utf8_time;
+
+ g_return_val_if_fail(info != NULL, NULL);
+
+@@ -1932,9 +1934,16 @@
+ if (info->update != 0) {
+ struct tm *tm;
+ tm = localtime(&info->update);
+- if (strftime(buf, sizeof(buf), _("%a, %b %d / %H:%M"), tm) <= 0)
++ native_format = g_locale_from_utf8 (_("%a, %b %d / %H:%M"), -1, NULL, NULL, NULL);
++ if (strftime(buf, sizeof(buf), native_format, tm) <= 0)
+ strcpy (buf, "???");
+ buf[sizeof(buf)-1] = '\0';
++
++ utf8_time = g_locale_to_utf8 (buf, -1, NULL, NULL, NULL);
++ g_utf8_strncpy (buf, utf8_time, g_utf8_strlen(utf8_time, -1));
++
++ g_free (native_format);
++ g_free (utf8_time);
+ } else {
+ strncpy(buf, _("Unknown observation time"), sizeof (buf));
+ buf[sizeof(buf)-1] = '\0';
+@@ -1969,7 +1978,7 @@
+ return "-";
+ if (info->temp < -500.0)
+ return _("Unknown");
+- g_snprintf(buf, sizeof (buf), "%.1f%s", info->temp, TEMP_UNIT_STR(info->units));
++ g_snprintf(buf, sizeof (buf), "%.1f %s", info->temp, TEMP_UNIT_STR(info->units));
+ return buf;
+ }
+
+@@ -1981,7 +1990,7 @@
+ return "-";
+ if (info->dew < -500.0)
+ return _("Unknown");
+- g_snprintf(buf, sizeof (buf), "%.1f%s", info->dew, TEMP_UNIT_STR(info->units));
++ g_snprintf(buf, sizeof (buf), "%.1f %s", info->dew, TEMP_UNIT_STR(info->units));
+ return buf;
+ }
+
+@@ -2062,13 +2071,13 @@
+ return "--";
+
+ if (!info->applet)
+- degree = "F";
++ degree = _("F");
+ else if (info->applet->gweather_pref.use_metric)
+- degree = "C";
++ degree = _("C");
+ else
+- degree = "F";
++ degree = _("F");
+
+- g_snprintf(buf, sizeof (buf), "%d\302\260%s",
++ g_snprintf(buf, sizeof (buf), "%d %s",
+ (int)floor(info->temp + 0.5), degree);
+
+ return buf;
+@@ -2083,7 +2092,7 @@
+ buf = weather_info_get_conditions(info);
+ if (!strcmp(buf, "-"))
+ buf = weather_info_get_sky(info);
+- return g_strdup_printf ("%s: %s", weather_info_get_location (info), buf);
++ return g_strdup_printf ("%s: %s", _(weather_info_get_location (info)), buf);
+ }
+
+
--- a/patches/gnome-applets-04-gkb-window-icon-current.diff Tue Mar 16 03:30:33 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
---- ../gnome-applets-2.3.6.old/gkb-new/gkb.schemas.in 2003-08-11 15:39:58.000000000 +0100
-+++ ./gkb-new/gkb.schemas.in 2003-08-11 15:48:38.000000000 +0100
-@@ -160,5 +160,15 @@
- <long>This should be like "gkb_xmmap us", "setxkbmap us" or "xmodmap something.xmm"</long>
- </locale>
- </schema>
-+ <schema>
-+ <key>/schemas/apps/gkb-applet/prefs/current</key>
-+ <owner>gkb-applet</owner>
-+ <type>int</type>
-+ <default>0</default>
-+ <locale name="C">
-+ <short>The default keymap</short>
-+ <long>The default keymap for the applet</long>
-+ </locale>
-+ </schema>
- </schemalist>
- </gconfschemafile>
---- ../gnome-applets-2.3.6.old/gkb-new/prop.c 2003-08-11 15:39:58.000000000 +0100
-+++ ./gkb-new/prop.c 2003-08-11 15:46:17.000000000 +0100
-@@ -403,8 +403,8 @@
- /* Create property box */
- pbi->box = pbi->gkb->propwindow =
- gtk_dialog_new_with_buttons ( include_applet_options
-- ? _("Keyboard Layout Switcher Preferences")
-- : _("Keyboard Layout Selector"),
-+ ? _("Keyboard Layout")
-+ : _("Keyboard Layout"),
- NULL,
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_HELP, GTK_RESPONSE_HELP,
---- ../gnome-applets-2.3.6.old/gkb-new/gkb.c 2003-08-11 15:39:55.000000000 +0100
-+++ ./gkb-new/gkb.c 2003-08-11 15:51:34.000000000 +0100
-@@ -195,6 +195,7 @@
- if (gkb->update != NULL)
- (gkb->update) (gkb, TRUE);
- gkb_system_set_keymap (gkb);
-+ gconf_applet_set_int ("current", gkb->cur);
- }
-
- /* When a size request is made, we need to redraw the pixbufs with the new
-@@ -459,13 +460,17 @@
-
- gkb = g_new0 (GKB, 1);
- gkb->n = 0;
-- gkb->cur = 0;
-+ gkb->cur = gconf_applet_get_int ("current");
-
- do_at_first_run ();
- load_properties (gkb);
-- gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gkb.png");
-+ gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-keyboard-layout.png");
-
-- gkb->keymap = g_list_nth_data (gkb->maps, 0);
-+ gkb->keymap = g_list_nth_data (gkb->maps, gkb->cur);
-+ if (!gkb->keymap) {
-+ gkb->keymap = g_list_nth_data(gkb->maps, 0);
-+ gkb->cur = 0;
-+ }
-
- gconf_client_notify_add (gconf_client_get_default (),
- GKB_GCONF_ROOT, config_notify, gkb, NULL, NULL);
--- a/patches/gnome-applets-05-mount-floppy-location.diff Tue Mar 16 03:30:33 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
---- ../gnome-applets-2.3.6.old/drivemount/properties.c 2003-08-11 15:39:58.000000000 +0100
-+++ ./drivemount/properties.c 2003-08-11 15:55:25.000000000 +0100
-@@ -112,12 +112,12 @@
- dd->auto_eject = panel_applet_gconf_get_bool(PANEL_APPLET(dd->applet), "auto_eject", NULL);
- dd->mount_point = panel_applet_gconf_get_string(PANEL_APPLET(dd->applet), "mount_point", NULL);
- if (!dd->mount_point)
-- dd->mount_point = g_strdup ("/mnt/floppy");
-+ dd->mount_point = g_strdup ("/media/floppy");
- dd->autofs_friendly = panel_applet_gconf_get_bool(PANEL_APPLET(dd->applet), "autofs_friendly", NULL);
- dd->custom_icon_in = panel_applet_gconf_get_string(PANEL_APPLET(dd->applet), "custom_icon_mounted", NULL);
- dd->custom_icon_out = panel_applet_gconf_get_string(PANEL_APPLET(dd->applet), "custom_icon_unmounted", NULL);
- } else {
-- dd->mount_point = g_strdup("/mnt/floppy");
-+ dd->mount_point = g_strdup("/media/floppy");
- dd->interval = 10;
- }
- g_object_unref (G_OBJECT (client));
---- ../gnome-applets-2.3.6.old/drivemount/drivemount.schemas.in 2003-08-11 15:39:58.000000000 +0100
-+++ ./drivemount/drivemount.schemas.in 2003-08-11 15:55:40.000000000 +0100
-@@ -44,7 +44,7 @@
- <key>/schemas/apps/drivemount-applet/prefs/mount_point</key>
- <owner>drivemount-applet</owner>
- <type>string</type>
-- <default>/mnt/floppy</default>
-+ <default>/media/floppy</default>
- <locale name="C">
- <short></short>
- <long></long>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-05-non_portable_CFLAGS.diff Tue Mar 16 04:30:13 2004 +0000
@@ -0,0 +1,12 @@
+--- ../gnome-applets-2.5.6.old/stickynotes/Makefile.am 2004-02-23 14:18:27.000000000 +0000
++++ ./stickynotes/Makefile.am 2004-02-23 14:18:49.000000000 +0000
+@@ -2,8 +2,6 @@
+
+ SUBDIRS = pixmaps docs
+
+-CFLAGS = -Wall -g
+-
+ INCLUDES = \
+ -I. \
+ -I$(srcdir) \
+
--- a/patches/gnome-applets-06-add-l10n-docs.diff Tue Mar 16 03:30:33 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,424 +0,0 @@
-diff -ruN gnome-applets-2.3.6/mixer/docs/Makefile.am gnome-applets-2.3.6-hack/mixer/docs/Makefile.am
---- gnome-applets-2.3.6/mixer/docs/Makefile.am 2003-07-13 10:58:18.000000000 +0900
-+++ gnome-applets-2.3.6-hack/mixer/docs/Makefile.am 2003-10-29 05:28:00.000000000 +0900
-@@ -1 +1 @@
--SUBDIRS = C de es fr sv ja ko zh_CN zh_TW
-+SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW
-diff -ruN gnome-applets-2.3.6/mixer/docs/it/Makefile.am gnome-applets-2.3.6-hack/mixer/docs/it/Makefile.am
---- gnome-applets-2.3.6/mixer/docs/it/Makefile.am 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/mixer/docs/it/Makefile.am 2003-10-29 05:48:32.000000000 +0900
-@@ -0,0 +1,7 @@
-+figdir = figures
-+docname = mixer_applet2
-+lang = it
-+omffile = mixer_applet2-it.omf
-+entities = legal.xml
-+include $(top_srcdir)/xmldocs.make
-+dist-hook: app-dist-hook
-diff -ruN gnome-applets-2.3.6/stickynotes/docs/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/Makefile.am
---- gnome-applets-2.3.6/stickynotes/docs/Makefile.am 2003-02-15 07:51:04.000000000 +0900
-+++ gnome-applets-2.3.6-hack/stickynotes/docs/Makefile.am 2003-10-29 05:28:18.000000000 +0900
-@@ -1,3 +1,3 @@
- ## Process this file with automake to produce Makefile.in
-
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW
-diff -ruN gnome-applets-2.3.6/stickynotes/docs/de/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/de/Makefile.am
---- gnome-applets-2.3.6/stickynotes/docs/de/Makefile.am 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/stickynotes/docs/de/Makefile.am 2003-10-29 06:45:17.000000000 +0900
-@@ -0,0 +1,16 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+ figures/stickynotes_applet.png \
-+ figures/preferences_dialog.png \
-+ figures/applet_menu.png \
-+ figures/note_menu.png
-+
-+docname = stickynotes_applet
-+lang = de
-+omffile = stickynotes_applet-de.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-diff -ruN gnome-applets-2.3.6/stickynotes/docs/es/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/es/Makefile.am
---- gnome-applets-2.3.6/stickynotes/docs/es/Makefile.am 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/stickynotes/docs/es/Makefile.am 2003-10-29 06:45:21.000000000 +0900
-@@ -0,0 +1,16 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+ figures/stickynotes_applet.png \
-+ figures/preferences_dialog.png \
-+ figures/applet_menu.png \
-+ figures/note_menu.png
-+
-+docname = stickynotes_applet
-+lang = es
-+omffile = stickynotes_applet-es.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-diff -ruN gnome-applets-2.3.6/stickynotes/docs/fr/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/fr/Makefile.am
---- gnome-applets-2.3.6/stickynotes/docs/fr/Makefile.am 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/stickynotes/docs/fr/Makefile.am 2003-10-29 06:45:24.000000000 +0900
-@@ -0,0 +1,16 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+ figures/stickynotes_applet.png \
-+ figures/preferences_dialog.png \
-+ figures/applet_menu.png \
-+ figures/note_menu.png
-+
-+docname = stickynotes_applet
-+lang = fr
-+omffile = stickynotes_applet-fr.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-diff -ruN gnome-applets-2.3.6/stickynotes/docs/it/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/it/Makefile.am
---- gnome-applets-2.3.6/stickynotes/docs/it/Makefile.am 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/stickynotes/docs/it/Makefile.am 2003-10-29 06:45:29.000000000 +0900
-@@ -0,0 +1,16 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+ figures/stickynotes_applet.png \
-+ figures/preferences_dialog.png \
-+ figures/applet_menu.png \
-+ figures/note_menu.png
-+
-+docname = stickynotes_applet
-+lang = it
-+omffile = stickynotes_applet-it.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-diff -ruN gnome-applets-2.3.6/stickynotes/docs/ja/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/ja/Makefile.am
---- gnome-applets-2.3.6/stickynotes/docs/ja/Makefile.am 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/stickynotes/docs/ja/Makefile.am 2003-10-29 06:45:33.000000000 +0900
-@@ -0,0 +1,16 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+ figures/stickynotes_applet.png \
-+ figures/preferences_dialog.png \
-+ figures/applet_menu.png \
-+ figures/note_menu.png
-+
-+docname = stickynotes_applet
-+lang = ja
-+omffile = stickynotes_applet-ja.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-diff -ruN gnome-applets-2.3.6/stickynotes/docs/ko/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/ko/Makefile.am
---- gnome-applets-2.3.6/stickynotes/docs/ko/Makefile.am 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/stickynotes/docs/ko/Makefile.am 2003-10-29 06:45:37.000000000 +0900
-@@ -0,0 +1,16 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+ figures/stickynotes_applet.png \
-+ figures/preferences_dialog.png \
-+ figures/applet_menu.png \
-+ figures/note_menu.png
-+
-+docname = stickynotes_applet
-+lang = ko
-+omffile = stickynotes_applet-ko.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-diff -ruN gnome-applets-2.3.6/stickynotes/docs/sv/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/sv/Makefile.am
---- gnome-applets-2.3.6/stickynotes/docs/sv/Makefile.am 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/stickynotes/docs/sv/Makefile.am 2003-10-29 06:45:40.000000000 +0900
-@@ -0,0 +1,16 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+ figures/stickynotes_applet.png \
-+ figures/preferences_dialog.png \
-+ figures/applet_menu.png \
-+ figures/note_menu.png
-+
-+docname = stickynotes_applet
-+lang = sv
-+omffile = stickynotes_applet-sv.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-diff -ruN gnome-applets-2.3.6/stickynotes/docs/zh_CN/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/zh_CN/Makefile.am
---- gnome-applets-2.3.6/stickynotes/docs/zh_CN/Makefile.am 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/stickynotes/docs/zh_CN/Makefile.am 2003-10-29 06:45:47.000000000 +0900
-@@ -0,0 +1,16 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+ figures/stickynotes_applet.png \
-+ figures/preferences_dialog.png \
-+ figures/applet_menu.png \
-+ figures/note_menu.png
-+
-+docname = stickynotes_applet
-+lang = zh_CN
-+omffile = stickynotes_applet-zh_CN.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-diff -ruN gnome-applets-2.3.6/stickynotes/docs/zh_TW/Makefile.am gnome-applets-2.3.6-hack/stickynotes/docs/zh_TW/Makefile.am
---- gnome-applets-2.3.6/stickynotes/docs/zh_TW/Makefile.am 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/stickynotes/docs/zh_TW/Makefile.am 2003-10-29 06:45:52.000000000 +0900
-@@ -0,0 +1,16 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+ figures/stickynotes_applet.png \
-+ figures/preferences_dialog.png \
-+ figures/applet_menu.png \
-+ figures/note_menu.png
-+
-+docname = stickynotes_applet
-+lang = zh_TW
-+omffile = stickynotes_applet-zh_TW.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-diff -ruN gnome-applets-2.3.6/wireless/docs/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/Makefile.am
---- gnome-applets-2.3.6/wireless/docs/Makefile.am 2003-10-29 06:47:24.000000000 +0900
-+++ gnome-applets-2.3.6-hack/wireless/docs/Makefile.am 2003-10-29 05:28:40.000000000 +0900
-@@ -1,4 +1,4 @@
- ## Process this file with automake to produce Makefile.in
-
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW
-
-diff -ruN gnome-applets-2.3.6/wireless/docs/de/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/de/Makefile.am
---- gnome-applets-2.3.6/wireless/docs/de/Makefile.am 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/wireless/docs/de/Makefile.am 2003-10-29 06:35:20.000000000 +0900
-@@ -0,0 +1,15 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+ figures/wireless_applet_conn.png \
-+ figures/wireless_applet_no_conn.png
-+
-+docname = wireless
-+lang = de
-+omffile = wireless-de.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-+
-diff -ruN gnome-applets-2.3.6/wireless/docs/es/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/es/Makefile.am
---- gnome-applets-2.3.6/wireless/docs/es/Makefile.am 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/wireless/docs/es/Makefile.am 2003-10-29 06:35:25.000000000 +0900
-@@ -0,0 +1,15 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+ figures/wireless_applet_conn.png \
-+ figures/wireless_applet_no_conn.png
-+
-+docname = wireless
-+lang = es
-+omffile = wireless-es.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-+
-diff -ruN gnome-applets-2.3.6/wireless/docs/fr/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/fr/Makefile.am
---- gnome-applets-2.3.6/wireless/docs/fr/Makefile.am 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/wireless/docs/fr/Makefile.am 2003-10-29 06:35:29.000000000 +0900
-@@ -0,0 +1,15 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+ figures/wireless_applet_conn.png \
-+ figures/wireless_applet_no_conn.png
-+
-+docname = wireless
-+lang = fr
-+omffile = wireless-fr.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-+
-diff -ruN gnome-applets-2.3.6/wireless/docs/it/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/it/Makefile.am
---- gnome-applets-2.3.6/wireless/docs/it/Makefile.am 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/wireless/docs/it/Makefile.am 2003-10-29 06:35:35.000000000 +0900
-@@ -0,0 +1,15 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+ figures/wireless_applet_conn.png \
-+ figures/wireless_applet_no_conn.png
-+
-+docname = wireless
-+lang = it
-+omffile = wireless-it.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-+
-diff -ruN gnome-applets-2.3.6/wireless/docs/ja/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/ja/Makefile.am
---- gnome-applets-2.3.6/wireless/docs/ja/Makefile.am 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/wireless/docs/ja/Makefile.am 2003-10-29 06:35:43.000000000 +0900
-@@ -0,0 +1,15 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+ figures/wireless_applet_conn.png \
-+ figures/wireless_applet_no_conn.png
-+
-+docname = wireless
-+lang = ja
-+omffile = wireless-ja.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-+
-diff -ruN gnome-applets-2.3.6/wireless/docs/ko/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/ko/Makefile.am
---- gnome-applets-2.3.6/wireless/docs/ko/Makefile.am 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/wireless/docs/ko/Makefile.am 2003-10-29 06:35:47.000000000 +0900
-@@ -0,0 +1,15 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+ figures/wireless_applet_conn.png \
-+ figures/wireless_applet_no_conn.png
-+
-+docname = wireless
-+lang = ko
-+omffile = wireless-ko.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-+
-diff -ruN gnome-applets-2.3.6/wireless/docs/sv/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/sv/Makefile.am
---- gnome-applets-2.3.6/wireless/docs/sv/Makefile.am 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/wireless/docs/sv/Makefile.am 2003-10-29 06:35:52.000000000 +0900
-@@ -0,0 +1,15 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+ figures/wireless_applet_conn.png \
-+ figures/wireless_applet_no_conn.png
-+
-+docname = wireless
-+lang = sv
-+omffile = wireless-sv.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-+
-diff -ruN gnome-applets-2.3.6/wireless/docs/zh_CN/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/zh_CN/Makefile.am
---- gnome-applets-2.3.6/wireless/docs/zh_CN/Makefile.am 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/wireless/docs/zh_CN/Makefile.am 2003-10-29 06:35:57.000000000 +0900
-@@ -0,0 +1,15 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+ figures/wireless_applet_conn.png \
-+ figures/wireless_applet_no_conn.png
-+
-+docname = wireless
-+lang = zh_CN
-+omffile = wireless-zh_CN.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-+
-diff -ruN gnome-applets-2.3.6/wireless/docs/zh_TW/Makefile.am gnome-applets-2.3.6-hack/wireless/docs/zh_TW/Makefile.am
---- gnome-applets-2.3.6/wireless/docs/zh_TW/Makefile.am 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.3.6-hack/wireless/docs/zh_TW/Makefile.am 2003-10-29 06:36:01.000000000 +0900
-@@ -0,0 +1,15 @@
-+## Process this file with automake to produce Makefile.in
-+
-+figs = \
-+ figures/wireless_applet_conn.png \
-+ figures/wireless_applet_no_conn.png
-+
-+docname = wireless
-+lang = zh_TW
-+omffile = wireless-zh_TW.omf
-+entities = legal.xml
-+
-+include $(top_srcdir)/xmldocs.make
-+
-+dist-hook: app-dist-hook
-+
---- ../gnome-applets-2.5.5.old/configure.in 2004-02-03 17:32:57.000000000 +0000
-+++ ./configure.in 2004-02-03 17:45:16.000000000 +0000
-@@ -397,6 +397,7 @@
- mixer/docs/de/Makefile
- mixer/docs/es/Makefile
- mixer/docs/fr/Makefile
-+mixer/docs/it/Makefile
- mixer/docs/sv/Makefile
- mixer/docs/ja/Makefile
- mixer/docs/ko/Makefile
-@@ -499,10 +500,28 @@
- wireless/Makefile
- wireless/docs/Makefile
- wireless/docs/C/Makefile
-+wireless/docs/de/Makefile
-+wireless/docs/es/Makefile
-+wireless/docs/fr/Makefile
-+wireless/docs/it/Makefile
-+wireless/docs/ja/Makefile
-+wireless/docs/ko/Makefile
-+wireless/docs/sv/Makefile
-+wireless/docs/zh_CN/Makefile
-+wireless/docs/zh_TW/Makefile
- stickynotes/Makefile
- stickynotes/pixmaps/Makefile
- stickynotes/docs/Makefile
- stickynotes/docs/C/Makefile
-+stickynotes/docs/de/Makefile
-+stickynotes/docs/es/Makefile
-+stickynotes/docs/fr/Makefile
-+stickynotes/docs/it/Makefile
-+stickynotes/docs/ja/Makefile
-+stickynotes/docs/ko/Makefile
-+stickynotes/docs/sv/Makefile
-+stickynotes/docs/zh_CN/Makefile
-+stickynotes/docs/zh_TW/Makefile
- libgswitchit/Makefile
- libgswitchit/gswitchit.pc
- gswitchit/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-06-g11n-schemas.diff Tue Mar 16 04:30:13 2004 +0000
@@ -0,0 +1,104 @@
+diff -urN gnome-applets-2.5.6-orig/gswitchit/gswitchit.schemas.in gnome-applets-2.5.6/gswitchit/gswitchit.schemas.in
+--- gnome-applets-2.5.6-orig/gswitchit/gswitchit.schemas.in 1970-01-01 09:00:00.000000000 +0900
++++ gnome-applets-2.5.6/gswitchit/gswitchit.schemas.in 2004-03-16 08:54:39.000000000 +0900
+@@ -0,0 +1,100 @@
++<gconfschemafile>
++ <schemalist>
++ <schema>
++ <key>/schemas/apps/gswitchit/Applet/secondary</key>
++ <applyto>/apps/gswitchit/Applet/secondary</applyto>
++ <owner>gswitchit</owner>
++ <type>int</type>
++ <default>0</default>
++ <locale name="C">
++ <short>Secondary groups</short>
++ <long>Secondary groups</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/gswitchit/Applet/debugLevel</key>
++ <applyto>/apps/gswitchit/Applet/debugLevel</applyto>
++ <owner>gswitchit</owner>
++ <type>int</type>
++ <default>0</default>
++ <locale name="C">
++ <short>Debug level</short>
++ <long>Debug level</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/gswitchit/Applet/beep</key>
++ <applyto>/apps/gswitchit/Applet/beep</applyto>
++ <owner>gswitchit</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Beep on group switch</short>
++ <long>Beep on group switch</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/gswitchit/Applet/groupPerWindow</key>
++ <applyto>/apps/gswitchit/Applet/groupPerWindow</applyto>
++ <owner>gswitchit</owner>
++ <type>bool</type>
++ <default>true</default>
++ <locale name="C">
++ <short>Keep and manage separate group per window</short>
++ <long>Keep and manage separate group per window</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/gswitchit/Applet/handleIndicators</key>
++ <applyto>/apps/gswitchit/Applet/handleIndicators</applyto>
++ <owner>gswitchit</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Save/restore indicators together with layout groups</short>
++ <long>Save/restore indicators together with layout groups</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/gswitchit/Applet/layoutNamesAsGroupNames</key>
++ <applyto>/apps/gswitchit/Applet/layoutNamesAsGroupNames</applyto>
++ <owner>gswitchit</owner>
++ <type>bool</type>
++ <default>true</default>
++ <locale name="C">
++ <short>Show layout names instead of group names</short>
++ <long>Show layout names instead of group names (only for versions of XFree supporting multiple layouts)</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/gswitchit/Applet/showFlags</key>
++ <applyto>/apps/gswitchit/Applet/showFlags</applyto>
++ <owner>gswitchit</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Show flags in the applet</short>
++ <long>Show flags in the applet to indicate the current layout</long>
++ </locale>
++ </schema>
++
++ <schema>
++ <key>/schemas/apps/gswitchit/Applet/defaultGroup</key>
++ <applyto>/apps/gswitchit/Applet/defaultGroup</applyto>
++ <owner>gswitchit</owner>
++ <type>int</type>
++ <default>-1</default>
++ <locale name="C">
++ <short>Default group, assigned on window creation</short>
++ <long>Default group, assigned on window creation</long>
++ </locale>
++ </schema>
++
++ </schemalist>
++</gconfschemafile>
--- a/patches/gnome-applets-07-l10n-online-help.diff Tue Mar 16 03:30:33 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
---- ../gnome-applets-2.5.6.old/configure.in 2004-02-23 14:13:10.000000000 +0000
-+++ ./configure.in 2004-02-23 14:15:00.000000000 +0000
-@@ -404,6 +404,15 @@
- drivemount/Makefile
- drivemount/help/Makefile
- drivemount/help/C/Makefile
-+drivemount/help/de/Makefile
-+drivemount/help/es/Makefile
-+drivemount/help/fr/Makefile
-+drivemount/help/it/Makefile
-+drivemount/help/ja/Makefile
-+drivemount/help/ko/Makefile
-+drivemount/help/sv/Makefile
-+drivemount/help/zh_CN/Makefile
-+drivemount/help/zh_TW/Makefile
- modemlights/Makefile
- modemlights/docs/Makefile
- modemlights/docs/C/Makefile
-@@ -422,6 +431,15 @@
- multiload/Makefile
- multiload/docs/Makefile
- multiload/docs/C/Makefile
-+multiload/docs/de/Makefile
-+multiload/docs/es/Makefile
-+multiload/docs/fr/Makefile
-+multiload/docs/it/Makefile
-+multiload/docs/ja/Makefile
-+multiload/docs/ko/Makefile
-+multiload/docs/sv/Makefile
-+multiload/docs/zh_CN/Makefile
-+multiload/docs/zh_TW/Makefile
- gkb-new/Makefile
- gkb-new/gkb/Makefile
- gkb-new/xmodmap/Makefile
-@@ -495,7 +513,15 @@
- battstat/sounds/Makefile
- battstat/docs/Makefile
- battstat/docs/C/Makefile
-+battstat/docs/de/Makefile
-+battstat/docs/es/Makefile
-+battstat/docs/fr/Makefile
-+battstat/docs/it/Makefile
- battstat/docs/ja/Makefile
-+battstat/docs/ko/Makefile
-+battstat/docs/sv/Makefile
-+battstat/docs/zh_CN/Makefile
-+battstat/docs/zh_TW/Makefile
- man/Makefile
- wireless/Makefile
- wireless/docs/Makefile
---- ../gnome-applets-2.5.6.old/multiload/docs/Makefile.am 2004-02-23 14:13:11.000000000 +0000
-+++ ./multiload/docs/Makefile.am 2004-02-23 14:15:58.000000000 +0000
-@@ -1 +1 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it ja ko sv zh_CN zh_TW
---- ../gnome-applets-2.5.6.old/drivemount/help/Makefile.am 2004-02-23 14:13:11.000000000 +0000
-+++ ./drivemount/help/Makefile.am 2004-02-23 14:16:52.000000000 +0000
-@@ -1 +1 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it ja ko sv zh_CN zh_TW
---- ../gnome-applets-2.5.6.old/battstat/docs/Makefile.am 2004-02-23 14:13:11.000000000 +0000
-+++ ./battstat/docs/Makefile.am 2004-02-23 14:17:08.000000000 +0000
-@@ -1 +1 @@
--SUBDIRS = C ja
-+SUBDIRS = C de es fr it ja ko sv zh_CN zh_TW
--- a/patches/gnome-applets-08-g11n-i18n-ui.diff Tue Mar 16 03:30:33 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4165 +0,0 @@
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/AM_Armenian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/AM_Armenian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/AM_Armenian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/AM_Armenian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Armenian xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap am
-+
-+[Country 0]
-+Flag=am.png
-+Label=am
-+_Language=Armenian
-+_Country=Armenia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/AR_Arabic.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/AR_Arabic.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/AR_Arabic.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/AR_Arabic.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,134 @@
-+[Keymap Entry]
-+Countries=21
-+_Language=Arabic
-+_Name=Arabic xkb keymap
-+Codepage=Arabiciso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap ar
-+
-+[Country 0]
-+Flag=dz.png
-+Label=dz
-+_Language=Arabic
-+_Country=Algeria
-+
-+[Country 1]
-+Flag=bh.png
-+Label=bh
-+_Language=Arabic
-+_Country=Bahrain
-+
-+[Country 2]
-+Flag=dj.png
-+Label=dj
-+_Language=Arabic
-+_Country=Djibouti
-+
-+[Country 3]
-+Flag=km.png
-+Label=km
-+_Language=Arabic
-+_Country=Comoros
-+
-+[Country 4]
-+Flag=eg.png
-+Label=eg
-+_Language=Arabic
-+_Country=Egypt
-+
-+[Country 5]
-+Flag=iq.png
-+Label=iq
-+_Language=Arabic
-+_Country=Iraq
-+
-+[Country 6]
-+Flag=jo.png
-+Label=jo
-+_Language=Arabic
-+_Country=Jordan
-+
-+[Country 7]
-+Flag=kw.png
-+Label=kw
-+_Language=Arabic
-+_Country=Kuwait
-+
-+[Country 8]
-+Flag=lb.png
-+Label=lb
-+_Language=Arabic
-+_Country=Lebanon
-+
-+[Country 9]
-+Flag=ly.png
-+Label=ly
-+_Language=Arabic
-+_Country=Libyan Arab Jamahiriya
-+
-+[Country 10]
-+Flag=ma.png
-+Label=ma
-+_Language=Arabic
-+_Country=Marocco
-+
-+[Country 11]
-+Flag=om.png
-+Label=om
-+_Language=Arabic
-+_Country=Oman
-+
-+[Country 12]
-+Flag=ps.png
-+Label=ps
-+_Language=Arabic
-+_Country=Palestinian Territory
-+
-+[Country 13]
-+Flag=qa.png
-+Label=qa
-+_Language=Arabic
-+_Country=Qatar
-+
-+[Country 14]
-+Flag=sa.png
-+Label=sa
-+_Language=Arabic
-+_Country=Saudi Arabia
-+
-+[Country 15]
-+Flag=so.png
-+Label=so
-+_Language=Arabic
-+_Country=Somalia
-+
-+[Country 16]
-+Flag=su.png
-+Label=su
-+_Language=Arabic
-+_Country=Sudan
-+
-+[Country 17]
-+Flag=sy.png
-+Label=sy
-+_Language=Arabic
-+_Country=Syria
-+
-+[Country 18]
-+Flag=tn.png
-+Label=tn
-+_Language=Arabic
-+_Country=Tunisia
-+
-+[Country 19]
-+Flag=ae.png
-+Label=ae
-+_Language=Arabic
-+_Country=United Arab Emirates
-+
-+[Country 20]
-+Flag=ye.png
-+Label=ye
-+_Language=Arabic
-+_Country=Yemen
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/AR_Arabic_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/AR_Arabic_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/AR_Arabic_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/AR_Arabic_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,134 @@
-+[Keymap Entry]
-+Countries=21
-+_Language=Arabic
-+_Name=Arabic keymap
-+Codepage=Arabic-iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap ar
-+
-+[Country 0]
-+Flag=dz.png
-+Label=dz
-+_Language=Arabic
-+_Country=Algeria
-+
-+[Country 1]
-+Flag=bh.png
-+Label=bh
-+_Language=Arabic
-+_Country=Bahrain
-+
-+[Country 2]
-+Flag=dj.png
-+Label=dj
-+_Language=Arabic
-+_Country=Djibouti
-+
-+[Country 3]
-+Flag=km.png
-+Label=km
-+_Language=Arabic
-+_Country=Comoros
-+
-+[Country 4]
-+Flag=eg.png
-+Label=eg
-+_Language=Arabic
-+_Country=Egypt
-+
-+[Country 5]
-+Flag=iq.png
-+Label=iq
-+_Language=Arabic
-+_Country=Iraq
-+
-+[Country 6]
-+Flag=jo.png
-+Label=jo
-+_Language=Arabic
-+_Country=Jordan
-+
-+[Country 7]
-+Flag=kw.png
-+Label=kw
-+_Language=Arabic
-+_Country=Kuwait
-+
-+[Country 8]
-+Flag=lb.png
-+Label=lb
-+_Language=Arabic
-+_Country=Lebanon
-+
-+[Country 9]
-+Flag=ly.png
-+Label=ly
-+_Language=Arabic
-+_Country=Libyan Arab Jamahiriya
-+
-+[Country 10]
-+Flag=ma.png
-+Label=ma
-+_Language=Arabic
-+_Country=Marocco
-+
-+[Country 11]
-+Flag=om.png
-+Label=om
-+_Language=Arabic
-+_Country=Oman
-+
-+[Country 12]
-+Flag=ps.png
-+Label=ps
-+_Language=Arabic
-+_Country=Palestinian Territory
-+
-+[Country 13]
-+Flag=qa.png
-+Label=qa
-+_Language=Arabic
-+_Country=Qatar
-+
-+[Country 14]
-+Flag=sa.png
-+Label=sa
-+_Language=Arabic
-+_Country=Saudi Arabia
-+
-+[Country 15]
-+Flag=so.png
-+Label=so
-+_Language=Arabic
-+_Country=Somalia
-+
-+[Country 16]
-+Flag=su.png
-+Label=su
-+_Language=Arabic
-+_Country=Sudan
-+
-+[Country 17]
-+Flag=sy.png
-+Label=sy
-+_Language=Arabic
-+_Country=Syria
-+
-+[Country 18]
-+Flag=tn.png
-+Label=tn
-+_Language=Arabic
-+_Country=Tunisia
-+
-+[Country 19]
-+Flag=ae.png
-+Label=ae
-+_Language=Arabic
-+_Country=United Arab Emirates
-+
-+[Country 20]
-+Flag=ye.png
-+Label=ye
-+_Language=Arabic
-+_Country=Yemen
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/AZ_Azerbaidjani_Turkic.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/AZ_Azerbaidjani_Turkic.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/AZ_Azerbaidjani_Turkic.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/AZ_Azerbaidjani_Turkic.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Azerbaidjani Turkic xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap az
-+
-+[Country 0]
-+Flag=az.png
-+Label=az
-+_Language=Azerbaidjani Turkic
-+_Country=Azerbaidjan
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Armenian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Armenian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Armenian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Armenian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Armenian
-+Codepage=am-armscii8
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap am
-+
-+[Country 0]
-+Label=am
-+Flag=am.png
-+_Language=Armenian
-+_Country=Armenia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/BE_Dutch.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/BE_Dutch.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/BE_Dutch.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/BE_Dutch.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Dutch xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap be
-+
-+[Country 0]
-+Flag=be.png
-+Label=be
-+_Language=Dutch
-+_Country=Belgium
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/BG_Bulgarian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/BG_Bulgarian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/BG_Bulgarian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/BG_Bulgarian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Bulgarian xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap bg
-+
-+[Country 0]
-+Flag=bg.png
-+Label=bg
-+_Language=Bulgarian
-+_Country=Bulgaria
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/BG_Bulgarian_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/BG_Bulgarian_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/BG_Bulgarian_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/BG_Bulgarian_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Bulgarian keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap bg
-+
-+[Country 0]
-+Flag=bg.png
-+Label=bg
-+_Language=Bulgarian
-+_Country=Bulgaria
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/BR_Portuguese.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/BR_Portuguese.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/BR_Portuguese.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/BR_Portuguese.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Brazil Portuguese xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap br
-+
-+[Country 0]
-+Flag=br.png
-+Label=br
-+_Language=Portuguese
-+_Country=Brazil
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/BR_Portuguese_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/BR_Portuguese_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/BR_Portuguese_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/BR_Portuguese_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Brazil Portuguese keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap br
-+
-+[Country 0]
-+Flag=br.png
-+Label=br
-+_Language=Portuguese
-+_Country=Brazil
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/BY_Belarussian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/BY_Belarussian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/BY_Belarussian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/BY_Belarussian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Belarussian xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap by
-+
-+[Country 0]
-+Flag=by.png
-+Label=by
-+_Language=Belarussian
-+_Country=Belarus
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Basque.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Basque.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Basque.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Basque.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Basque
-+Codepage=iso-8859-1
-+Type=102
-+Arch=ix86
-+Command=gkb_xmmap es
-+
-+[Country 0]
-+Flag=eu.png
-+Label=eu
-+_Language=Basque
-+_Country=Euskadi
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Belgian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Belgian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Belgian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Belgian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,25 @@
-+[Keymap Entry]
-+Countries=3
-+_Name=Belgian
-+Codepage=be-latin1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap be
-+
-+[Country 0]
-+Flag=be.png
-+Label=be
-+_Language=French
-+_Country=Belgium
-+
-+[Country 1]
-+Flag=be.png
-+Label=be
-+_Language=Dutch
-+_Country=Belgium
-+
-+[Country 2]
-+Flag=be.png
-+Label=be
-+_Language=Wallon
-+_Country=Belgium
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/BulgarianCyril.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/BulgarianCyril.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/BulgarianCyril.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/BulgarianCyril.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Bulgarian Cyrillic
-+Codepage=cp1251
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap ru_yawerty
-+
-+[Country 0]
-+Flag=bg.png
-+Label=bg
-+_Language=Bulgarian
-+_Country=Bulgaria
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/CA_English.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/CA_English.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/CA_English.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/CA_English.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Canadian xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap ca
-+
-+[Country 0]
-+Flag=ca.png
-+Label=ca
-+_Language=English
-+_Country=Canada
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/CH_German_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/CH_German_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/CH_German_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/CH_German_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Swiss keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap ch
-+
-+[Country 0]
-+Flag=ch.png
-+Label=ch
-+_Language=German
-+_Country=Switzerland
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/CZ_Czech.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/CZ_Czech.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/CZ_Czech.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/CZ_Czech.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Czech qwertz xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap cs
-+
-+[Country 0]
-+Flag=cz.png
-+Label=cz
-+_Language=Czech
-+_Country=Former Czechoslovakia Czech Republic
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/CZ_Czech_Slovak.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/CZ_Czech_Slovak.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/CZ_Czech_Slovak.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/CZ_Czech_Slovak.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,19 @@
-+[Keymap Entry]
-+Countries=2
-+_Name=Czech and Slovak xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap czsk
-+
-+[Country 0]
-+Flag=cz.png
-+Label=cz
-+_Language=Czech
-+_Country=Czech Republic
-+
-+[Country 1]
-+Flag=sk.png
-+Label=sk
-+_Language=Slovak
-+_Country=Slovak Republic
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/CZ_Czech_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/CZ_Czech_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/CZ_Czech_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/CZ_Czech_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Czech keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap cz
-+
-+[Country 0]
-+Flag=cz.png
-+Label=cz
-+_Language=Czech
-+_Country=Czech Republic
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/DE_German.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/DE_German.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/DE_German.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/DE_German.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=German xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap de
-+
-+[Country 0]
-+Flag=de.png
-+Label=de
-+_Language=German
-+_Country=Germany
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/DE_German_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/DE_German_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/DE_German_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/DE_German_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=German keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap de
-+
-+[Country 0]
-+Flag=de.png
-+Label=de
-+_Language=German
-+_Country=Germany
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/DK_Danish.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/DK_Danish.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/DK_Danish.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/DK_Danish.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Danish xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap dk
-+
-+[Country 0]
-+Flag=dk.png
-+Label=dk
-+_Language=Danish
-+_Country=Denmark
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/DK_Danish_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/DK_Danish_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/DK_Danish_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/DK_Danish_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Danish keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap dk
-+
-+[Country 0]
-+Flag=dk.png
-+Label=dk
-+_Language=Danish
-+_Country=Denmark
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Default.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Default.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Default.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Default.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Gnome Keyboard default
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=xmodmap $HOME/.gkb_default.xmm
-+
-+[Country 0]
-+Flag=gkb.png
-+_Label=Default
-+_Language=International
-+_Country=International
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Dvorak.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Dvorak.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Dvorak.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Dvorak.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Dvorak xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap dvorak
-+
-+[Country 0]
-+Flag=gkb.png
-+Label=dvr
-+_Language=International
-+_Country=International
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/EE_Estonian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/EE_Estonian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/EE_Estonian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/EE_Estonian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Estonian xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap ee
-+
-+[Country 0]
-+Flag=ee.png
-+Label=ee
-+_Language=Estonian
-+_Country=Estonia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/EE_Estonian_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/EE_Estonian_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/EE_Estonian_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/EE_Estonian_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Estonian keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap ee
-+
-+[Country 0]
-+Flag=ee.png
-+Label=ee
-+_Language=Estonian
-+_Country=Estonia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/ES_Spanish-x86.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/ES_Spanish-x86.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/ES_Spanish-x86.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/ES_Spanish-x86.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Spanish PC/AT 101 keyboard
-+Codepage=iso-8859-1
-+Type=101
-+Arch=ix86
-+Command=setxkbmap es_x86
-+
-+[Country 0]
-+Flag=es.png
-+Label=es
-+_Language=Spanish
-+_Country=Spain
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/ES_Spanish.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/ES_Spanish.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/ES_Spanish.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/ES_Spanish.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Spanish xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap es
-+
-+[Country 0]
-+Flag=es.png
-+Label=es
-+_Language=Spanish
-+_Country=Spain
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/ES_Spanish_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/ES_Spanish_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/ES_Spanish_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/ES_Spanish_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Spanish keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap es
-+
-+[Country 0]
-+Flag=es.png
-+Label=es
-+_Language=Spanish
-+_Country=Spain
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/FI_Finnish.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/FI_Finnish.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/FI_Finnish.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/FI_Finnish.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Finnish xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap fi
-+
-+[Country 0]
-+Flag=fi.png
-+Label=fi
-+_Language=Finnish
-+_Country=Finland
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/FI_Finnish_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/FI_Finnish_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/FI_Finnish_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/FI_Finnish_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Finnish keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap fi
-+
-+[Country 0]
-+Flag=fi.png
-+Label=fi
-+_Language=Finnish
-+_Country=Finland
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/FR_French-x86.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/FR_French-x86.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/FR_French-x86.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/FR_French-x86.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=French PC/AT 101 keyboard
-+Codepage=iso-8859-1
-+Type=101
-+Arch=ix86
-+Command=setxkbmap fr_x86
-+
-+[Country 0]
-+Flag=fr.png
-+Label=fr
-+_Language=French
-+_Country=France
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/FR_French.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/FR_French.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/FR_French.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/FR_French.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=French xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap fr
-+
-+[Country 0]
-+Flag=fr.png
-+Label=fr
-+_Language=French
-+_Country=France
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/FR_French_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/FR_French_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/FR_French_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/FR_French_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=French keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap fr
-+
-+[Country 0]
-+Flag=fr.png
-+Label=fr
-+_Language=French
-+_Country=France
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/FrenchCanadian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/FrenchCanadian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/FrenchCanadian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/FrenchCanadian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=French-Canadian 105-key
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap qc-2
-+
-+[Country 0]
-+Flag=qc.png
-+Label=qc
-+_Language=French
-+_Country=Canada
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/FrenchCanadian2.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/FrenchCanadian2.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/FrenchCanadian2.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/FrenchCanadian2.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=French Swiss
-+Codepage=iso-8859-1
-+Type=102
-+Arch=ix86
-+Command=gkb_xmmap sf
-+
-+[Country 0]
-+Flag=ch.png
-+Label=ch
-+_Language=French
-+_Country=Switzerland
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/FrenchSwiss.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/FrenchSwiss.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/FrenchSwiss.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/FrenchSwiss.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=French Swiss keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap sf
-+
-+[Country 0]
-+Flag=ch.png
-+Label=ch
-+_Language=French
-+_Country=Switzerland
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/GE_Georgian_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/GE_Georgian_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/GE_Georgian_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/GE_Georgian_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Georgian keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap ge
-+
-+[Country 0]
-+Flag=ge.png
-+Label=ge
-+_Language=Georgian
-+_Country=Georgia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/GR_Greek.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/GR_Greek.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/GR_Greek.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/GR_Greek.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Greek xkb keymap
-+Codepage=iso-8859-7
-+Type=105
-+Arch=ix86
-+Command=setxkbmap el
-+
-+[Country 0]
-+Flag=gr.png
-+Label=gr
-+_Language=Greek
-+_Country=Greece
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/GR_Greek_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/GR_Greek_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/GR_Greek_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/GR_Greek_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Greek keymap
-+Codepage=iso-8859-7
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap gr
-+
-+[Country 0]
-+Flag=gr.png
-+Label=gr
-+_Language=Greek
-+_Country=Greece
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/GeorgianLatin.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/GeorgianLatin.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/GeorgianLatin.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/GeorgianLatin.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Georgian Latin
-+Codepage=georgian-academy
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap ge_la
-+
-+[Country 0]
-+Flag=ge.png
-+Label=ge-la
-+_Language=Georgian
-+_Country=Georgia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/GeorgianRussian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/GeorgianRussian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/GeorgianRussian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/GeorgianRussian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Georgian Russian layout
-+Codepage=georgian-academy
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap ge_ru
-+
-+[Country 0]
-+Flag=ge.png
-+Label=ge-ru
-+_Language=Georgian
-+_Country=Georgia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/German.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/German.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/German.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/German.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,25 @@
-+[Keymap Entry]
-+Countries=3
-+_Name=German
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap sg
-+
-+[Country 0]
-+Label=de
-+Flag=de.png
-+_Language=German
-+_Country=Germany
-+
-+[Country 1]
-+Label=at
-+Flag=at.png
-+_Language=German
-+_Country=Austria
-+
-+[Country 2]
-+Label=ch
-+Flag=ch.png
-+_Language=German
-+_Country=Switzerland
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/GermanSwiss.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/GermanSwiss.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/GermanSwiss.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/GermanSwiss.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=German Swiss with Euro
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap sg
-+
-+[Country 0]
-+Flag=ch.png
-+Label=ch-e
-+_Language=German
-+_Country=Switzerland
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/HR_Croatian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/HR_Croatian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/HR_Croatian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/HR_Croatian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Croatian keymap
-+Codepage=iso-8859-2
-+Type=105
-+Arch=ix86
-+Command=setxkbmap hr
-+
-+[Country 0]
-+Flag=hr.png
-+Label=hr
-+_Language=Croatian
-+_Country=Croatia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/HU_Hungarian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/HU_Hungarian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/HU_Hungarian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/HU_Hungarian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Hungarian latin2 xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap hu
-+
-+[Country 0]
-+Flag=hu.png
-+Label=hu
-+_Language=Hungarian
-+_Country=Hungary
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian-101.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Hungarian-101.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian-101.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Hungarian-101.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,10 @@
-+[Keymap Entry]
-+_Name=Hungarian latin1
-+_Language=Hungarian
-+_Country=Hungary
-+Codepage=iso-8859-1
-+Flag=hu.png
-+Label=hu-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap hu-lat1
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian-lat1.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Hungarian-lat1.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian-lat1.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Hungarian-lat1.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Hungarian 105-key latin 1
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap hu-lat1
-+
-+[Country 0]
-+Flag=hu.png
-+Label=hu1-l1
-+_Language=Hungarian
-+_Country=Hungary
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian-sun.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Hungarian-sun.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian-sun.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Hungarian-sun.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Sun (!not PC!) type5 Hungarian latin 2
-+Codepage=iso-8859-2
-+Type=type5
-+Arch=Sun
-+Command=gkb_xmmap hu-sun-lat2
-+
-+[Country 0]
-+Flag=hu.png
-+Label=hu-l1
-+_Language=Hungarian
-+_Country=Hungary
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian-x86.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Hungarian-x86.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian-x86.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Hungarian-x86.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Hungarian PC/AT 101 keyboard
-+Codepage=iso-8859-2
-+Type=101
-+Arch=ix86
-+Command=gkb_xmmap hu_x86
-+
-+[Country 0]
-+Flag=hu.png
-+Label=hu-l1
-+_Language=Hungarian
-+_Country=Hungary
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Hungarian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Hungarian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Hungarian 105-key latin 2
-+Codepage=iso-8859-2
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap hu
-+
-+[Country 0]
-+Flag=hu.png
-+Label=hu-l1
-+_Language=Hungarian
-+_Country=Hungary
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian101-1.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Hungarian101-1.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian101-1.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Hungarian101-1.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Hungarian 101-key latin 1
-+Codepage=iso-8859-1
-+Type=101
-+Arch=ix86
-+Command=gkb_xmmap hu-101-lat1
-+
-+[Country 0]
-+Flag=hu.png
-+Label=hu1
-+_Language=Hungarian
-+_Country=Hungary
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian101.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Hungarian101.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Hungarian101.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Hungarian101.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Hungarian 101-key latin 2
-+Codepage=iso-8859-2
-+Type=101
-+Arch=ix86
-+Command=gkb_xmmap hu-101-lat2
-+
-+[Country 0]
-+Flag=hu.png
-+Label=hu-1
-+_Language=Hungarian
-+_Country=Hungary
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/IL_Hebrew.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/IL_Hebrew.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/IL_Hebrew.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/IL_Hebrew.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Hebrew xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap il
-+
-+[Country 0]
-+Flag=il.png
-+Label=il
-+_Language=Hebrew
-+_Country=Israel
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/IL_Hebrew_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/IL_Hebrew_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/IL_Hebrew_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/IL_Hebrew_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Hebrew keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap il
-+
-+[Country 0]
-+Flag=il.png
-+Label=il
-+_Language=Hebrew
-+_Country=Israel
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/IS_Icelandic.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/IS_Icelandic.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/IS_Icelandic.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/IS_Icelandic.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Icelandic xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap is
-+
-+[Country 0]
-+Flag=is.png
-+Label=is
-+_Language=Icelandic
-+_Country=Iceland
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/IS_Icelandic_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/IS_Icelandic_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/IS_Icelandic_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/IS_Icelandic_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Icelandic keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap is
-+
-+[Country 0]
-+Flag=is.png
-+Label=is
-+_Language=Icelandic
-+_Country=Iceland
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/IT_Italian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/IT_Italian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/IT_Italian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/IT_Italian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Italian xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap it
-+
-+[Country 0]
-+Flag=it.png
-+Label=it
-+_Language=Italian
-+_Country=Italy
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/IT_Italian_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/IT_Italian_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/IT_Italian_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/IT_Italian_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Italian keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap it
-+
-+[Country 0]
-+Flag=it.png
-+Label=it
-+_Language=Italian
-+_Country=Italy
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/JP_Japanese.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/JP_Japanese.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/JP_Japanese.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/JP_Japanese.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Japanese xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap jp
-+
-+[Country 0]
-+Flag=jp.png
-+Label=jp
-+_Language=Japanese
-+_Country=Japan
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/JP_Japanese_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/JP_Japanese_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/JP_Japanese_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/JP_Japanese_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Japanese keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap jp
-+
-+[Country 0]
-+Flag=jp.png
-+Label=jp
-+_Language=Japanese
-+_Country=Japan
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/KR_Korean.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/KR_Korean.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/KR_Korean.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/KR_Korean.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Korean 106 keyboard
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap kr
-+
-+[Country 0]
-+Flag=kr.png
-+Label=kr
-+_Language=Korean
-+_Country=South Korea
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/LA_Lao_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/LA_Lao_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/LA_Lao_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/LA_Lao_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Lao keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap la
-+
-+[Country 0]
-+Flag=la.png
-+Label=la
-+_Language=Lao
-+_Country=Laos
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/LT_Lithuanian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/LT_Lithuanian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/LT_Lithuanian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/LT_Lithuanian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Lithuanian qwerty xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap lt
-+
-+[Country 0]
-+Flag=lt.png
-+Label=lt
-+_Language=Lithuanian
-+_Country=Lithuania
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/LT_Lithuanian_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/LT_Lithuanian_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/LT_Lithuanian_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/LT_Lithuanian_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Lithuanian keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap lt
-+
-+[Country 0]
-+Flag=lt.png
-+Label=lt
-+_Language=Lithuanian
-+_Country=Lithuania
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/LT_Prog.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/LT_Prog.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/LT_Prog.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/LT_Prog.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Lithuanian programmers xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap lt_p
-+
-+[Country 0]
-+Flag=lt.png
-+Label=lt-p
-+_Language=Lithuanian
-+_Country=Lithuania
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/LT_Standard.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/LT_Standard.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/LT_Standard.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/LT_Standard.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Lithuanian standard xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap lt_std
-+
-+[Country 0]
-+Flag=lt.png
-+Label=lt-s
-+_Language=Lithuanian
-+_Country=Lithuania
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/MK_Macedonian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/MK_Macedonian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/MK_Macedonian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/MK_Macedonian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Macedonian xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap mk
-+
-+[Country 0]
-+Flag=mk.png
-+Label=mk
-+_Language=Macedonian
-+_Country=Macedonia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/MN_Mongolian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/MN_Mongolian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/MN_Mongolian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/MN_Mongolian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Mongolian keyboard
-+Codepage=iso-8859-5
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap mn
-+
-+[Country 0]
-+Flag=mn.png
-+Label=mn
-+_Language=Mongolian
-+_Country=Mongolia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/MN_Mongolian_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/MN_Mongolian_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/MN_Mongolian_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/MN_Mongolian_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Mongolian keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap mn
-+
-+[Country 0]
-+Flag=mn.png
-+Label=mn
-+_Language=Mongolian
-+_Country=Mongolia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/MN_Mongolian_x_rev.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/MN_Mongolian_x_rev.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/MN_Mongolian_x_rev.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/MN_Mongolian_x_rev.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Plain Mongolian keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap mn-rev
-+
-+[Country 0]
-+Flag=mn.png
-+Label=mn
-+_Language=Mongolian
-+_Country=Mongolia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/MN_Mongolian_x_uni.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/MN_Mongolian_x_uni.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/MN_Mongolian_x_uni.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/MN_Mongolian_x_uni.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Unicode Mongolian Keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap mn-uni
-+
-+[Country 0]
-+Flag=mn.png
-+Label=mn
-+_Language=Mongolian
-+_Country=Mongolia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Macedonian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Macedonian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Macedonian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Macedonian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Macedonian
-+Codepage=iso-8859-5
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap mk
-+
-+[Country 0]
-+Flag=mk.png
-+Label=mk
-+_Language=Macedonian
-+_Country=Macedonia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Makefile.am gnome-applets-2.5.6/gkb-new/descs/Makefile.am
---- gnome-applets-2.5.6-orig/gkb-new/descs/Makefile.am 2004-03-16 05:01:24.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Makefile.am 2004-03-16 05:09:51.000000000 +0900
-@@ -1,74 +1,74 @@
--%.keyprop: %.keyprop.in
-+%.keyprop: %.keyprop.desktop.in
- $(top_builddir)/intltool-merge -d -p $(top_srcdir)/po $< $(srcdir)/$*.keyprop
-
- preset_data_predata = \
-- AM_Armenian.keyprop.in AR_Arabic.keyprop.in \
-- AR_Arabic_x.keyprop.in Armenian.keyprop.in \
-- AZ_Azerbaidjani_Turkic.keyprop.in Basque.keyprop.in \
-- BE_Dutch.keyprop.in Belgian.keyprop.in \
-- BG_Bulgarian.keyprop.in BG_Bulgarian_x.keyprop.in \
-- BR_Portuguese.keyprop.in BR_Portuguese_x.keyprop.in \
-- BulgarianCyril.keyprop.in BY_Belarussian.keyprop.in \
-- CA_English.keyprop.in CH_German_x.keyprop.in \
-- CZ_Czech.keyprop.in CZ_Czech_Slovak.keyprop.in \
-- CZ_Czech_x.keyprop.in Default.keyprop.in \
-- DE_German.keyprop.in DE_German_x.keyprop.in \
-- DK_Danish.keyprop.in DK_Danish_x.keyprop.in \
-- Dvorak.keyprop.in EE_Estonian.keyprop.in \
-- EE_Estonian_x.keyprop.in ES_Spanish.keyprop.in \
-- ES_Spanish-x86.keyprop.in ES_Spanish_x.keyprop.in \
-- FI_Finnish.keyprop.in FI_Finnish_x.keyprop.in \
-- FrenchCanadian2.keyprop.in FrenchCanadian.keyprop.in \
-- FrenchSwiss.keyprop.in FR_French.keyprop.in \
-- FR_French-x86.keyprop.in FR_French_x.keyprop.in \
-- GE_Georgian_x.keyprop.in GeorgianLatin.keyprop.in \
-- GeorgianRussian.keyprop.in German.keyprop.in \
-- GermanSwiss.keyprop.in GR_Greek.keyprop.in \
-- GR_Greek_x.keyprop.in HR_Croatian.keyprop.in \
-- HU_Hungarian.keyprop.in Hungarian101-1.keyprop.in \
-- Hungarian-101.keyprop.in Hungarian101.keyprop.in \
-- Hungarian.keyprop.in Hungarian-lat1.keyprop.in \
-- Hungarian-sun.keyprop.in Hungarian-x86.keyprop.in \
-- IL_Hebrew.keyprop.in IL_Hebrew_x.keyprop.in \
-- IS_Icelandic.keyprop.in IS_Icelandic_x.keyprop.in \
-- IT_Italian.keyprop.in IT_Italian_x.keyprop.in \
-- JP_Japanese.keyprop.in JP_Japanese_x.keyprop.in \
-- KR_Korean.keyprop.in LA_Lao_x.keyprop.in \
-- LT_Lithuanian.keyprop.in LT_Lithuanian_x.keyprop.in \
-- LT_Prog.keyprop.in LT_Standard.keyprop.in \
-- Macedonian.keyprop.in MK_Macedonian.keyprop.in \
-- MN_Mongolian.keyprop.in MN_Mongolian_x.keyprop.in \
-- MN_Mongolian_x_rev.keyprop.in MN_Mongolian_x_uni.keyprop.in \
-- NL_Dutch_x.keyprop.in NO_Norwegian.keyprop.in \
-- Norwegian.keyprop.in PL_Polish.keyprop.in \
-- PolishDeadkeys.keyprop.in Polish.keyprop.in \
-- PortugalDeadkeys.keyprop.in Portugal.keyprop.in \
-- PT_Portuguese.keyprop.in PT_Portuguese_x.keyprop.in \
-- RO_Romanian.keyprop.in RU_Russian.keyprop.in \
-- RU_Russian_x.keyprop.in RU_Russian_x_rev.keyprop.in \
-- RussianCyril.keyprop.in SE_Swedish.keyprop.in \
-- SE_Swedish_x.keyprop.in SI_Slovenian.keyprop.in \
-- SI_Slovenian_x.keyprop.in Slovak.keyprop.in \
-- Slovene.keyprop.in Slovenian.keyprop.in \
-- SR_Dutch.keyprop.in Swedish.keyprop.in \
-- Syriac.keyprop.in Syriac_Phonetic.keyprop.in \
-- Thai2.keyprop.in Thai.keyprop.in TH_Thai.keyprop.in \
-- TH_Thai_x.keyprop.in TR-f.keyprop.in TR-q.keyprop.in \
-- TR_Turkish.keyprop.in TR_Turkish_x.keyprop.in \
-- UA_Ukrainian.keyprop.in UK-102.keyprop.in \
-- UK_English.keyprop.in UK_English_x.keyprop.in UK.keyprop.in \
-- UK_United_Kingdom.keyprop.in UK-x86.keyprop.in \
-- US-101A-x86.keyprop.in US-101.keyprop.in US-84.keyprop.in \
-- US-dec.keyprop.in US_English.keyprop.in US-ibm.keyprop.in \
-- US_international.keyprop.in US-int.keyprop.in US.keyprop.in \
-- US-mac.keyprop.in US-sgi-101.keyprop.in US-sun.keyprop.in \
-- VN_Vietnamese.keyprop.in Yugoslav.keyprop.in \
-- YU_Serbo-Croatian_x.keyprop.in YU_Serb_x.keyprop.in
-+ AM_Armenian.keyprop.desktop.in AR_Arabic.keyprop.desktop.in \
-+ AR_Arabic_x.keyprop.desktop.in Armenian.keyprop.desktop.in \
-+ AZ_Azerbaidjani_Turkic.keyprop.desktop.in Basque.keyprop.desktop.in \
-+ BE_Dutch.keyprop.desktop.in Belgian.keyprop.desktop.in \
-+ BG_Bulgarian.keyprop.desktop.in BG_Bulgarian_x.keyprop.desktop.in \
-+ BR_Portuguese.keyprop.desktop.in BR_Portuguese_x.keyprop.desktop.in \
-+ BulgarianCyril.keyprop.desktop.in BY_Belarussian.keyprop.desktop.in \
-+ CA_English.keyprop.desktop.in CH_German_x.keyprop.desktop.in \
-+ CZ_Czech.keyprop.desktop.in CZ_Czech_Slovak.keyprop.desktop.in \
-+ CZ_Czech_x.keyprop.desktop.in Default.keyprop.desktop.in \
-+ DE_German.keyprop.desktop.in DE_German_x.keyprop.desktop.in \
-+ DK_Danish.keyprop.desktop.in DK_Danish_x.keyprop.desktop.in \
-+ Dvorak.keyprop.desktop.in EE_Estonian.keyprop.desktop.in \
-+ EE_Estonian_x.keyprop.desktop.in ES_Spanish.keyprop.desktop.in \
-+ ES_Spanish-x86.keyprop.desktop.in ES_Spanish_x.keyprop.desktop.in \
-+ FI_Finnish.keyprop.desktop.in FI_Finnish_x.keyprop.desktop.in \
-+ FrenchCanadian2.keyprop.desktop.in FrenchCanadian.keyprop.desktop.in \
-+ FrenchSwiss.keyprop.desktop.in FR_French.keyprop.desktop.in \
-+ FR_French-x86.keyprop.desktop.in FR_French_x.keyprop.desktop.in \
-+ GE_Georgian_x.keyprop.desktop.in GeorgianLatin.keyprop.desktop.in \
-+ GeorgianRussian.keyprop.desktop.in German.keyprop.desktop.in \
-+ GermanSwiss.keyprop.desktop.in GR_Greek.keyprop.desktop.in \
-+ GR_Greek_x.keyprop.desktop.in HR_Croatian.keyprop.desktop.in \
-+ HU_Hungarian.keyprop.desktop.in Hungarian101-1.keyprop.desktop.in \
-+ Hungarian-101.keyprop.desktop.in Hungarian101.keyprop.desktop.in \
-+ Hungarian.keyprop.desktop.in Hungarian-lat1.keyprop.desktop.in \
-+ Hungarian-sun.keyprop.desktop.in Hungarian-x86.keyprop.desktop.in \
-+ IL_Hebrew.keyprop.desktop.in IL_Hebrew_x.keyprop.desktop.in \
-+ IS_Icelandic.keyprop.desktop.in IS_Icelandic_x.keyprop.desktop.in \
-+ IT_Italian.keyprop.desktop.in IT_Italian_x.keyprop.desktop.in \
-+ JP_Japanese.keyprop.desktop.in JP_Japanese_x.keyprop.desktop.in \
-+ KR_Korean.keyprop.desktop.in LA_Lao_x.keyprop.desktop.in \
-+ LT_Lithuanian.keyprop.desktop.in LT_Lithuanian_x.keyprop.desktop.in \
-+ LT_Prog.keyprop.desktop.in LT_Standard.keyprop.desktop.in \
-+ Macedonian.keyprop.desktop.in MK_Macedonian.keyprop.desktop.in \
-+ MN_Mongolian.keyprop.desktop.in MN_Mongolian_x.keyprop.desktop.in \
-+ MN_Mongolian_x_rev.keyprop.desktop.in MN_Mongolian_x_uni.keyprop.desktop.in \
-+ NL_Dutch_x.keyprop.desktop.in NO_Norwegian.keyprop.desktop.in \
-+ Norwegian.keyprop.desktop.in PL_Polish.keyprop.desktop.in \
-+ PolishDeadkeys.keyprop.desktop.in Polish.keyprop.desktop.in \
-+ PortugalDeadkeys.keyprop.desktop.in Portugal.keyprop.desktop.in \
-+ PT_Portuguese.keyprop.desktop.in PT_Portuguese_x.keyprop.desktop.in \
-+ RO_Romanian.keyprop.desktop.in RU_Russian.keyprop.desktop.in \
-+ RU_Russian_x.keyprop.desktop.in RU_Russian_x_rev.keyprop.desktop.in \
-+ RussianCyril.keyprop.desktop.in SE_Swedish.keyprop.desktop.in \
-+ SE_Swedish_x.keyprop.desktop.in SI_Slovenian.keyprop.desktop.in \
-+ SI_Slovenian_x.keyprop.desktop.in Slovak.keyprop.desktop.in \
-+ Slovene.keyprop.desktop.in Slovenian.keyprop.desktop.in \
-+ SR_Dutch.keyprop.desktop.in Swedish.keyprop.desktop.in \
-+ Syriac.keyprop.desktop.in Syriac_Phonetic.keyprop.desktop.in \
-+ Thai2.keyprop.desktop.in Thai.keyprop.desktop.in TH_Thai.keyprop.desktop.in \
-+ TH_Thai_x.keyprop.desktop.in TR-f.keyprop.desktop.in TR-q.keyprop.desktop.in \
-+ TR_Turkish.keyprop.desktop.in TR_Turkish_x.keyprop.desktop.in \
-+ UA_Ukrainian.keyprop.desktop.in UK-102.keyprop.desktop.in \
-+ UK_English.keyprop.desktop.in UK_English_x.keyprop.desktop.in UK.keyprop.desktop.in \
-+ UK_United_Kingdom.keyprop.desktop.in UK-x86.keyprop.desktop.in \
-+ US-101A-x86.keyprop.desktop.in US-101.keyprop.desktop.in US-84.keyprop.desktop.in \
-+ US-dec.keyprop.desktop.in US_English.keyprop.desktop.in US-ibm.keyprop.desktop.in \
-+ US_international.keyprop.desktop.in US-int.keyprop.desktop.in US.keyprop.desktop.in \
-+ US-mac.keyprop.desktop.in US-sgi-101.keyprop.desktop.in US-sun.keyprop.desktop.in \
-+ VN_Vietnamese.keyprop.desktop.in Yugoslav.keyprop.desktop.in \
-+ YU_Serbo-Croatian_x.keyprop.desktop.in YU_Serb_x.keyprop.desktop.in
-
- presetdir = $(datadir)/gnome/gkb
- preset_in_files = $(preset_data_predata)
--preset_DATA = $(preset_in_files:.keyprop.in=.keyprop)
--EXTRA_DIST = $(preset_DATA) $(xml_DATA)
-+preset_DATA = $(preset_in_files:.keyprop.desktop.in=.keyprop)
-+EXTRA_DIST = $(preset_DATA) $(xml_DATA) $(preset_in_files) $(xml_in_files)
-
- xml_in_files = presets.xml.in
- XMLS = $(xml_in_files:.xml.in=.xml)
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/NL_Dutch_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/NL_Dutch_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/NL_Dutch_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/NL_Dutch_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Dutch keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap nl
-+
-+[Country 0]
-+Flag=nl.png
-+Label=nl
-+_Language=Dutch
-+_Country=Netherlands
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/NO_Norwegian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/NO_Norwegian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/NO_Norwegian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/NO_Norwegian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Norwegian xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap no
-+
-+[Country 0]
-+Flag=no.png
-+Label=no
-+_Language=Norwegian
-+_Country=Norway
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Norwegian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Norwegian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Norwegian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Norwegian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Norwegian
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap no
-+
-+[Country 0]
-+Flag=no.png
-+Label=no
-+_Language=Norwegian
-+_Country=Norway
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/PL_Polish.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/PL_Polish.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/PL_Polish.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/PL_Polish.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Polish xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap pl
-+
-+[Country 0]
-+Flag=pl.png
-+Label=pl
-+_Language=Polish
-+_Country=Poland
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/PT_Portuguese.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/PT_Portuguese.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/PT_Portuguese.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/PT_Portuguese.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Portuguese xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap pt
-+
-+[Country 0]
-+Flag=pt.png
-+Label=pt
-+_Language=Portuguese
-+_Country=Portugal
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/PT_Portuguese_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/PT_Portuguese_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/PT_Portuguese_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/PT_Portuguese_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Portuguese keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap pt
-+
-+[Country 0]
-+Flag=pt.png
-+Label=pt
-+_Language=Portuguese
-+_Country=Portugal
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Polish.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Polish.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Polish.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Polish.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Polish
-+Codepage=iso-8859-2
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap pl
-+
-+[Country 0]
-+Flag=pl.png
-+Label=pl
-+_Language=Polish
-+_Country=Poland
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/PolishDeadkeys.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/PolishDeadkeys.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/PolishDeadkeys.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/PolishDeadkeys.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Polish deadkeys
-+Codepage=iso-8859-2
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap pl2
-+
-+[Country 0]
-+Flag=pl.png
-+Label=pl
-+_Language=Polish
-+_Country=Poland
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Portugal.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Portugal.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Portugal.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Portugal.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,19 @@
-+[Keymap Entry]
-+Countries=2
-+_Name=Portugal
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap pt
-+
-+[Country 0]
-+Flag=pt.png
-+Label=pt
-+_Language=Portuguese
-+_Country=Portugal
-+
-+[Country 1]
-+Flag=pt.png
-+Label=pt
-+_Language=Portuguese
-+_Country=Brazil
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/PortugalDeadkeys.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/PortugalDeadkeys.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/PortugalDeadkeys.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/PortugalDeadkeys.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,19 @@
-+[Keymap Entry]
-+Countries=2
-+_Name=Portugal Deadkeys
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap pt-dead
-+
-+[Country 0]
-+Flag=pt.png
-+Label=pt
-+_Language=Portuguese
-+_Country=Portugal
-+
-+[Country 1]
-+Flag=pt.png
-+Label=pt
-+_Language=Portuguese
-+_Country=Brazil
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/RO_Romanian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/RO_Romanian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/RO_Romanian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/RO_Romanian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Romanian xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap ro
-+
-+[Country 0]
-+Flag=ro.png
-+Label=ro
-+_Language=Romanian
-+_Country=Romania
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/RU_Russian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/RU_Russian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/RU_Russian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/RU_Russian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Russian xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap ru
-+
-+[Country 0]
-+Flag=ru.png
-+Label=ru
-+_Language=Russian
-+_Country=Russia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/RU_Russian_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/RU_Russian_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/RU_Russian_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/RU_Russian_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Russian keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap ru
-+
-+[Country 0]
-+Flag=ru.png
-+Label=ru
-+_Language=Russian
-+_Country=Russia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/RU_Russian_x_rev.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/RU_Russian_x_rev.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/RU_Russian_x_rev.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/RU_Russian_x_rev.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Plain Russian keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap ru-rev
-+
-+[Country 0]
-+Flag=ru.png
-+Label=ru
-+_Language=Russian
-+_Country=Russia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/RussianCyril.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/RussianCyril.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/RussianCyril.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/RussianCyril.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Russian Cyrillic
-+Codepage=koi8-r
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap ru
-+
-+[Country 0]
-+Flag=ru.png
-+Label=ru
-+_Language=Russian
-+_Country=Russia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/SE_Swedish.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/SE_Swedish.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/SE_Swedish.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/SE_Swedish.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Swedish xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap se
-+
-+[Country 0]
-+Flag=se.png
-+Label=se
-+_Language=Swedish
-+_Country=Sweden
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/SE_Swedish_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/SE_Swedish_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/SE_Swedish_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/SE_Swedish_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Swedish keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap se
-+
-+[Country 0]
-+Flag=se.png
-+Label=se
-+_Language=Swedish
-+_Country=Sweden
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/SI_Slovenian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/SI_Slovenian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/SI_Slovenian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/SI_Slovenian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Slovenian xkb keymap
-+Codepage=iso-8859-2
-+Type=105
-+Arch=ix86
-+Command=setxkbmap si
-+
-+[Country 0]
-+Flag=si.png
-+Label=si
-+_Language=Slovenian
-+_Country=Slovenia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/SI_Slovenian_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/SI_Slovenian_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/SI_Slovenian_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/SI_Slovenian_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Slovenian keymap
-+Codepage=iso-8859-2
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap si
-+
-+[Country 0]
-+Flag=si.png
-+Label=si
-+_Language=Slovenian
-+_Country=Slovenia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/SR_Dutch.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/SR_Dutch.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/SR_Dutch.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/SR_Dutch.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Serbian standard xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap sr
-+
-+[Country 0]
-+Flag=yu.png
-+Label=sr
-+_Language=Serb
-+_Country=Serbia and Montenegro
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Slovak.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Slovak.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Slovak.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Slovak.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Slovak
-+Codepage=iso-8859-2
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap sk
-+
-+[Country 0]
-+Flag=sk.png
-+Label=sk
-+_Language=Slovak
-+_Country=Slovak Republic
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Slovene.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Slovene.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Slovene.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Slovene.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Slovenian
-+Codepage=iso-8859-2
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap si
-+
-+[Country 0]
-+Flag=si.png
-+Label=si
-+_Language=Slovenian
-+_Country=Slovenia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Slovenian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Slovenian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Slovenian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Slovenian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Slovenian
-+Codepage=iso-8859-2
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap si
-+
-+[Country 0]
-+Flag=si.png
-+Label=si
-+_Language=Slovenian
-+_Country=Slovenia
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Swedish.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Swedish.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Swedish.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Swedish.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Swedish
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap se
-+
-+[Country 0]
-+Flag=se.png
-+Label=se
-+_Language=Swedish
-+_Country=Sweden
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Syriac.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Syriac.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Syriac.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Syriac.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Syriac xkb keymap
-+Codepage=UTF-8
-+Type=105
-+Arch=ix86
-+Command=setxkbmap syr
-+
-+[Country 0]
-+Flag=gkb.png
-+Label=syr
-+_Language=Syriac
-+_Country=Syriac
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Syriac_Phonetic.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Syriac_Phonetic.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Syriac_Phonetic.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Syriac_Phonetic.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Syriac Phonetic xkb keymap
-+Codepage=UTF-8
-+Type=105
-+Arch=ix86
-+Command=setxkbmap syr_phonetic
-+
-+[Country 0]
-+Flag=gkb.png
-+Label=syrp
-+_Language=Syriac
-+_Country=Syriac
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/TH_Thai.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/TH_Thai.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/TH_Thai.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/TH_Thai.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Thai xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap th
-+
-+[Country 0]
-+Flag=th.png
-+Label=th
-+_Language=Thai
-+_Country=Thailand
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/TH_Thai_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/TH_Thai_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/TH_Thai_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/TH_Thai_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Thai keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap th
-+
-+[Country 0]
-+Flag=th.png
-+Label=th
-+_Language=Thai
-+_Country=Thailand
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/TR-f.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/TR-f.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/TR-f.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/TR-f.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Turkish "F" keyboard
-+Codepage=iso-8859-9
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap tr_f
-+
-+[Country 0]
-+Flag=tr.png
-+Label=tr
-+_Language=Turkish
-+_Country=Turkey
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/TR-q.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/TR-q.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/TR-q.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/TR-q.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Turkish "Q" keyboard
-+Codepage=iso-8859-9
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap tr_q
-+
-+[Country 0]
-+Flag=tr.png
-+Label=tr
-+_Language=Turkish
-+_Country=Turkey
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/TR_Turkish.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/TR_Turkish.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/TR_Turkish.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/TR_Turkish.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Turkish xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap tr
-+
-+[Country 0]
-+Flag=tr.png
-+Label=tr
-+_Language=Turkish
-+_Country=Turkey
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/TR_Turkish_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/TR_Turkish_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/TR_Turkish_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/TR_Turkish_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Turkish keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap tr
-+
-+[Country 0]
-+Flag=tr.png
-+Label=tr
-+_Language=Turkish
-+_Country=Turkey
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Thai.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Thai.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Thai.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Thai.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Thai Kedmanee
-+Codepage=tis620
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap th
-+
-+[Country 0]
-+Flag=th.png
-+Label=th
-+_Language=Thai
-+_Country=Thailand
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Thai2.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Thai2.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Thai2.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Thai2.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Thai
-+Codepage=tis620
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap th2
-+
-+[Country 0]
-+Flag=th.png
-+Label=th
-+_Language=Thai
-+_Country=Thailand
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/UA_Ukrainian.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/UA_Ukrainian.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/UA_Ukrainian.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/UA_Ukrainian.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Ukrainian xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap ua
-+
-+[Country 0]
-+Flag=ua.png
-+Label=ua
-+_Language=Ukrainian
-+_Country=Ukraine
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/UK-102.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/UK-102.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/UK-102.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/UK-102.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=GB 102-key
-+Codepage=iso-8859-1
-+Type=102
-+Arch=ix86
-+Command=gkb_xmmap gb-102
-+
-+[Country 0]
-+Flag=uk.png
-+Label=uk
-+_Language=English
-+_Country=United Kingdom
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/UK-x86.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/UK-x86.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/UK-x86.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/UK-x86.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=UK PC/AT keyboard
-+Codepage=iso-8859-1
-+Type=101
-+Arch=ix86
-+Command=gkb_xmmap uk_x86
-+
-+[Country 0]
-+Flag=gb.png
-+Label=uk
-+_Language=English
-+_Country=United Kingdom
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/UK.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/UK.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/UK.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/UK.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=UK 105-key
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap uk
-+
-+[Country 0]
-+Flag=gb.png
-+Label=uk
-+_Language=English
-+_Country=United Kingdom
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/UK_English.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/UK_English.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/UK_English.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/UK_English.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=United Kingdom xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap gb
-+
-+[Country 0]
-+Flag=uk.png
-+Label=uk
-+_Language=English
-+_Country=United Kingdom
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/UK_English_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/UK_English_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/UK_English_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/UK_English_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=English keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap gb
-+
-+[Country 0]
-+Flag=uk.png
-+Label=uk
-+_Language=English
-+_Country=United Kingdom
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/UK_United_Kingdom.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/UK_United_Kingdom.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/UK_United_Kingdom.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/UK_United_Kingdom.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=GB 105-key
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap gb-105
-+
-+[Country 0]
-+Flag=uk.png
-+Label=uk
-+_Language=English
-+_Country=United Kingdom
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US-101.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US-101.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/US-101.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/US-101.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=US 101-key keyboard
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap us-101
-+
-+[Country 0]
-+Flag=us.png
-+Label=us101
-+_Language=English
-+_Country=United States
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US-101A-x86.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US-101A-x86.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/US-101A-x86.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/US-101A-x86.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=US PC/AT 101 keyboard
-+Codepage=iso-8859-1
-+Type=101
-+Arch=ix86
-+Command=gkb_xmmap us101A_x86
-+
-+[Country 0]
-+Flag=us.png
-+Label=us
-+_Language=English
-+_Country=United States
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US-84.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US-84.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/US-84.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/US-84.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=US 84-key
-+Codepage=iso-8859-1
-+Type=84
-+Arch=ix86
-+Command=gkb_xmmap us-84
-+
-+[Country 0]
-+Flag=us.png
-+Label=us
-+_Language=English
-+_Country=United States
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US-dec.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US-dec.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/US-dec.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/US-dec.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=US DEC 450
-+Codepage=iso-8859-1
-+Type=450
-+Arch=dec
-+Command=gkb_xmmap us-dec
-+
-+[Country 0]
-+Flag=us.png
-+Label=us
-+_Language=English
-+_Country=United States
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US-ibm.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US-ibm.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/US-ibm.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/US-ibm.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=US IBM RS/6000
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ibm
-+Command=gkb_xmmap us-ibm
-+
-+[Country 0]
-+Flag=us.png
-+Label=us
-+_Language=English
-+_Country=United States
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US-int.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US-int.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/US-int.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/US-int.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=US International
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap us-int
-+
-+[Country 0]
-+Flag=us.png
-+Label=us
-+_Language=English
-+_Country=United States
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US-mac.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US-mac.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/US-mac.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/US-mac.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=US Macintosh
-+Codepage=iso-8859-1
-+Type=mklinux
-+Arch=mac
-+Command=gkb_xmmap us-mac
-+
-+[Country 0]
-+Flag=us.png
-+Label=us
-+_Language=English
-+_Country=United States
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US-sgi-101.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US-sgi-101.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/US-sgi-101.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/US-sgi-101.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=US Silicon Graphics 101-key
-+Codepage=iso-8859-1
-+Type=101
-+Arch=sgi
-+Command=gkb_xmmap us-sgi-101
-+
-+[Country 0]
-+Flag=us.png
-+Label=us
-+_Language=English
-+_Country=United States
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US-sun.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US-sun.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/US-sun.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/US-sun.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=US Sun type5
-+Codepage=iso-8859-1
-+Type=type5
-+Arch=Sun
-+Command=gkb_xmmap us-sun
-+
-+[Country 0]
-+Flag=us.png
-+Label=us
-+_Language=English
-+_Country=United States
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/US.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/US.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=US 105-key keyboard (with windows keys)
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap us
-+
-+[Country 0]
-+Flag=us.png
-+Label=us
-+_Language=English
-+_Country=United States
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US_English.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US_English.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/US_English.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/US_English.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=US xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap us
-+
-+[Country 0]
-+Flag=us.png
-+Label=us
-+_Language=English
-+_Country=United States
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/US_international.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/US_international.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/US_international.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/US_international.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=US International xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap us_intl
-+
-+[Country 0]
-+Flag=us.png
-+Label=us-i
-+_Language=English
-+_Country=United States
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/VN_Vietnamese.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/VN_Vietnamese.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/VN_Vietnamese.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/VN_Vietnamese.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Vietnamese xkb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=setxkbmap vn
-+
-+[Country 0]
-+Flag=vn.png
-+Label=vn
-+_Language=Vietnamese
-+_Country=Vietnam
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/YU_Serb_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/YU_Serb_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/YU_Serb_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/YU_Serb_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Serb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap yu
-+
-+[Country 0]
-+Flag=yu.png
-+Label=yu
-+_Language=Serb
-+_Country=Serbia and Montenegro
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/YU_Serbo-Croatian_x.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/YU_Serbo-Croatian_x.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/YU_Serbo-Croatian_x.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/YU_Serbo-Croatian_x.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Serb keymap
-+Codepage=iso-8859-1
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap yu
-+
-+[Country 0]
-+Flag=yu.png
-+Label=yu
-+_Language=Serb
-+_Country=Serbia and Montenegro
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/Yugoslav.keyprop.desktop.in gnome-applets-2.5.6/gkb-new/descs/Yugoslav.keyprop.desktop.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/Yugoslav.keyprop.desktop.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/Yugoslav.keyprop.desktop.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,13 @@
-+[Keymap Entry]
-+Countries=1
-+_Name=Serb keymap
-+Codepage=iso-8859-2
-+Type=105
-+Arch=ix86
-+Command=gkb_xmmap yu
-+
-+[Country 0]
-+Flag=sr.png
-+Label=sr
-+_Language=Serb
-+_Country=Serbia and Montenegro
-diff -urN gnome-applets-2.5.6-orig/gkb-new/descs/presets.xml.in gnome-applets-2.5.6/gkb-new/descs/presets.xml.in
---- gnome-applets-2.5.6-orig/gkb-new/descs/presets.xml.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/descs/presets.xml.in 2004-03-16 05:29:04.000000000 +0900
-@@ -0,0 +1,1333 @@
-+<keymaps>
-+ <keymap>
-+ <_name>Armenian xkb keymap</_name>
-+ <command>setxkbmap am</command>
-+ <_language>Armenian</_language>
-+ <country>
-+ <flag>am.png</flag>
-+ <_name>Armenia</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Arabic xkb keymap</_name>
-+ <command>setxkbmap ar</command>
-+ <_language>Arabic</_language>
-+ <country>
-+ <flag>dz.png</flag>
-+ <_name>Algeria</_name>
-+ </country>
-+ <country>
-+ <flag>bh.png</flag>
-+ <_name>Bahrain</_name>
-+ </country>
-+ <country>
-+ <flag>dj.png</flag>
-+ <_name>Djibouti</_name>
-+ </country>
-+ <country>
-+ <flag>km.png</flag>
-+ <_name>Comoros</_name>
-+ </country>
-+ <country>
-+ <flag>eg.png</flag>
-+ <_name>Egypt</_name>
-+ </country>
-+ <country>
-+ <flag>iq.png</flag>
-+ <_name>Iraq</_name>
-+ </country>
-+ <country>
-+ <flag>jo.png</flag>
-+ <_name>Jordan</_name>
-+ </country>
-+ <country>
-+ <flag>kw.png</flag>
-+ <_name>Kuwait</_name>
-+ </country>
-+ <country>
-+ <flag>lb.png</flag>
-+ <_name>Lebanon</_name>
-+ </country>
-+ <country>
-+ <flag>ly.png</flag>
-+ <_name>Libyan Arab Jamahiriya</_name>
-+ </country>
-+ <country>
-+ <flag>ma.png</flag>
-+ <_name>Marocco</_name>
-+ </country>
-+ <country>
-+ <flag>om.png</flag>
-+ <_name>Oman</_name>
-+ </country>
-+ <country>
-+ <flag>ps.png</flag>
-+ <_name>Palestinian Territory</_name>
-+ </country>
-+ <country>
-+ <flag>qa.png</flag>
-+ <_name>Qatar</_name>
-+ </country>
-+ <country>
-+ <flag>sa.png</flag>
-+ <_name>Saudi Arabia</_name>
-+ </country>
-+ <country>
-+ <flag>so.png</flag>
-+ <_name>Somalia</_name>
-+ </country>
-+ <country>
-+ <flag>sd.png</flag>
-+ <_name>Sudan</_name>
-+ </country>
-+ <country>
-+ <flag>sy.png</flag>
-+ <_name>Syria</_name>
-+ </country>
-+ <country>
-+ <flag>tn.png</flag>
-+ <_name>Tunisia</_name>
-+ </country>
-+ <country>
-+ <flag>ae.png</flag>
-+ <_name>United Arab Emirates</_name>
-+ </country>
-+ <country>
-+ <flag>ye.png</flag>
-+ <_name>Yemen</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Arabic keymap</_name>
-+ <command>gkb_xmmap ar</command>
-+ <_language>Arabic</_language>
-+ <country>
-+ <flag>dz.png</flag>
-+ <_name>Algeria</_name>
-+ </country>
-+ <country>
-+ <flag>bh.png</flag>
-+ <_name>Bahrain</_name>
-+ </country>
-+ <country>
-+ <flag>dj.png</flag>
-+ <_name>Djibouti</_name>
-+ </country>
-+ <country>
-+ <flag>km.png</flag>
-+ <_name>Comoros</_name>
-+ </country>
-+ <country>
-+ <flag>eg.png</flag>
-+ <_name>Egypt</_name>
-+ </country>
-+ <country>
-+ <flag>iq.png</flag>
-+ <_name>Iraq</_name>
-+ </country>
-+ <country>
-+ <flag>jo.png</flag>
-+ <_name>Jordan</_name>
-+ </country>
-+ <country>
-+ <flag>kw.png</flag>
-+ <_name>Kuwait</_name>
-+ </country>
-+ <country>
-+ <flag>lb.png</flag>
-+ <_name>Lebanon</_name>
-+ </country>
-+ <country>
-+ <flag>ly.png</flag>
-+ <_name>Libyan Arab Jamahiriya</_name>
-+ </country>
-+ <country>
-+ <flag>ma.png</flag>
-+ <_name>Marocco</_name>
-+ </country>
-+ <country>
-+ <flag>om.png</flag>
-+ <_name>Oman</_name>
-+ </country>
-+ <country>
-+ <flag>ps.png</flag>
-+ <_name>Palestinian Territory</_name>
-+ </country>
-+ <country>
-+ <flag>qa.png</flag>
-+ <_name>Qatar</_name>
-+ </country>
-+ <country>
-+ <flag>sa.png</flag>
-+ <_name>Saudi Arabia</_name>
-+ </country>
-+ <country>
-+ <flag>so.png</flag>
-+ <_name>Somalia</_name>
-+ </country>
-+ <country>
-+ <flag>sd.png</flag>
-+ <_name>Sudan</_name>
-+ </country>
-+ <country>
-+ <flag>sy.png</flag>
-+ <_name>Syria</_name>
-+ </country>
-+ <country>
-+ <flag>tn.png</flag>
-+ <_name>Tunisia</_name>
-+ </country>
-+ <country>
-+ <flag>ae.png</flag>
-+ <_name>United Arab Emirates</_name>
-+ </country>
-+ <country>
-+ <flag>ye.png</flag>
-+ <_name>Yemen</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Armenian</_name>
-+ <command>gkb_xmmap am</command>
-+ <_language>Armenian</_language>
-+ <country>
-+ <flag>am.png</flag>
-+ <_name>Armenia</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Azerbaidjani Turkic xkb keymap</_name>
-+ <command>setxkbmap az</command>
-+ <_language>Azerbaidjani Turkic</_language>
-+ <country>
-+ <flag>az.png</flag>
-+ <_name>Azerbaidjan</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Basque</_name>
-+ <command>gkb_xmmap es</command>
-+ <_language>Basque</_language>
-+ <country>
-+ <flag>eu.png</flag>
-+ <_name>Euskadi</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Dutch xkb keymap</_name>
-+ <command>setxkbmap be</command>
-+ <_language>Dutch</_language>
-+ <country>
-+ <flag>be.png</flag>
-+ <_name>Belgium</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Belgian</_name>
-+ <command>gkb_xmmap be</command>
-+ <_language>French</_language>
-+ <country>
-+ <flag>be.png</flag>
-+ <_name>Belgium</_name>
-+ </country>
-+ <country>
-+ <flag>be.png</flag>
-+ <_name>Belgium</_name>
-+ </country>
-+ <country>
-+ <flag>be.png</flag>
-+ <_name>Belgium</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Bulgarian xkb keymap</_name>
-+ <command>setxkbmap bg</command>
-+ <_language>Bulgarian</_language>
-+ <country>
-+ <flag>bg.png</flag>
-+ <_name>Bulgaria</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Bulgarian keymap</_name>
-+ <command>gkb_xmmap bg</command>
-+ <_language>Bulgarian</_language>
-+ <country>
-+ <flag>bg.png</flag>
-+ <_name>Bulgaria</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Brazil Portuguese xkb keymap</_name>
-+ <command>setxkbmap br</command>
-+ <_language>Portuguese</_language>
-+ <country>
-+ <flag>br.png</flag>
-+ <_name>Brazil</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Brazil Portuguese keymap</_name>
-+ <command>gkb_xmmap br</command>
-+ <_language>Portuguese</_language>
-+ <country>
-+ <flag>br.png</flag>
-+ <_name>Brazil</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Bulgarian Cyrillic</_name>
-+ <command>gkb_xmmap ru_yawerty</command>
-+ <_language>Bulgarian</_language>
-+ <country>
-+ <flag>bg.png</flag>
-+ <_name>Bulgaria</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Belarussian xkb keymap</_name>
-+ <command>setxkbmap by</command>
-+ <_language>Belarussian</_language>
-+ <country>
-+ <flag>by.png</flag>
-+ <_name>Belarus</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Canadian xkb keymap</_name>
-+ <command>setxkbmap ca</command>
-+ <_language>English</_language>
-+ <country>
-+ <flag>ca.png</flag>
-+ <_name>Canada</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Swiss keymap</_name>
-+ <command>gkb_xmmap ch</command>
-+ <_language>German</_language>
-+ <country>
-+ <flag>ch.png</flag>
-+ <_name>Switzerland</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Czech and Slovak xkb keymap</_name>
-+ <command>setxkbmap czsk</command>
-+ <_language>Czech</_language>
-+ <country>
-+ <flag>cz.png</flag>
-+ <_name>Czech Republic</_name>
-+ </country>
-+ <country>
-+ <flag>sk.png</flag>
-+ <_name>Slovak Republic</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Czech keymap</_name>
-+ <command>gkb_xmmap cz</command>
-+ <_language>Czech</_language>
-+ <country>
-+ <flag>cz.png</flag>
-+ <_name>Czech Republic</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Czech qwertz xkb keymap</_name>
-+ <command>setxkbmap cs</command>
-+ <_language>Czech</_language>
-+ <country>
-+ <flag>cz.png</flag>
-+ <_name>Former Czechoslovakia</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Gnome Keyboard default</_name>
-+ <command>xmodmap $HOME/.gkb_default.xmm</command>
-+ <_language>International</_language>
-+ <country>
-+ <flag>gkb.png</flag>
-+ <_name>International</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>German xkb keymap</_name>
-+ <command>setxkbmap de</command>
-+ <_language>German</_language>
-+ <country>
-+ <flag>de.png</flag>
-+ <_name>Germany</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>German keymap</_name>
-+ <command>gkb_xmmap de</command>
-+ <_language>German</_language>
-+ <country>
-+ <flag>de.png</flag>
-+ <_name>Germany</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Danish xkb keymap</_name>
-+ <command>setxkbmap dk</command>
-+ <_language>Danish</_language>
-+ <country>
-+ <flag>dk.png</flag>
-+ <_name>Denmark</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Danish keymap</_name>
-+ <command>gkb_xmmap dk</command>
-+ <_language>Danish</_language>
-+ <country>
-+ <flag>dk.png</flag>
-+ <_name>Denmark</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Dvorak xkb keymap</_name>
-+ <command>setxkbmap dvorak</command>
-+ <_language>International</_language>
-+ <country>
-+ <flag>gkb.png</flag>
-+ <_name>International</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Estonian xkb keymap</_name>
-+ <command>setxkbmap ee</command>
-+ <_language>Estonian</_language>
-+ <country>
-+ <flag>ee.png</flag>
-+ <_name>Estonia</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Estonian keymap</_name>
-+ <command>gkb_xmmap ee</command>
-+ <_language>Estonian</_language>
-+ <country>
-+ <flag>ee.png</flag>
-+ <_name>Estonia</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Spanish xkb keymap</_name>
-+ <command>setxkbmap es</command>
-+ <_language>Spanish</_language>
-+ <country>
-+ <flag>es.png</flag>
-+ <_name>Spain</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Spanish PC/AT 101 keyboard</_name>
-+ <command>setxkbmap es_x86</command>
-+ <_language>Spanish</_language>
-+ <country>
-+ <flag>es.png</flag>
-+ <_name>Spain</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Spanish keymap</_name>
-+ <command>gkb_xmmap es</command>
-+ <_language>Spanish</_language>
-+ <country>
-+ <flag>es.png</flag>
-+ <_name>Spain</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Finnish xkb keymap</_name>
-+ <command>setxkbmap fi</command>
-+ <_language>Finnish</_language>
-+ <country>
-+ <flag>fi.png</flag>
-+ <_name>Finland</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Finnish keymap</_name>
-+ <command>gkb_xmmap fi</command>
-+ <_language>Finnish</_language>
-+ <country>
-+ <flag>fi.png</flag>
-+ <_name>Finland</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>French Swiss</_name>
-+ <command>gkb_xmmap sf</command>
-+ <_language>French</_language>
-+ <country>
-+ <flag>ch.png</flag>
-+ <_name>Switzerland</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>French-Canadian 105-key</_name>
-+ <command>gkb_xmmap qc-2</command>
-+ <_language>French</_language>
-+ <country>
-+ <flag>qc.png</flag>
-+ <_name>Canada</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>French Swiss keymap</_name>
-+ <command>gkb_xmmap sf</command>
-+ <_language>French</_language>
-+ <country>
-+ <flag>ch.png</flag>
-+ <_name>Switzerland</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>French xkb keymap</_name>
-+ <command>setxkbmap fr</command>
-+ <_language>French</_language>
-+ <country>
-+ <flag>fr.png</flag>
-+ <_name>France</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>French PC/AT 101 keyboard</_name>
-+ <command>setxkbmap fr_x86</command>
-+ <_language>French</_language>
-+ <country>
-+ <flag>fr.png</flag>
-+ <_name>France</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>French keymap</_name>
-+ <command>gkb_xmmap fr</command>
-+ <_language>French</_language>
-+ <country>
-+ <flag>fr.png</flag>
-+ <_name>France</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>GB 102-key</_name>
-+ <command>gkb_xmmap gb-102</command>
-+ <_language>English</_language>
-+ <country>
-+ <flag>uk.png</flag>
-+ <_name>United Kingdom</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>United Kingdom xkb keymap</_name>
-+ <command>setxkbmap gb</command>
-+ <_language>English</_language>
-+ <country>
-+ <flag>uk.png</flag>
-+ <_name>United Kingdom</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>English keymap</_name>
-+ <command>gkb_xmmap gb</command>
-+ <_language>English</_language>
-+ <country>
-+ <flag>uk.png</flag>
-+ <_name>United Kingdom</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>GB 105-key</_name>
-+ <command>gkb_xmmap gb-105</command>
-+ <_language>English</_language>
-+ <country>
-+ <flag>uk.png</flag>
-+ <_name>United Kingdom</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Georgian keymap</_name>
-+ <command>gkb_xmmap ge</command>
-+ <_language>Georgian</_language>
-+ <country>
-+ <flag>ge.png</flag>
-+ <_name>Georgia</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Georgian Latin</_name>
-+ <command>gkb_xmmap ge_la</command>
-+ <_language>Georgian</_language>
-+ <country>
-+ <flag>ge.png</flag>
-+ <_name>Georgia</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Georgian Russian layout</_name>
-+ <command>gkb_xmmap ge_ru</command>
-+ <_language>Georgian</_language>
-+ <country>
-+ <flag>ge.png</flag>
-+ <_name>Georgia</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>German</_name>
-+ <command>gkb_xmmap sg</command>
-+ <_language>German</_language>
-+ <country>
-+ <flag>de.png</flag>
-+ <_name>Germany</_name>
-+ </country>
-+ <country>
-+ <flag>at.png</flag>
-+ <_name>Austria</_name>
-+ </country>
-+ <country>
-+ <flag>ch.png</flag>
-+ <_name>Switzerland</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>German Swiss with Euro</_name>
-+ <command>gkb_xmmap sg</command>
-+ <_language>German</_language>
-+ <country>
-+ <flag>ch.png</flag>
-+ <_name>Switzerland</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Greek xkb keymap</_name>
-+ <command>setxkbmap el</command>
-+ <_language>Greek</_language>
-+ <country>
-+ <flag>gr.png</flag>
-+ <_name>Greece</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Greek keymap</_name>
-+ <command>gkb_xmmap gr</command>
-+ <_language>Greek</_language>
-+ <country>
-+ <flag>gr.png</flag>
-+ <_name>Greece</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Croatian keymap</_name>
-+ <command>setxkbmap hr</command>
-+ <_language>Croatian</_language>
-+ <country>
-+ <flag>hr.png</flag>
-+ <_name>Croatia</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Hungarian latin2 xkb keymap</_name>
-+ <command>setxkbmap hu</command>
-+ <_language>Hungarian</_language>
-+ <country>
-+ <flag>hu.png</flag>
-+ <_name>Hungary</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Hungarian 101-key latin 1</_name>
-+ <command>gkb_xmmap hu-101-lat1</command>
-+ <_language>Hungarian</_language>
-+ <country>
-+ <flag>hu.png</flag>
-+ <_name>Hungary</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Hungarian latin1</_name>
-+ <_language>Hungarian</_language>
-+ <country>
-+ <flag>hu.png</flag>
-+ <_name>Hungary</_name>
-+ </country>
-+ <command>gkb_xmmap hu-lat1</command>
-+ </keymap>
-+ <keymap>
-+ <_name>Hungarian 101-key latin 2</_name>
-+ <command>gkb_xmmap hu-101-lat2</command>
-+ <_language>Hungarian</_language>
-+ <country>
-+ <flag>hu.png</flag>
-+ <_name>Hungary</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Hungarian 105-key latin 2</_name>
-+ <command>gkb_xmmap hu</command>
-+ <_language>Hungarian</_language>
-+ <country>
-+ <flag>hu.png</flag>
-+ <_name>Hungary</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Hungarian 105-key latin 1</_name>
-+ <command>gkb_xmmap hu-lat1</command>
-+ <_language>Hungarian</_language>
-+ <country>
-+ <flag>hu.png</flag>
-+ <_name>Hungary</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Sun (!not PC!) type5 Hungarian latin 2</_name>
-+ <command>gkb_xmmap hu-sun-lat2</command>
-+ <_language>Hungarian</_language>
-+ <country>
-+ <flag>hu.png</flag>
-+ <_name>Hungary</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Hungarian PC/AT 101 keyboard</_name>
-+ <command>gkb_xmmap hu_x86</command>
-+ <_language>Hungarian</_language>
-+ <country>
-+ <flag>hu.png</flag>
-+ <_name>Hungary</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Hebrew xkb keymap</_name>
-+ <command>setxkbmap il</command>
-+ <_language>Hebrew</_language>
-+ <country>
-+ <flag>il.png</flag>
-+ <_name>Israel</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Hebrew keymap</_name>
-+ <command>gkb_xmmap il</command>
-+ <_language>Hebrew</_language>
-+ <country>
-+ <flag>il.png</flag>
-+ <_name>Israel</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Icelandic xkb keymap</_name>
-+ <command>setxkbmap is</command>
-+ <_language>Icelandic</_language>
-+ <country>
-+ <flag>is.png</flag>
-+ <_name>Iceland</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Icelandic keymap</_name>
-+ <command>gkb_xmmap is</command>
-+ <_language>Icelandic</_language>
-+ <country>
-+ <flag>is.png</flag>
-+ <_name>Iceland</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Italian xkb keymap</_name>
-+ <command>setxkbmap it</command>
-+ <_language>Italian</_language>
-+ <country>
-+ <flag>it.png</flag>
-+ <_name>Italy</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Italian keymap</_name>
-+ <command>gkb_xmmap it</command>
-+ <_language>Italian</_language>
-+ <country>
-+ <flag>it.png</flag>
-+ <_name>Italy</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Japanese xkb keymap</_name>
-+ <command>setxkbmap jp</command>
-+ <_language>Japanese</_language>
-+ <country>
-+ <flag>jp.png</flag>
-+ <_name>Japan</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Japanese keymap</_name>
-+ <command>gkb_xmmap jp</command>
-+ <_language>Japanese</_language>
-+ <country>
-+ <flag>jp.png</flag>
-+ <_name>Japan</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Lao keymap</_name>
-+ <command>gkb_xmmap la</command>
-+ <_language>Lao</_language>
-+ <country>
-+ <flag>la.png</flag>
-+ <_name>Laos</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Lithuanian qwerty xkb keymap</_name>
-+ <command>setxkbmap lt</command>
-+ <_language>Lithuanian</_language>
-+ <country>
-+ <flag>lt.png</flag>
-+ <_name>Lithuania</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Lithuanian keymap</_name>
-+ <command>gkb_xmmap lt</command>
-+ <_language>Lithuanian</_language>
-+ <country>
-+ <flag>lt.png</flag>
-+ <_name>Lithuania</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Lithuanian programmers xkb keymap</_name>
-+ <command>setxkbmap lt_p</command>
-+ <_language>Lithuanian</_language>
-+ <country>
-+ <flag>lt.png</flag>
-+ <_name>Lithuania</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Lithuanian standard xkb keymap</_name>
-+ <command>setxkbmap lt_std</command>
-+ <_language>Lithuanian</_language>
-+ <country>
-+ <flag>lt.png</flag>
-+ <_name>Lithuania</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Macedonian</_name>
-+ <command>gkb_xmmap mk</command>
-+ <_language>Macedonian</_language>
-+ <country>
-+ <flag>mk.png</flag>
-+ <_name>Macedonia</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Macedonian xkb keymap</_name>
-+ <command>setxkbmap mk</command>
-+ <_language>Macedonian</_language>
-+ <country>
-+ <flag>mk.png</flag>
-+ <_name>Macedonia</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Dutch keymap</_name>
-+ <command>gkb_xmmap nl</command>
-+ <_language>Dutch</_language>
-+ <country>
-+ <flag>nl.png</flag>
-+ <_name>Netherlands</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Norwegian xkb keymap</_name>
-+ <command>setxkbmap no</command>
-+ <_language>Norwegian</_language>
-+ <country>
-+ <flag>no.png</flag>
-+ <_name>Norway</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Norwegian</_name>
-+ <command>gkb_xmmap no</command>
-+ <_language>Norwegian</_language>
-+ <country>
-+ <flag>no.png</flag>
-+ <_name>Norway</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Polish xkb keymap</_name>
-+ <command>setxkbmap pl</command>
-+ <_language>Polish</_language>
-+ <country>
-+ <flag>pl.png</flag>
-+ <_name>Poland</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Polish deadkeys</_name>
-+ <command>gkb_xmmap pl2</command>
-+ <_language>Polish</_language>
-+ <country>
-+ <flag>pl.png</flag>
-+ <_name>Poland</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Polish</_name>
-+ <command>gkb_xmmap pl</command>
-+ <_language>Polish</_language>
-+ <country>
-+ <flag>pl.png</flag>
-+ <_name>Poland</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Portugal Deadkeys</_name>
-+ <command>gkb_xmmap pt-dead</command>
-+ <_language>Portuglese</_language>
-+ <country>
-+ <flag>pt.png</flag>
-+ <_name>Portugal</_name>
-+ </country>
-+ <country>
-+ <flag>pt.png</flag>
-+ <_name>Brazil</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Portugal</_name>
-+ <command>gkb_xmmap pt</command>
-+ <_language>Portuguese</_language>
-+ <country>
-+ <flag>pt.png</flag>
-+ <_name>Portugal</_name>
-+ </country>
-+ <country>
-+ <flag>pt.png</flag>
-+ <_name>Brazil</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Portuguese xkb keymap</_name>
-+ <command>setxkbmap pt</command>
-+ <_language>Portuguese</_language>
-+ <country>
-+ <flag>pt.png</flag>
-+ <_name>Portugal</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Portuguese keymap</_name>
-+ <command>gkb_xmmap pt</command>
-+ <_language>Portuguese</_language>
-+ <country>
-+ <flag>pt.png</flag>
-+ <_name>Portugal</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Romanian xkb keymap</_name>
-+ <command>setxkbmap ro</command>
-+ <_language>Romanian</_language>
-+ <country>
-+ <flag>ro.png</flag>
-+ <_name>Romania</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Russian xkb keymap</_name>
-+ <command>setxkbmap ru</command>
-+ <_language>Russian</_language>
-+ <country>
-+ <flag>ru.png</flag>
-+ <_name>Russia</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Russian keymap</_name>
-+ <command>gkb_xmmap ru</command>
-+ <_language>Russian</_language>
-+ <country>
-+ <flag>ru.png</flag>
-+ <_name>Russia</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Plain Russian keymap</_name>
-+ <command>gkb_xmmap ru-rev</command>
-+ <_language>Russian</_language>
-+ <country>
-+ <flag>ru.png</flag>
-+ <_name>Russia</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Russian Cyrillic</_name>
-+ <command>gkb_xmmap ru</command>
-+ <_language>Russian</_language>
-+ <country>
-+ <flag>ru.png</flag>
-+ <_name>Russia</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Swedish xkb keymap</_name>
-+ <command>setxkbmap se</command>
-+ <_language>Swedish</_language>
-+ <country>
-+ <flag>se.png</flag>
-+ <_name>Sweden</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Swedish keymap</_name>
-+ <command>gkb_xmmap se</command>
-+ <_language>Swedish</_language>
-+ <country>
-+ <flag>se.png</flag>
-+ <_name>Sweden</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Slovenian xkb keymap</_name>
-+ <command>setxkbmap si</command>
-+ <_language>Slovenian</_language>
-+ <country>
-+ <flag>si.png</flag>
-+ <_name>Slovenia</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Slovenian keymap</_name>
-+ <command>gkb_xmmap si</command>
-+ <_language>Slovenian</_language>
-+ <country>
-+ <flag>si.png</flag>
-+ <_name>Slovenia</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Slovak keymap</_name>
-+ <command>gkb_xmmap sk</command>
-+ <_language>Slovak</_language>
-+ <country>
-+ <flag>sk.png</flag>
-+ <_name>Slovak Republic</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Slovenian</_name>
-+ <command>gkb_xmmap si</command>
-+ <_language>Slovenian</_language>
-+ <country>
-+ <flag>si.png</flag>
-+ <_name>Slovenia</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Serb standard xkb keymap</_name>
-+ <command>setxkbmap sr</command>
-+ <_language>Serb</_language>
-+ <country>
-+ <flag>yu.png</flag>
-+ <_name>Serbia and Montenegro</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Swedish</_name>
-+ <command>gkb_xmmap se</command>
-+ <_language>Swedish</_language>
-+ <country>
-+ <flag>se.png</flag>
-+ <_name>Sweden</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Syriac</_name>
-+ <command>setxkbmap syr</command>
-+ <_language>Syriac</_language>
-+ <country>
-+ <flag>gkb.png</flag>
-+ <_name>Syriac</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Syriac Phonetic</_name>
-+ <command>setxkbmap syr_phonetic</command>
-+ <_language>Syriac</_language>
-+ <country>
-+ <flag>gkb.png</flag>
-+ <_name>Syriac</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Thai</_name>
-+ <command>gkb_xmmap th2</command>
-+ <_language>Thai</_language>
-+ <country>
-+ <flag>th.png</flag>
-+ <_name>Thailand</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Thai Kedmanee</_name>
-+ <command>gkb_xmmap th</command>
-+ <_language>Thai</_language>
-+ <country>
-+ <flag>th.png</flag>
-+ <_name>Thailand</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Thai xkb keymap</_name>
-+ <command>setxkbmap th</command>
-+ <_language>Thai</_language>
-+ <country>
-+ <flag>th.png</flag>
-+ <_name>Thailand</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Thai keymap</_name>
-+ <command>gkb_xmmap th</command>
-+ <_language>Thai</_language>
-+ <country>
-+ <flag>th.png</flag>
-+ <_name>Thailand</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Turkish "F" keyboard</_name>
-+ <command>gkb_xmmap tr_f</command>
-+ <_language>Turkish</_language>
-+ <country>
-+ <flag>tr.png</flag>
-+ <_name>Turkey</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Turkish "Q" keyboard</_name>
-+ <command>gkb_xmmap tr_q</command>
-+ <_language>Turkish</_language>
-+ <country>
-+ <flag>tr.png</flag>
-+ <_name>Turkey</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Turkish xkb keymap</_name>
-+ <command>setxkbmap tr</command>
-+ <_language>Turkish</_language>
-+ <country>
-+ <flag>tr.png</flag>
-+ <_name>Turkey</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Turkish keymap</_name>
-+ <command>gkb_xmmap tr</command>
-+ <_language>Turkish</_language>
-+ <country>
-+ <flag>tr.png</flag>
-+ <_name>Turkey</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Ukrainian xkb keymap</_name>
-+ <command>setxkbmap ua</command>
-+ <_language>Ukrainian</_language>
-+ <country>
-+ <flag>ua.png</flag>
-+ <_name>Ukraine</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>UK 105-key</_name>
-+ <command>gkb_xmmap uk</command>
-+ <_language>English</_language>
-+ <country>
-+ <flag>uk.png</flag>
-+ <_name>United Kingdom</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>UK PC/AT keyboard</_name>
-+ <command>gkb_xmmap uk_x86</command>
-+ <_language>English</_language>
-+ <country>
-+ <flag>uk.png</flag>
-+ <_name>United Kingdom</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>US PC/AT 101 keyboard</_name>
-+ <command>gkb_xmmap us101A_x86</command>
-+ <_language>English</_language>
-+ <country>
-+ <flag>us.png</flag>
-+ <_name>United States</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>US 101-key keyboard</_name>
-+ <command>gkb_xmmap us-101</command>
-+ <_language>English</_language>
-+ <country>
-+ <flag>us.png</flag>
-+ <_name>United States</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>US 84-key</_name>
-+ <command>gkb_xmmap us-84</command>
-+ <_language>English</_language>
-+ <country>
-+ <flag>us.png</flag>
-+ <_name>United States</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>US DEC 450</_name>
-+ <command>gkb_xmmap us-dec</command>
-+ <_language>English</_language>
-+ <country>
-+ <flag>us.png</flag>
-+ <_name>United States</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>US xkb keymap</_name>
-+ <command>setxkbmap us</command>
-+ <_language>English</_language>
-+ <country>
-+ <flag>us.png</flag>
-+ <_name>United States</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>US IBM RS/6000</_name>
-+ <command>gkb_xmmap us-ibm</command>
-+ <_language>English</_language>
-+ <country>
-+ <flag>us.png</flag>
-+ <_name>United States</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>US International xkb keymap</_name>
-+ <command>setxkbmap us_intl</command>
-+ <_language>English</_language>
-+ <country>
-+ <flag>us.png</flag>
-+ <_name>United States</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>US International</_name>
-+ <command>gkb_xmmap us-int</command>
-+ <_language>English</_language>
-+ <country>
-+ <flag>us.png</flag>
-+ <_name>United States</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>US 105-key keyboard (with windows keys)</_name>
-+ <command>gkb_xmmap us</command>
-+ <_language>English</_language>
-+ <country>
-+ <flag>us.png</flag>
-+ <_name>United States</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>US Macintosh</_name>
-+ <command>gkb_xmmap us-mac</command>
-+ <_language>English</_language>
-+ <country>
-+ <flag>us.png</flag>
-+ <_name>United States</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>US Silicon Graphics 101-key</_name>
-+ <command>gkb_xmmap us-sgi-101</command>
-+ <_language>English</_language>
-+ <country>
-+ <flag>us.png</flag>
-+ <_name>United States</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>US Sun type5</_name>
-+ <command>gkb_xmmap us-sun</command>
-+ <_language>English</_language>
-+ <country>
-+ <flag>us.png</flag>
-+ <_name>United States</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Vietnamese xkb keymap</_name>
-+ <command>setxkbmap vn</command>
-+ <_language>Vietnamese</_language>
-+ <country>
-+ <flag>vn.png</flag>
-+ <_name>Vietnam</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Serb keymap</_name>
-+ <command>gkb_xmmap yu</command>
-+ <_language>Serb</_language>
-+ <country>
-+ <flag>yu.png</flag>
-+ <_name>Serbia and Montenegro</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Serb keymap</_name>
-+ <command>gkb_xmmap yu</command>
-+ <_language>Serb</_language>
-+ <country>
-+ <flag>yu.png</flag>
-+ <_name>Serbia and Montenegro</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Mongolian alt keymap</_name>
-+ <command>gkb_xmmap mn</command>
-+ <_language>Mongolian</_language>
-+ <country>
-+ <flag>mn.png</flag>
-+ <_name>Mongolia</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Mongolian phonetic keymap</_name>
-+ <command>gkb_xmmap mn-phone</command>
-+ <_language>Mongolian</_language>
-+ <country>
-+ <flag>mn.png</flag>
-+ <_name>Mongolia</_name>
-+ </country>
-+ </keymap>
-+ <keymap>
-+ <_name>Mongolian keymap</_name>
-+ <command>gkb_xmmap mn-rev</command>
-+ <_language>Mongolian</_language>
-+ <country>
-+ <flag>mn.png</flag>
-+ <_name>Mongolia</_name>
-+ </country>
-+ </keymap>
-+</keymaps>
-diff -urN gnome-applets-2.5.6-orig/gkb-new/gkb.c gnome-applets-2.5.6/gkb-new/gkb.c
---- gnome-applets-2.5.6-orig/gkb-new/gkb.c 2004-03-16 05:01:24.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/gkb.c 2004-03-16 05:29:04.000000000 +0900
-@@ -350,19 +350,19 @@
-
-
- buf = g_strdup_printf ("name_%d",i);
-- actdata->name = gkb_load_pref (gkb, buf, (i?"US 105 key keyboard":"Gnome Keyboard Default"));
-+ actdata->name = gkb_load_pref (gkb, buf, (i?_("US 105 key keyboard"):_("Gnome Keyboard Default")));
- g_free (buf);
-
- buf = g_strdup_printf ("label_%d", i);
-- actdata->label = gkb_load_pref (gkb, buf, (i?"us":"default"));
-+ actdata->label = gkb_load_pref (gkb, buf, (i?"us":_("default")));
- g_free (buf);
-
- buf = g_strdup_printf ("country_%d", i);
-- actdata->country = gkb_load_pref (gkb, buf, (i?"United States":"Gnome Keyboard"));
-+ actdata->country = gkb_load_pref (gkb, buf, (i?_("United States"):_("Gnome Keyboard")));
- g_free (buf);
-
- buf = g_strdup_printf ("lang_%d", i);
-- actdata->lang = gkb_load_pref (gkb, buf, (i?"English":"International"));
-+ actdata->lang = gkb_load_pref (gkb, buf, (i?_("English"):_("International")));
- g_free (buf);
-
- buf = g_strdup_printf ("flag_%d", i);
-diff -urN gnome-applets-2.5.6-orig/gkb-new/preset.c gnome-applets-2.5.6/gkb-new/preset.c
---- gnome-applets-2.5.6-orig/gkb-new/preset.c 2004-03-16 05:01:24.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/preset.c 2004-03-16 05:29:04.000000000 +0900
-@@ -149,7 +149,8 @@
- val->command = g_strdup (tcommand);
-
- val->flag = gnome_config_get_string ("Flag");
-- val->label = gnome_config_get_string ("Label");
-+ val->label = gnome_config_get_translated_string ("Label");
-+ if (val->label == NULL) val->label = g_strdup(_("Undefined"));
-
- val->lang = gnome_config_get_translated_string ("Language");
- if (val->lang == NULL) val->lang = g_strdup(_("Undefined"));
-diff -urN gnome-applets-2.5.6-orig/gkb-new/system.c gnome-applets-2.5.6/gkb-new/system.c
---- gnome-applets-2.5.6-orig/gkb-new/system.c 2004-03-16 05:01:24.000000000 +0900
-+++ gnome-applets-2.5.6/gkb-new/system.c 2004-03-16 05:29:04.000000000 +0900
-@@ -25,6 +25,7 @@
- *
- */
-
-+#include <config.h>
- #include "gkb.h"
-
- /**
-diff -urN gnome-applets-2.5.6-orig/gweather/gweather-dialog.c gnome-applets-2.5.6/gweather/gweather-dialog.c
---- gnome-applets-2.5.6-orig/gweather/gweather-dialog.c 2004-03-16 05:01:25.000000000 +0900
-+++ gnome-applets-2.5.6/gweather/gweather-dialog.c 2004-03-16 05:13:08.000000000 +0900
-@@ -141,7 +141,7 @@
- cond_temp_lbl = gtk_label_new (_("Temperature:"));
- gtk_widget_show (cond_temp_lbl);
- gtk_table_attach (GTK_TABLE (cond_table), cond_temp_lbl, 0, 1, 4, 5,
-- (GtkAttachOptions) (0),
-+ (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (cond_temp_lbl), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (cond_temp_lbl), 0, 0.5);
-@@ -389,7 +389,7 @@
- gw_applet->dialog_pixbuf);
-
- /* Update current condition fields and forecast */
-- gtk_label_set_text(GTK_LABEL(gw_applet->cond_location), weather_info_get_location(gw_applet->gweather_info));
-+ gtk_label_set_text(GTK_LABEL(gw_applet->cond_location), _(weather_info_get_location(gw_applet->gweather_info)));
- gtk_label_set_text(GTK_LABEL(gw_applet->cond_update), weather_info_get_update(gw_applet->gweather_info));
- gtk_label_set_text(GTK_LABEL(gw_applet->cond_cond), weather_info_get_conditions(gw_applet->gweather_info));
- gtk_label_set_text(GTK_LABEL(gw_applet->cond_sky), weather_info_get_sky(gw_applet->gweather_info));
-diff -urN gnome-applets-2.5.6-orig/gweather/gweather-pref.c gnome-applets-2.5.6/gweather/gweather-pref.c
---- gnome-applets-2.5.6-orig/gweather/gweather-pref.c 2004-03-16 05:01:25.000000000 +0900
-+++ gnome-applets-2.5.6/gweather/gweather-pref.c 2004-03-16 05:19:14.000000000 +0900
-@@ -289,7 +289,7 @@
- name = gnome_config_get_string (name_key);
-
- gtk_tree_store_insert (model, ®ion_iter, parent_iter, 0);
-- gtk_tree_store_set (model, ®ion_iter, COL_LOC, name, -1);
-+ gtk_tree_store_set (model, ®ion_iter, COL_LOC, _(name), -1);
-
- subregions_key = g_strconcat (region_key, "/regions", NULL);
- gnome_config_get_vector (subregions_key, &nsubregions, &subregions);
-@@ -318,7 +318,7 @@
- locdata[2],
- locdata[3]);
- gtk_tree_store_insert (model, &loc_iter, ®ion_iter, 0);
-- gtk_tree_store_set (model, &loc_iter, COL_LOC, locdata[0],
-+ gtk_tree_store_set (model, &loc_iter, COL_LOC, _(locdata[0]),
- COL_POINTER, weather_location, -1);
-
- if (gw_applet->gweather_pref.location && weather_location_equal (weather_location, gw_applet->gweather_pref.location)) {
-diff -urN gnome-applets-2.5.6-orig/gweather/weather.c gnome-applets-2.5.6/gweather/weather.c
---- gnome-applets-2.5.6-orig/gweather/weather.c 2004-03-16 05:01:24.000000000 +0900
-+++ gnome-applets-2.5.6/gweather/weather.c 2004-03-16 05:26:35.000000000 +0900
-@@ -51,7 +51,7 @@
-
- #define TEMP_F_TO_C(f) (((f) - 32.0) * 0.555556)
- #define TEMP_C_TO_F(c) (((c) * 1.8) + 32.0)
--#define TEMP_UNIT_STR(units) (((units) == UNITS_IMPERIAL) ? "\302\260 F" : "\302\260 C")
-+#define TEMP_UNIT_STR(units) (((units) == UNITS_IMPERIAL) ? _("F") : _("C"))
-
- #define WINDSPEED_KNOTS_TO_KPH(knots) ((knots) * 1.851965)
- #define WINDSPEED_KPH_TO_KNOTS(kph) ((kph) * 0.539967)
-@@ -1923,6 +1923,8 @@
- const gchar *weather_info_get_update (WeatherInfo *info)
- {
- static gchar buf[200];
-+ static gchar *native_format;
-+ static gchar *utf8_time;
-
- g_return_val_if_fail(info != NULL, NULL);
-
-@@ -1932,9 +1934,16 @@
- if (info->update != 0) {
- struct tm *tm;
- tm = localtime(&info->update);
-- if (strftime(buf, sizeof(buf), _("%a, %b %d / %H:%M"), tm) <= 0)
-+ native_format = g_locale_from_utf8 (_("%a, %b %d / %H:%M"), -1, NULL, NULL, NULL);
-+ if (strftime(buf, sizeof(buf), native_format, tm) <= 0)
- strcpy (buf, "???");
- buf[sizeof(buf)-1] = '\0';
-+
-+ utf8_time = g_locale_to_utf8 (buf, -1, NULL, NULL, NULL);
-+ g_utf8_strncpy (buf, utf8_time, g_utf8_strlen(utf8_time, -1));
-+
-+ g_free (native_format);
-+ g_free (utf8_time);
- } else {
- strncpy(buf, _("Unknown observation time"), sizeof (buf));
- buf[sizeof(buf)-1] = '\0';
-@@ -1969,7 +1978,7 @@
- return "-";
- if (info->temp < -500.0)
- return _("Unknown");
-- g_snprintf(buf, sizeof (buf), "%.1f%s", info->temp, TEMP_UNIT_STR(info->units));
-+ g_snprintf(buf, sizeof (buf), "%.1f %s", info->temp, TEMP_UNIT_STR(info->units));
- return buf;
- }
-
-@@ -1981,7 +1990,7 @@
- return "-";
- if (info->dew < -500.0)
- return _("Unknown");
-- g_snprintf(buf, sizeof (buf), "%.1f%s", info->dew, TEMP_UNIT_STR(info->units));
-+ g_snprintf(buf, sizeof (buf), "%.1f %s", info->dew, TEMP_UNIT_STR(info->units));
- return buf;
- }
-
-@@ -2062,13 +2071,13 @@
- return "--";
-
- if (!info->applet)
-- degree = "F";
-+ degree = _("F");
- else if (info->applet->gweather_pref.use_metric)
-- degree = "C";
-+ degree = _("C");
- else
-- degree = "F";
-+ degree = _("F");
-
-- g_snprintf(buf, sizeof (buf), "%d\302\260%s",
-+ g_snprintf(buf, sizeof (buf), "%d %s",
- (int)floor(info->temp + 0.5), degree);
-
- return buf;
-@@ -2083,7 +2092,7 @@
- buf = weather_info_get_conditions(info);
- if (!strcmp(buf, "-"))
- buf = weather_info_get_sky(info);
-- return g_strdup_printf ("%s: %s", weather_info_get_location (info), buf);
-+ return g_strdup_printf ("%s: %s", _(weather_info_get_location (info)), buf);
- }
-
-
--- a/patches/gnome-applets-09-non_portable_CFLAGS.diff Tue Mar 16 03:30:33 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- ../gnome-applets-2.5.6.old/stickynotes/Makefile.am 2004-02-23 14:18:27.000000000 +0000
-+++ ./stickynotes/Makefile.am 2004-02-23 14:18:49.000000000 +0000
-@@ -2,8 +2,6 @@
-
- SUBDIRS = pixmaps docs
-
--CFLAGS = -Wall -g
--
- INCLUDES = \
- -I. \
- -I$(srcdir) \
-
--- a/patches/gnome-applets-10-g11n-schemas.diff Tue Mar 16 03:30:33 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-diff -urN gnome-applets-2.5.6-orig/gswitchit/gswitchit.schemas.in gnome-applets-2.5.6/gswitchit/gswitchit.schemas.in
---- gnome-applets-2.5.6-orig/gswitchit/gswitchit.schemas.in 1970-01-01 09:00:00.000000000 +0900
-+++ gnome-applets-2.5.6/gswitchit/gswitchit.schemas.in 2004-03-16 08:54:39.000000000 +0900
-@@ -0,0 +1,100 @@
-+<gconfschemafile>
-+ <schemalist>
-+ <schema>
-+ <key>/schemas/apps/gswitchit/Applet/secondary</key>
-+ <applyto>/apps/gswitchit/Applet/secondary</applyto>
-+ <owner>gswitchit</owner>
-+ <type>int</type>
-+ <default>0</default>
-+ <locale name="C">
-+ <short>Secondary groups</short>
-+ <long>Secondary groups</long>
-+ </locale>
-+ </schema>
-+
-+ <schema>
-+ <key>/schemas/apps/gswitchit/Applet/debugLevel</key>
-+ <applyto>/apps/gswitchit/Applet/debugLevel</applyto>
-+ <owner>gswitchit</owner>
-+ <type>int</type>
-+ <default>0</default>
-+ <locale name="C">
-+ <short>Debug level</short>
-+ <long>Debug level</long>
-+ </locale>
-+ </schema>
-+
-+ <schema>
-+ <key>/schemas/apps/gswitchit/Applet/beep</key>
-+ <applyto>/apps/gswitchit/Applet/beep</applyto>
-+ <owner>gswitchit</owner>
-+ <type>bool</type>
-+ <default>false</default>
-+ <locale name="C">
-+ <short>Beep on group switch</short>
-+ <long>Beep on group switch</long>
-+ </locale>
-+ </schema>
-+
-+ <schema>
-+ <key>/schemas/apps/gswitchit/Applet/groupPerWindow</key>
-+ <applyto>/apps/gswitchit/Applet/groupPerWindow</applyto>
-+ <owner>gswitchit</owner>
-+ <type>bool</type>
-+ <default>true</default>
-+ <locale name="C">
-+ <short>Keep and manage separate group per window</short>
-+ <long>Keep and manage separate group per window</long>
-+ </locale>
-+ </schema>
-+
-+ <schema>
-+ <key>/schemas/apps/gswitchit/Applet/handleIndicators</key>
-+ <applyto>/apps/gswitchit/Applet/handleIndicators</applyto>
-+ <owner>gswitchit</owner>
-+ <type>bool</type>
-+ <default>false</default>
-+ <locale name="C">
-+ <short>Save/restore indicators together with layout groups</short>
-+ <long>Save/restore indicators together with layout groups</long>
-+ </locale>
-+ </schema>
-+
-+ <schema>
-+ <key>/schemas/apps/gswitchit/Applet/layoutNamesAsGroupNames</key>
-+ <applyto>/apps/gswitchit/Applet/layoutNamesAsGroupNames</applyto>
-+ <owner>gswitchit</owner>
-+ <type>bool</type>
-+ <default>true</default>
-+ <locale name="C">
-+ <short>Show layout names instead of group names</short>
-+ <long>Show layout names instead of group names (only for versions of XFree supporting multiple layouts)</long>
-+ </locale>
-+ </schema>
-+
-+ <schema>
-+ <key>/schemas/apps/gswitchit/Applet/showFlags</key>
-+ <applyto>/apps/gswitchit/Applet/showFlags</applyto>
-+ <owner>gswitchit</owner>
-+ <type>bool</type>
-+ <default>false</default>
-+ <locale name="C">
-+ <short>Show flags in the applet</short>
-+ <long>Show flags in the applet to indicate the current layout</long>
-+ </locale>
-+ </schema>
-+
-+ <schema>
-+ <key>/schemas/apps/gswitchit/Applet/defaultGroup</key>
-+ <applyto>/apps/gswitchit/Applet/defaultGroup</applyto>
-+ <owner>gswitchit</owner>
-+ <type>int</type>
-+ <default>-1</default>
-+ <locale name="C">
-+ <short>Default group, assigned on window creation</short>
-+ <long>Default group, assigned on window creation</long>
-+ </locale>
-+ </schema>
-+
-+ </schemalist>
-+</gconfschemafile>