3 files changed, 157 insertions, 49 deletions
diff --git a/kkbswitch/group_names b/kkbswitch/group_names
index 2c3d40d..98789a7 100644
--- a/kkbswitch/group_names
+++ b/kkbswitch/group_names
@@ -1,44 +1,156 @@
 [Mapping]
-US/ASCII=us
-Belgian=be
-Bulgarian=bg
-Canadian=ca
-Czech=cz
-Danish=dk
-Finnish=fi
-French=fr
-Georgian=ge
-German=de
-Great Britain=gb
-Greek=gr
-Hungarian=hu
-Icelandic=is
-ISO8859-7=gr
-Israelian=il
-Italian=it
-Latvian=lv
-Lithuanian=lt
-Macedonian=mk
-Norwegian=no
-Polish=pl
-Portugese=pt
-Russian=ru
-Slovak=sk
-Spanish=es
-Swedish=se
-Swiss French=ch
-Swiss German=ch
-Thai=th
-Ukrainian=ua
-Vietnamese=vn
+Afghanistan=af
+Albania=al
+Andorra=ad
+Armenia=am
+Azerbaijan=az
+Bangladesh=bd
+Belarus=by
+Belgium=be
+Bhutan=bt
+Bosnia and Herzegovina=ba
+Brazil=br
+Bulgaria=bg
+Cambodia=kh
+Canada=ca
+China=cn
+Congo, Democratic Republic of the=cd
+Croatia=hr
+Czechia=cz
+Denmark=dk
+Esperanto=epo
+Estonia=ee
+Ethiopia=et
+Faroe Islands=fo
+Finland=fi
+France=fr
+Georgia=ge
+Germany=de
+Ghana=gh
+Greece=gr
+Guinea=gn
+Hungary=hu
+Iceland=is
+India=in
+Iran=ir
+Iraq=iq
+Ireland=ie
+Israel=il
+Italy=it
+Japan=jp
+Kazakhstan=kz
+Korea, Republic of=kr
+Kyrgyzstan=kg
+Laos=la
+Latvia=lv
+Lithuania=lt
+Macedonia=mk
+Maldives=mv
+Malta=mt
+Maori=mao
+Mongolia=mn
+Montenegro=me
+Morocco=ma
+Myanmar=mm
+Nepal=np
+Netherlands=nl
+Nigeria=ng
+Norway=no
+Pakistan=pk
+Poland=pl
+Portugal=pt
+Romania=ro
+Russia=ru
+Serbia=rs
+Slovakia=sk
+Slovenia=si
+South Africa=za
+Spain=es
+Sri Lanka=lk
+Sweden=se
+Switzerland=ch
+Syria=sy
+Tajikistan=tj
+Thailand=th
+Turkey=tr
+Ukraine=ua
+United Kingdom=gb
+USA=us
+Uzbekistan=uz
+Vietnam=vn
 
 [Languages]
-US/ASCII=en
-Canadian=en
-Great Britain=en
-Greek=el
-ISO8859-7=el
-Israelian=he
-Swiss French=fr
-Swiss German=de
-Ukrainian=uk
+Afghanistan=af
+Albania=
+Andorra=
+Armenia=hy
+Azerbaijan=az
+Bangladesh=
+Belarus=
+Belgium=
+Bhutan=dz
+Bosnia and Herzegovina=
+Brazil=pt
+Bulgaria=bg
+Cambodia=km
+Canada=en
+Congo, Democratic Republic of the=fr
+Croatia=hr
+Czechia=cs
+Denmark=da
+Esperanto=epo
+Estonia=et
+Faroe Islands=
+Finland=fi
+France=fr
+Georgia=ka
+Germany=de
+Ghana=
+Greece=el
+Hungary=hu
+Iceland=
+India=hi
+Iran=fa
+Iraq=ar
+Ireland=
+Israel=he
+Italy=it
+Japan=ja
+Kazakhstan=
+Korea, Republic of=ko
+Kyrgyzstan=ru
+Laos=
+Latvia=lv
+Lithuania=lt
+Macedonia=mk
+Maldives=
+Malta=
+Maori=
+Mongolia=mn
+Myanmar=
+Nepal=
+Netherlands=
+Nigeria=
+Norway=
+Pakistan=
+Poland=pl
+Portugal=pt
+Romania=ro
+Russia=ru
+Serbia and Montenegro=sr
+Slovakia=sk
+Slovenia=sl
+South Africa=
+Spain=es
+Sri Lanka=
+Sweden=sv
+Switzerland=
+Syria=ar
+Tajikistan=
+Thailand=th
+Turkey=tr
+Ukraine=uk
+United Kingdom=en
+U.S. English=en
+Uzbekistan=uz
+Vietnam=vi
diff --git a/kkbswitch/kbconfigdlg.cpp b/kkbswitch/kbconfigdlg.cpp
index 0b599c1..6f583b3 100644
--- a/kkbswitch/kbconfigdlg.cpp
+++ b/kkbswitch/kbconfigdlg.cpp
@@ -153,7 +153,7 @@ void KBConfigDlg::setupGeneralPage()
   btnSetDefaultGroup = new QPushButton(i18n("&Set as Default"), page);
   QObject::connect(btnSetDefaultGroup, SIGNAL(clicked()), this, SLOT(slotSetDefaultGroup()));
   btnLayout->addWidget(btnSetDefaultGroup, 0, Qt::AlignTop);
-  QWhatsThis::add(btnSetDefaultGroup, i18n("Cick this button to set the layout selected "
+  QWhatsThis::add(btnSetDefaultGroup, i18n("Click this button to set the layout selected "
     "in the list box to the left as the default"));
 
   btnLayout->addItem(new QSpacerItem(1, 1, QSizePolicy::Minimum,
@@ -173,7 +173,7 @@ void KBConfigDlg::setupGeneralPage()
   QWhatsThis::add(cbxIconType, i18n("<p>Select the style of icons representing the "
     "current keyboard layout.\n"
     "You can choose from the following styles:"
-    "<ul><li><b>Country flag</b> - displays the corresponding contry flag"
+    "<ul><li><b>Country flag</b> - displays the corresponding country flag"
     "<li><b>Language code</b> - displays the language ISO 2-letter code"
     "<li><b>Flag and code</b> - displays the language code superimposed over the country flag."
     "</ul></p>"));
diff --git a/kkbswitch/kkbswitch.desktop b/kkbswitch/kkbswitch.desktop
index 1eab574..b279abf 100644
--- a/kkbswitch/kkbswitch.desktop
+++ b/kkbswitch/kkbswitch.desktop
@@ -1,19 +1,15 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Application
 Name=KKBSwitch
 Exec=kkbswitch -caption "%c" %i %m 
-MimeTypes=
 Terminal=false
-Icon=keyboard_layout.png
-MiniIcon=keyboard_layout.png
+Icon=kkbswitch.xpm
 DocPath=kkbswitch/index.html
 Comment=Keyboard Layout Indicator
 Comment[ru]=Индикатор раскладки клавиатуры
 Comment[uk]=Індикатор розкладки клавіатури
-Terminal=0
 X-KDE-autostart-after=panel
 X-KDE-autostart-condition=kkbswitchrc:Options:autostart:true
 X-KDE-autostart-phase=2
 X-KDE-StartupNotify=false
-Categories=Qt;KDE;Utility;TrayIcon;
+Categories=Qt;KDE;Utility;