clean up languages and corrected few languages

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2499 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/RetroShare.pro

@@ -437,8 +437,8 @@ TRANSLATIONS +=  \
             lang/retroshare_af.ts  \
             lang/retroshare_gr.ts  \
             lang/retroshare_it.ts  \
-            lang/retroshare_jp.ts  \
-            lang/retroshare_kr.ts  \
+            lang/retroshare_ja.ts  \
+            lang/retroshare_ko.ts  \
             lang/retroshare_pl.ts  \
             lang/retroshare_pt.ts  \
             lang/retroshare_ru.ts  \

retroshare-gui/src/gui/images.qrc

@@ -151,8 +151,8 @@
         <file>images/emoticons/kopete/kopete020.png</file>
         <file>images/flags/af.png</file>
         <file>images/flags/cn.png</file>
-        <file>images/flags/cn_simp.png</file>
-        <file>images/flags/cn_trad.png</file>
+        <file>images/flags/zh_CN.png</file>
+        <file>images/flags/zh_TW.png</file>
         <file>images/flags/de.png</file>
         <file>images/flags/dk.png</file>
         <file>images/flags/en.png</file>
@@ -161,7 +161,7 @@
         <file>images/flags/fr.png</file>
         <file>images/flags/gr.png</file>
         <file>images/flags/it.png</file>
-        <file>images/flags/jp.png</file>
+        <file>images/flags/ja.png</file>
         <file>images/flags/kr.png</file>
         <file>images/flags/pl.png</file>
         <file>images/flags/pt.png</file>

retroshare-gui/src/lang/lang.qrc

@@ -1,22 +1,23 @@
 <RCC>
   <qresource prefix="/lang">
+    <file alias="af">retroshare_af.qm</file>
+    <file alias="bg">retroshare_bg.qm</file>
     <file alias="en">retroshare_en.qm</file>
+    <file alias="da">retroshare_da.qm</file>
     <file alias="de">retroshare_de.qm</file>
     <file alias="es">retroshare_es.qm</file>
     <file alias="fi">retroshare_fi.qm</file>
     <file alias="fr">retroshare_fr.qm</file>
-    <file alias="ru">retroshare_ru.qm</file>
-    <file alias="af">retroshare_af.qm</file>
+    <file alias="cy">retroshare_cy.qm</file>
     <file alias="gr">retroshare_gr.qm</file>
     <file alias="it">retroshare_it.qm</file>
-    <file alias="jp">retroshare_jp.qm</file>
-    <file alias="kr">retroshare_kr.qm</file>
+    <file alias="ja">retroshare_ja.qm</file>
+    <file alias="ko">retroshare_ko.qm</file>
     <file alias="pl">retroshare_pl.qm</file>
     <file alias="pt">retroshare_pt.qm</file>
-    <file alias="tk">retroshare_tr.qm</file>
+    <file alias="ru">retroshare_ru.qm</file>
+    <file alias="tr">retroshare_tr.qm</file>
     <file alias="sl">retroshare_sl.qm</file>
-    <file alias="da">retroshare_da.qm</file>
-    <file alias="bg">retroshare_bg.qm</file>
     <file alias="sr">retroshare_sr.qm</file>
     <file alias="sv">retroshare_sv.qm</file>
     <file alias="zh_CN">retroshare_zh_CN.qm</file>

retroshare-gui/src/lang/languagesupport.cpp

@@ -34,32 +34,28 @@ void
 LanguageSupport::initialize()
 {
   _languages.clear();
-  _languages.insert("en",    "English");
-  _languages.insert("de",    "Deutsch");
   _languages.insert("af",    "Afrikaans");
-  _languages.insert("da",    "Danish");
+  _languages.insert("bg",    "Bulgarien");
   _languages.insert("cy",    "Welsh");
-  _languages.insert("fr",    
-    QString::fromUtf8("Fran\303\247ais"));
+  _languages.insert("de",    "Deutsch");
+  _languages.insert("da",    "Danish");
+  _languages.insert("en",    "English");
+  _languages.insert("es",    QString::fromUtf8("spanish"));
+  _languages.insert("fr",    QString::fromUtf8("Fran\303\247ais"));
+  _languages.insert("fi",    "suomi");
   _languages.insert("gr",    "Greek");
   _languages.insert("it",    "Italiano");
-  _languages.insert("jp",    "Japanese");
-  _languages.insert("kr",    "Korean");
+  _languages.insert("ja",    QString::fromUtf8("\346\227\245\346\234\254\350\252\236"));
+  _languages.insert("ko",    "Korean");
   _languages.insert("pl",    "Polish");
   _languages.insert("pt",    "Portuguese");
-  _languages.insert("ru",
-    QString::fromUtf8("\320\240\321\203\321\201\321\201\320\272\320\270\320\271"));
-  _languages.insert("es",    
-    QString::fromUtf8("spanish"));
+  _languages.insert("ru",    QString::fromUtf8("\320\240\321\203\321\201\321\201\320\272\320\270\320\271"));
   _languages.insert("sl",    "slovenian");
   _languages.insert("sr",    "Serbian");
   _languages.insert("sv",    "svenska");     
   _languages.insert("tr",    QString::fromUtf8("T\303\274rk\303\247e"));
-  _languages.insert("fi",    "suomi");
-  _languages.insert("zh_CN", 
-      QString::fromUtf8("\347\256\200\344\275\223\345\255\227"));
-  _languages.insert("zh_TW", 
-      QString::fromUtf8("\347\260\241\351\253\224\345\255\227"));
+  _languages.insert("zh_CN", QString::fromUtf8("\347\256\200\344\275\223\345\255\227"));
+  _languages.insert("zh_TW", QString::fromUtf8("\347\260\241\351\253\224\345\255\227"));
 
 }