OSDN Git Service

Fix GitHub issue #405: Some improvements
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 15 Aug 2020 06:58:55 +0000 (15:58 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 15 Aug 2020 06:58:55 +0000 (15:58 +0900)
43 files changed:
Externals/crystaledit/editlib/dialogs/ceditreplacedlg.cpp
Src/DirColsDlg.cpp
Src/DirView.cpp
Src/DirView.h
Src/DirViewColItems.cpp
Src/Merge.rc
Src/charsets.c
Translations/WinMerge/Arabic.po
Translations/WinMerge/Basque.po
Translations/WinMerge/Brazilian.po
Translations/WinMerge/Bulgarian.po
Translations/WinMerge/Catalan.po
Translations/WinMerge/ChineseSimplified.po
Translations/WinMerge/ChineseTraditional.po
Translations/WinMerge/Croatian.po
Translations/WinMerge/Czech.po
Translations/WinMerge/Danish.po
Translations/WinMerge/Dutch.po
Translations/WinMerge/English.pot
Translations/WinMerge/Finnish.po
Translations/WinMerge/French.po
Translations/WinMerge/Galician.po
Translations/WinMerge/German.po
Translations/WinMerge/Greek.po
Translations/WinMerge/Hungarian.po
Translations/WinMerge/Italian.po
Translations/WinMerge/Japanese.po
Translations/WinMerge/Korean.po
Translations/WinMerge/Lithuanian.po
Translations/WinMerge/Norwegian.po
Translations/WinMerge/Persian.po
Translations/WinMerge/Polish.po
Translations/WinMerge/Portuguese.po
Translations/WinMerge/Romanian.po
Translations/WinMerge/Russian.po
Translations/WinMerge/Serbian.po
Translations/WinMerge/Sinhala.po
Translations/WinMerge/Slovak.po
Translations/WinMerge/Slovenian.po
Translations/WinMerge/Spanish.po
Translations/WinMerge/Swedish.po
Translations/WinMerge/Turkish.po
Translations/WinMerge/Ukrainian.po

index a120e1b..8f692ac 100644 (file)
@@ -518,10 +518,9 @@ OnRegExp ()
 void CEditReplaceDlg::
 UpdateControls()
 {
-  GetDlgItem(IDC_EDIT_SKIP)->EnableWindow( !m_sText.IsEmpty() );
-  GetDlgItem(IDC_EDIT_REPLACE)->EnableWindow( !m_sText.IsEmpty() );
-  GetDlgItem(IDC_EDIT_REPLACE_ALL)->EnableWindow( !m_sText.IsEmpty() );
-  
+  for (auto id: {IDC_EDIT_FINDPREV, IDC_EDIT_SKIP, IDC_EDIT_REPLACE, IDC_EDIT_REPLACE_ALL})
+    GetDlgItem(id)->EnableWindow( !m_sText.IsEmpty() );
   UpdateRegExp();
 }
 
index db91680..9adda03 100644 (file)
@@ -62,7 +62,7 @@ void CDirColsDlg::InitList()
        // Show selection across entire row.
        // Also enable infotips.
        m_listColumns.SetExtendedStyle(LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP);
-       m_listColumns.InsertColumn(0, _T(""), LVCFMT_LEFT, pointToPixel(112));
+       m_listColumns.InsertColumn(0, _T(""), LVCFMT_LEFT, pointToPixel(148));
 }
 
 /**
index c1350bd..fd6f8a1 100644 (file)
@@ -233,11 +233,11 @@ BEGIN_MESSAGE_MAP(CDirView, CListView)
        ON_COMMAND(ID_DIR_COPY_PATHNAMES_RIGHT, OnCopyPathnames<SIDE_RIGHT>)
        ON_COMMAND(ID_DIR_COPY_PATHNAMES_BOTH, OnCopyBothPathnames)
        ON_COMMAND(ID_DIR_COPY_PATHNAMES_ALL, OnCopyBothPathnames)
-       ON_UPDATE_COMMAND_UI(ID_DIR_COPY_PATHNAMES_LEFT, OnUpdateCtxtDirCopyTo<SIDE_LEFT>)
-       ON_UPDATE_COMMAND_UI(ID_DIR_COPY_PATHNAMES_MIDDLE, OnUpdateCtxtDirCopyTo<SIDE_MIDDLE>)
-       ON_UPDATE_COMMAND_UI(ID_DIR_COPY_PATHNAMES_RIGHT, OnUpdateCtxtDirCopyTo<SIDE_RIGHT>)
-       ON_UPDATE_COMMAND_UI(ID_DIR_COPY_PATHNAMES_BOTH, OnUpdateCtxtDirCopyBothTo)
-       ON_UPDATE_COMMAND_UI(ID_DIR_COPY_PATHNAMES_ALL, OnUpdateCtxtDirCopyBothTo)
+       ON_UPDATE_COMMAND_UI(ID_DIR_COPY_PATHNAMES_LEFT, OnUpdateCtxtDirCopy2<SIDE_LEFT>)
+       ON_UPDATE_COMMAND_UI(ID_DIR_COPY_PATHNAMES_MIDDLE, OnUpdateCtxtDirCopy2<SIDE_MIDDLE>)
+       ON_UPDATE_COMMAND_UI(ID_DIR_COPY_PATHNAMES_RIGHT, OnUpdateCtxtDirCopy2<SIDE_RIGHT>)
+       ON_UPDATE_COMMAND_UI(ID_DIR_COPY_PATHNAMES_BOTH, OnUpdateCtxtDirCopyBoth2)
+       ON_UPDATE_COMMAND_UI(ID_DIR_COPY_PATHNAMES_ALL, OnUpdateCtxtDirCopyBoth2)
        ON_COMMAND(ID_DIR_COPY_FILENAMES, OnCopyFilenames)
        ON_UPDATE_COMMAND_UI(ID_DIR_COPY_FILENAMES, OnUpdateCopyFilenames)
        ON_COMMAND(ID_DIR_COPY_LEFT_TO_CLIPBOARD, OnCopyToClipboard<SIDE_LEFT>)
@@ -245,11 +245,11 @@ BEGIN_MESSAGE_MAP(CDirView, CListView)
        ON_COMMAND(ID_DIR_COPY_RIGHT_TO_CLIPBOARD, OnCopyToClipboard<SIDE_RIGHT>)
        ON_COMMAND(ID_DIR_COPY_BOTH_TO_CLIPBOARD, OnCopyBothToClipboard)
        ON_COMMAND(ID_DIR_COPY_ALL_TO_CLIPBOARD, OnCopyBothToClipboard)
-       ON_UPDATE_COMMAND_UI(ID_DIR_COPY_LEFT_TO_CLIPBOARD, OnUpdateCtxtDirCopyTo<SIDE_LEFT>)
-       ON_UPDATE_COMMAND_UI(ID_DIR_COPY_MIDDLE_TO_CLIPBOARD, OnUpdateCtxtDirCopyTo<SIDE_MIDDLE>)
-       ON_UPDATE_COMMAND_UI(ID_DIR_COPY_RIGHT_TO_CLIPBOARD, OnUpdateCtxtDirCopyTo<SIDE_RIGHT>)
-       ON_UPDATE_COMMAND_UI(ID_DIR_COPY_BOTH_TO_CLIPBOARD, OnUpdateCtxtDirCopyBothTo)
-       ON_UPDATE_COMMAND_UI(ID_DIR_COPY_ALL_TO_CLIPBOARD, OnUpdateCtxtDirCopyBothTo)
+       ON_UPDATE_COMMAND_UI(ID_DIR_COPY_LEFT_TO_CLIPBOARD, OnUpdateCtxtDirCopy2<SIDE_LEFT>)
+       ON_UPDATE_COMMAND_UI(ID_DIR_COPY_MIDDLE_TO_CLIPBOARD, OnUpdateCtxtDirCopy2<SIDE_MIDDLE>)
+       ON_UPDATE_COMMAND_UI(ID_DIR_COPY_RIGHT_TO_CLIPBOARD, OnUpdateCtxtDirCopy2<SIDE_RIGHT>)
+       ON_UPDATE_COMMAND_UI(ID_DIR_COPY_BOTH_TO_CLIPBOARD, OnUpdateCtxtDirCopyBoth2)
+       ON_UPDATE_COMMAND_UI(ID_DIR_COPY_ALL_TO_CLIPBOARD, OnUpdateCtxtDirCopyBoth2)
        ON_COMMAND(ID_DIR_ITEM_RENAME, OnItemRename)
        ON_UPDATE_COMMAND_UI(ID_DIR_ITEM_RENAME, OnUpdateItemRename)
        ON_COMMAND(ID_DIR_HIDE_FILENAMES, OnHideFilenames)
@@ -1353,7 +1353,7 @@ void CDirView::Open(const PathContext& paths, DWORD dwFlags[3], PackingInfo * in
                // Open identical and different files
                FileLocation fileloc[3];
                String strDesc[3];
-               const String sUntitled[] = { _("Untitled left"), paths.GetSize() < 3 ? _("Untitled right") : _("untitled middle"), _("Untitled right") };
+               const String sUntitled[] = { _("Untitled left"), paths.GetSize() < 3 ? _("Untitled right") : _("Untitled middle"), _("Untitled right") };
                for (int i = 0; i < paths.GetSize(); ++i)
                {
                        if (paths::DoesPathExist(paths[i]) == paths::DOES_NOT_EXIST)
@@ -1578,6 +1578,24 @@ void CDirView::OnUpdateCtxtDirCopyBothDiffsOnlyTo(CCmdUI* pCmdUI)
 }
        
 /**
+ * @brief Update "Copy | Left/Right/Both " item
+ */
+template<SIDE_TYPE stype>
+void CDirView::OnUpdateCtxtDirCopy2(CCmdUI* pCmdUI)
+{
+       Counts counts = Count(&DirActions::IsItemCopyableToOn<stype>);
+       pCmdUI->Enable(counts.count > 0);
+       pCmdUI->SetText(FormatMenuItemString(stype, counts.count, counts.total).c_str());
+}
+
+void CDirView::OnUpdateCtxtDirCopyBoth2(CCmdUI* pCmdUI)
+{
+       Counts counts = Count(&DirActions::IsItemCopyableBothToOn);
+       pCmdUI->Enable(counts.count > 0);
+       pCmdUI->SetText(FormatMenuItemStringAll(GetDocument()->m_nDirs, counts.count, counts.total).c_str());
+}
+
+/**
  * @brief Get keydata associated with item in given index.
  * @param [in] idx Item's index to list in UI.
  * @return Key for item in given index.
index 7f038d0..83cc0da 100644 (file)
@@ -251,6 +251,9 @@ protected:
        afx_msg void OnUpdateCtxtDirCopyTo(CCmdUI* pCmdUI);
        afx_msg void OnUpdateCtxtDirCopyBothTo(CCmdUI* pCmdUI);
        afx_msg void OnUpdateCtxtDirCopyBothDiffsOnlyTo(CCmdUI* pCmdUI);
+       template<SIDE_TYPE stype>
+       afx_msg void OnUpdateCtxtDirCopy2(CCmdUI* pCmdUI);
+       afx_msg void OnUpdateCtxtDirCopyBoth2(CCmdUI* pCmdUI);
        afx_msg void OnDestroy();
        afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
        afx_msg void OnClick(NMHDR* pNMHDR, LRESULT* pResult);
index f609cd2..c8a86bb 100644 (file)
@@ -82,9 +82,9 @@ const char *COLDESC_RESULT_ABBR = N_("Short comparison result.");
 const char *COLDESC_LATTRIBUTES = N_("Left side attributes.");
 const char *COLDESC_RATTRIBUTES = N_("Right side attributes.");
 const char *COLDESC_MATTRIBUTES = N_("Middle side attributes.");
-const char *COLDESC_LEOL_TYPE   = N_("Left side file EOL type");
-const char *COLDESC_REOL_TYPE   = N_("Right side file EOL type");
-const char *COLDESC_MEOL_TYPE   = N_("Middle side file EOL type");
+const char *COLDESC_LEOL_TYPE   = N_("Left side file EOL type.");
+const char *COLDESC_REOL_TYPE   = N_("Right side file EOL type.");
+const char *COLDESC_MEOL_TYPE   = N_("Middle side file EOL type.");
 const char *COLDESC_LENCODING   = N_("Left side encoding.");
 const char *COLDESC_RENCODING   = N_("Right side encoding.");
 const char *COLDESC_MENCODING   = N_("Middle side encoding.");
index 8ad8e31..5c305a2 100644 (file)
@@ -1257,18 +1257,18 @@ BEGIN
     EDITTEXT        IDC_STATIC_TITLE_PANE2,326,2,0,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP\r
 END\r
 \r
-IDD_DIRCOLS DIALOGEX 0, 0, 307, 163\r
+IDD_DIRCOLS DIALOGEX 0, 0, 331, 163\r
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Display Columns"\r
 FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
 BEGIN\r
-    CONTROL         "",IDC_COLDLG_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,134,124\r
-    PUSHBUTTON      "Move &Up",IDC_UP,151,8,55,14\r
-    PUSHBUTTON      "Move &Down",IDC_DOWN,151,26,55,14\r
-    EDITTEXT        IDC_COLDLG_DESC,151,80,145,50,ES_MULTILINE | ES_READONLY\r
+    CONTROL         "",IDC_COLDLG_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,158,124\r
+    PUSHBUTTON      "Move &Up",IDC_UP,175,8,55,14\r
+    PUSHBUTTON      "Move &Down",IDC_DOWN,175,26,55,14\r
+    EDITTEXT        IDC_COLDLG_DESC,175,80,145,50,ES_MULTILINE | ES_READONLY\r
     PUSHBUTTON      "Defaults",IDC_COLDLG_DEFAULTS,7,143,70,14\r
-    DEFPUSHBUTTON   "OK",IDOK,197,143,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,251,143,50,14\r
+    DEFPUSHBUTTON   "OK",IDOK,221,143,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,275,143,50,14\r
 END\r
 \r
 IDD_SELECTUNPACKER DIALOGEX 0, 0, 318, 102\r
@@ -1666,7 +1666,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 CAPTION "Test Filter"\r
 FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
 BEGIN\r
-    LTEXT           "Testing filter...",IDC_HEADER,7,7,90,10\r
+    LTEXT           "Testing filter:",IDC_HEADER,7,7,90,10\r
     LTEXT           "(filter name)",IDC_HEADER_FILTER_NAME,100,6,142,10\r
     LTEXT           "&Enter text to test:",IDC_PROMPT_LABEL,7,21,90,10\r
     EDITTEXT        IDC_TEST_TEXT,100,19,142,12,ES_AUTOHSCROLL\r
index da1e4fd..7172bc3 100644 (file)
@@ -29,895 +29,895 @@ static struct _charsetInfo
        unsigned stateful;
 } const charsetInfo[] =
 {
-  {   1, "adobe-standard-encoding",                           0,  no }, /* IANA */
-  {   1, "csadobestandardencoding",                           0,  no }, /* IANA */
-  {   2, "adobe-symbol-encoding",                             0,  no }, /* IANA */
-  {   2, "cshppsmath",                                        0,  no }, /* IANA */
+  {   1, "Adobe-Standard-Encoding",                           0,  no }, /* IANA */
+  {   1, "csAdobeStandardEncoding",                           0,  no }, /* IANA */
+  {   2, "Adobe-Symbol-Encoding",                             0,  no }, /* IANA */
+  {   2, "csHPPSMath",                                        0,  no }, /* IANA */
   {   3, "iso-ir-99",                                         0,  no }, /* IANA */
-  {   3, "ansi_x3.110-1983",                                  0,  no }, /* IANA */
-  {   3, "csa_t500-1983",                                     0,  no }, /* IANA */
-  {   3, "naplps",                                            0,  no }, /* IANA */
-  {   3, "csiso99naplps",                                     0,  no }, /* IANA */
-  {   4, "us-ascii",                                      20127,  no }, /* IANA */
+  {   3, "ANSI_X3.110-1983",                                  0,  no }, /* IANA */
+  {   3, "CSA_T500-1983",                                     0,  no }, /* IANA */
+  {   3, "NAPLPS",                                            0,  no }, /* IANA */
+  {   3, "csISO99NAPLPS",                                     0,  no }, /* IANA */
+  {   4, "US-ASCII",                                      20127,  no }, /* IANA */
   {   4, "iso-ir-6",                                      20127,  no }, /* IANA */
-  {   4, "ansi_x3.4-1968",                                20127,  no }, /* IANA */
-  {   4, "ansi_x3.4-1986",                                20127,  no }, /* IANA */
-  {   4, "iso_646.irv:1991",                              20127,  no }, /* IANA */
+  {   4, "ANSI_X3.4-1968",                                20127,  no }, /* IANA */
+  {   4, "ANSI_X3.4-1986",                                20127,  no }, /* IANA */
+  {   4, "ISO_646.irv:1991",                              20127,  no }, /* IANA */
   {   4, "ascii",                                         20127,  no }, /* IANA */
-  {   4, "iso646-us",                                     20127,  no }, /* IANA */
+  {   4, "ISO646-US",                                     20127,  no }, /* IANA */
   {   4, "us",                                            20127,  no }, /* IANA */
-  {   4, "ibm367",                                        20127,  no }, /* IANA */
+  {   4, "IBM367",                                        20127,  no }, /* IANA */
   {   4, "cp367",                                         20127,  no }, /* IANA */
-  {   4, "csascii",                                       20127,  no }, /* IANA */
+  {   4, "csASCII",                                       20127,  no }, /* IANA */
   {   4, "iso-ir-6us",                                    20127,  no }, /* MICROSOFT */
   {   5, "iso-ir-89",                                         0,  no }, /* IANA */
-  {   5, "asmo_449",                                          0,  no }, /* IANA */
-  {   5, "iso_9036",                                          0,  no }, /* IANA */
+  {   5, "ASMO_449",                                          0,  no }, /* IANA */
+  {   5, "ISO_9036",                                          0,  no }, /* IANA */
   {   5, "arabic7",                                           0,  no }, /* IANA */
-  {   5, "csiso89asmo449",                                    0,  no }, /* IANA */
-  {   6, "big5",                                            950,  no }, /* IANA */
-  {   6, "csbig5",                                          950,  no }, /* IANA */
+  {   5, "csISO89ASMO449",                                    0,  no }, /* IANA */
+  {   6, "Big5",                                            950,  no }, /* IANA */
+  {   6, "csBig5",                                          950,  no }, /* IANA */
   {   6, "cn-big5",                                         950,  no }, /* MICROSOFT */
   {   6, "x-x-big5",                                        950,  no }, /* MICROSOFT */
-  {   7, "big5-hkscs",                                      950,  no }, /* IANA */
+  {   7, "Big5-HKSCS",                                      950,  no }, /* IANA */
   {   7, "cn-big5",                                         950,  no }, /* MICROSOFT */
   {   7, "x-x-big5",                                        950,  no }, /* MICROSOFT */
-  {   8, "bocu-1",                                            0,  no }, /* IANA */
-  {   8, "csbocu-1",                                          0,  no }, /* IANA */
+  {   8, "BOCU-1",                                            0,  no }, /* IANA */
+  {   8, "csBOCU-1",                                          0,  no }, /* IANA */
   {   9, "iso-ir-4",                                          0,  no }, /* IANA */
-  {   9, "bs_4730",                                           0,  no }, /* IANA */
-  {   9, "iso646-gb",                                         0,  no }, /* IANA */
+  {   9, "BS_4730",                                           0,  no }, /* IANA */
+  {   9, "ISO646-GB",                                         0,  no }, /* IANA */
   {   9, "gb",                                                0,  no }, /* IANA */
   {   9, "uk",                                                0,  no }, /* IANA */
-  {   9, "csiso4unitedkingdom",                               0,  no }, /* IANA */
+  {   9, "csISO4UnitedKingdom",                               0,  no }, /* IANA */
   {  10, "iso-ir-47",                                         0,  no }, /* IANA */
-  {  10, "bs_viewdata",                                       0,  no }, /* IANA */
-  {  10, "csiso47bsviewdata",                                 0,  no }, /* IANA */
-  {  11, "cesu-8",                                            0,  no }, /* IANA */
-  {  11, "cscesu-8",                                          0,  no }, /* IANA */
+  {  10, "BS_viewdata",                                       0,  no }, /* IANA */
+  {  10, "csISO47BSViewdata",                                 0,  no }, /* IANA */
+  {  11, "CESU-8",                                            0,  no }, /* IANA */
+  {  11, "csCESU-8",                                          0,  no }, /* IANA */
   {  12, "iso-ir-121",                                        0,  no }, /* IANA */
-  {  12, "csa_z243.4-1985-1",                                 0,  no }, /* IANA */
-  {  12, "iso646-ca",                                         0,  no }, /* IANA */
+  {  12, "CSA_Z243.4-1985-1",                                 0,  no }, /* IANA */
+  {  12, "ISO646-CA",                                         0,  no }, /* IANA */
   {  12, "csa7-1",                                            0,  no }, /* IANA */
   {  12, "ca",                                                0,  no }, /* IANA */
-  {  12, "csiso121canadian1",                                 0,  no }, /* IANA */
+  {  12, "csISO121Canadian1",                                 0,  no }, /* IANA */
   {  13, "iso-ir-122",                                        0,  no }, /* IANA */
-  {  13, "csa_z243.4-1985-2",                                 0,  no }, /* IANA */
-  {  13, "iso646-ca2",                                        0,  no }, /* IANA */
+  {  13, "CSA_Z243.4-1985-2",                                 0,  no }, /* IANA */
+  {  13, "ISO646-CA2",                                        0,  no }, /* IANA */
   {  13, "csa7-2",                                            0,  no }, /* IANA */
-  {  13, "csiso122canadian2",                                 0,  no }, /* IANA */
+  {  13, "csISO122Canadian2",                                 0,  no }, /* IANA */
   {  14, "iso-ir-123",                                        0,  no }, /* IANA */
-  {  14, "csa_z243.4-1985-gr",                                0,  no }, /* IANA */
-  {  14, "csiso123csaz24341985gr",                            0,  no }, /* IANA */
+  {  14, "CSA_Z243.4-1985-gr",                                0,  no }, /* IANA */
+  {  14, "csISO123CSAZ24341985gr",                            0,  no }, /* IANA */
   {  15, "iso-ir-139",                                        0,  no }, /* IANA */
-  {  15, "csn_369103",                                        0,  no }, /* IANA */
-  {  15, "csiso139csn369103",                                 0,  no }, /* IANA */
-  {  16, "dec-mcs",                                           0,  no }, /* IANA */
+  {  15, "CSN_369103",                                        0,  no }, /* IANA */
+  {  15, "csISO139CSN369103",                                 0,  no }, /* IANA */
+  {  16, "DEC-MCS",                                           0,  no }, /* IANA */
   {  16, "dec",                                               0,  no }, /* IANA */
-  {  16, "csdecmcs",                                          0,  no }, /* IANA */
+  {  16, "csDECMCS",                                          0,  no }, /* IANA */
   {  17, "iso-ir-21",                                     20106,  no }, /* IANA */
-  {  17, "din_66003",                                     20106,  no }, /* IANA */
+  {  17, "DIN_66003",                                     20106,  no }, /* IANA */
   {  17, "de",                                            20106,  no }, /* IANA */
-  {  17, "iso646-de",                                     20106,  no }, /* IANA */
-  {  17, "csiso21german",                                 20106,  no }, /* IANA */
+  {  17, "ISO646-DE",                                     20106,  no }, /* IANA */
+  {  17, "csISO21German",                                 20106,  no }, /* IANA */
   {  17, "x-ia5-german",                                  20106,  no }, /* MICROSOFT */
   {  18, "dk-us",                                             0,  no }, /* IANA */
-  {  18, "csdkus",                                            0,  no }, /* IANA */
-  {  19, "ds_2089",                                           0,  no }, /* IANA */
-  {  19, "ds2089",                                            0,  no }, /* IANA */
-  {  19, "iso646-dk",                                         0,  no }, /* IANA */
+  {  18, "csDKUS",                                            0,  no }, /* IANA */
+  {  19, "DS_2089",                                           0,  no }, /* IANA */
+  {  19, "DS2089",                                            0,  no }, /* IANA */
+  {  19, "ISO646-DK",                                         0,  no }, /* IANA */
   {  19, "dk",                                                0,  no }, /* IANA */
-  {  19, "csiso646danish",                                    0,  no }, /* IANA */
-  {  20, "ebcdic-at-de",                                      0,  no }, /* IANA */
-  {  20, "csibmebcdicatde",                                   0,  no }, /* IANA */
-  {  21, "ebcdic-at-de-a",                                    0,  no }, /* IANA */
-  {  21, "csebcdicatdea",                                     0,  no }, /* IANA */
-  {  22, "ebcdic-ca-fr",                                      0,  no }, /* IANA */
-  {  22, "csebcdiccafr",                                      0,  no }, /* IANA */
-  {  23, "ebcdic-dk-no",                                      0,  no }, /* IANA */
-  {  23, "csebcdicdkno",                                      0,  no }, /* IANA */
-  {  24, "ebcdic-dk-no-a",                                    0,  no }, /* IANA */
-  {  24, "csebcdicdknoa",                                     0,  no }, /* IANA */
-  {  25, "ebcdic-es",                                         0,  no }, /* IANA */
-  {  25, "csebcdices",                                        0,  no }, /* IANA */
-  {  26, "ebcdic-es-a",                                       0,  no }, /* IANA */
-  {  26, "csebcdicesa",                                       0,  no }, /* IANA */
-  {  27, "ebcdic-es-s",                                       0,  no }, /* IANA */
-  {  27, "csebcdicess",                                       0,  no }, /* IANA */
-  {  28, "ebcdic-fi-se",                                      0,  no }, /* IANA */
-  {  28, "csebcdicfise",                                      0,  no }, /* IANA */
-  {  29, "ebcdic-fi-se-a",                                    0,  no }, /* IANA */
-  {  29, "csebcdicfisea",                                     0,  no }, /* IANA */
-  {  30, "ebcdic-fr",                                         0,  no }, /* IANA */
-  {  30, "csebcdicfr",                                        0,  no }, /* IANA */
-  {  31, "ebcdic-it",                                         0,  no }, /* IANA */
-  {  31, "csebcdicit",                                        0,  no }, /* IANA */
-  {  32, "ebcdic-pt",                                         0,  no }, /* IANA */
-  {  32, "csebcdicpt",                                        0,  no }, /* IANA */
-  {  33, "ebcdic-uk",                                         0,  no }, /* IANA */
-  {  33, "csebcdicuk",                                        0,  no }, /* IANA */
-  {  34, "ebcdic-us",                                         0,  no }, /* IANA */
-  {  34, "csebcdicus",                                        0,  no }, /* IANA */
+  {  19, "csISO646Danish",                                    0,  no }, /* IANA */
+  {  20, "EBCDIC-AT-DE",                                      0,  no }, /* IANA */
+  {  20, "csIBMEBCDICATDE",                                   0,  no }, /* IANA */
+  {  21, "EBCDIC-AT-DE-A",                                    0,  no }, /* IANA */
+  {  21, "csEBCDICATDEA",                                     0,  no }, /* IANA */
+  {  22, "EBCDIC-CA-FR",                                      0,  no }, /* IANA */
+  {  22, "csEBCDICCAFR",                                      0,  no }, /* IANA */
+  {  23, "EBCDIC-DK-NO",                                      0,  no }, /* IANA */
+  {  23, "csEBCDICDKNO",                                      0,  no }, /* IANA */
+  {  24, "EBCDIC-DK-NO-A",                                    0,  no }, /* IANA */
+  {  24, "csEBCDICDKNOA",                                     0,  no }, /* IANA */
+  {  25, "EBCDIC-ES",                                         0,  no }, /* IANA */
+  {  25, "csEBCDICES",                                        0,  no }, /* IANA */
+  {  26, "EBCDIC-ES-A",                                       0,  no }, /* IANA */
+  {  26, "csEBCDICESA",                                       0,  no }, /* IANA */
+  {  27, "EBCDIC-ES-S",                                       0,  no }, /* IANA */
+  {  27, "csEBCDICESS",                                       0,  no }, /* IANA */
+  {  28, "EBCDIC-FI-SE",                                      0,  no }, /* IANA */
+  {  28, "csEBCDICFISE",                                      0,  no }, /* IANA */
+  {  29, "EBCDIC-FI-SE-A",                                    0,  no }, /* IANA */
+  {  29, "csEBCDICFISEA",                                     0,  no }, /* IANA */
+  {  30, "EBCDIC-FR",                                         0,  no }, /* IANA */
+  {  30, "csEBCDICFR",                                        0,  no }, /* IANA */
+  {  31, "EBCDIC-IT",                                         0,  no }, /* IANA */
+  {  31, "csEBCDICIT",                                        0,  no }, /* IANA */
+  {  32, "EBCDIC-PT",                                         0,  no }, /* IANA */
+  {  32, "csEBCDICPT",                                        0,  no }, /* IANA */
+  {  33, "EBCDIC-UK",                                         0,  no }, /* IANA */
+  {  33, "csEBCDICUK",                                        0,  no }, /* IANA */
+  {  34, "EBCDIC-US",                                         0,  no }, /* IANA */
+  {  34, "csEBCDICUS",                                        0,  no }, /* IANA */
   {  35, "iso-ir-111",                                        0,  no }, /* IANA */
-  {  35, "ecma-cyrillic",                                     0,  no }, /* IANA */
-  {  35, "csiso111ecmacyrillic",                              0,  no }, /* IANA */
+  {  35, "ECMA-cyrillic",                                     0,  no }, /* IANA */
+  {  35, "csISO111ECMACyrillic",                              0,  no }, /* IANA */
   {  36, "iso-ir-17",                                         0,  no }, /* IANA */
-  {  36, "es",                                                0,  no }, /* IANA */
-  {  36, "iso646-es",                                         0,  no }, /* IANA */
-  {  36, "csiso17spanish",                                    0,  no }, /* IANA */
+  {  36, "ES",                                                0,  no }, /* IANA */
+  {  36, "ISO646-ES",                                         0,  no }, /* IANA */
+  {  36, "csISO17Spanish",                                    0,  no }, /* IANA */
   {  37, "iso-ir-85",                                         0,  no }, /* IANA */
-  {  37, "es2",                                               0,  no }, /* IANA */
-  {  37, "iso646-es2",                                        0,  no }, /* IANA */
-  {  37, "csiso85spanish2",                                   0,  no }, /* IANA */
-  {  38, "euc-kr",                                        51949,  no }, /* IANA */
-  {  38, "cseuckr",                                       51949,  no }, /* IANA */
-  {  39, "extended_unix_code_fixed_width_for_japanese",       0,  no }, /* IANA */
-  {  39, "cseucfixwidjapanese",                               0,  no }, /* IANA */
-  {  40, "euc-jp",                                        51932,  no }, /* IANA */
-  {  40, "extended_unix_code_packed_format_for_japanese", 51932,  no }, /* IANA */
-  {  40, "cseucpkdfmtjapanese",                           51932,  no }, /* IANA */
+  {  37, "ES2",                                               0,  no }, /* IANA */
+  {  37, "ISO646-ES2",                                        0,  no }, /* IANA */
+  {  37, "csISO85Spanish2",                                   0,  no }, /* IANA */
+  {  38, "EUC-KR",                                        51949,  no }, /* IANA */
+  {  38, "csEUCKR",                                       51949,  no }, /* IANA */
+  {  39, "Extended_UNIX_Code_Fixed_Width_for_Japanese",       0,  no }, /* IANA */
+  {  39, "csEUCFixWidJapanese",                               0,  no }, /* IANA */
+  {  40, "EUC-JP",                                        51932,  no }, /* IANA */
+  {  40, "Extended_UNIX_Code_Packed_Format_for_Japanese", 51932,  no }, /* IANA */
+  {  40, "csEUCPkdFmtJapanese",                           51932,  no }, /* IANA */
   {  40, "x-euc-jp",                                      51932,  no }, /* MICROSOFT */
   {  40, "x-euc",                                         51932,  no }, /* MICROSOFT */
-  {  41, "gb18030",                                       54936,  no }, /* IANA */
-  {  42, "gb2312",                                          936,  no }, /* IANA */
-  {  42, "csgb2312",                                        936,  no }, /* IANA */
+  {  41, "GB18030",                                       54936,  no }, /* IANA */
+  {  42, "GB2312",                                          936,  no }, /* IANA */
+  {  42, "csGB2312",                                        936,  no }, /* IANA */
   {  42, "csgb231280",                                      936,  no }, /* MICROSOFT */
   {  42, "gb2312-80",                                       936,  no }, /* MICROSOFT */
   {  42, "gb231280",                                        936,  no }, /* MICROSOFT */
   {  42, "cn-gb",                                           936,  no }, /* MICROSOFT */
   {  43, "iso-ir-57",                                         0,  no }, /* IANA */
-  {  43, "gb_1988-80",                                        0,  no }, /* IANA */
+  {  43, "GB_1988-80",                                        0,  no }, /* IANA */
   {  43, "cn",                                                0,  no }, /* IANA */
-  {  43, "iso646-cn",                                         0,  no }, /* IANA */
-  {  43, "csiso57gb1988",                                     0,  no }, /* IANA */
+  {  43, "ISO646-CN",                                         0,  no }, /* IANA */
+  {  43, "csISO57GB1988",                                     0,  no }, /* IANA */
   {  44, "iso-ir-58",                                       936,  no }, /* IANA */
-  {  44, "gb_2312-80",                                      936,  no }, /* IANA */
+  {  44, "GB_2312-80",                                      936,  no }, /* IANA */
   {  44, "chinese",                                         936,  no }, /* IANA */
-  {  44, "csiso58gb231280",                                 936,  no }, /* IANA */
+  {  44, "csISO58GB231280",                                 936,  no }, /* IANA */
   {  44, "csgb231280",                                      936,  no }, /* MICROSOFT */
   {  44, "gb2312-80",                                       936,  no }, /* MICROSOFT */
   {  44, "gb231280",                                        936,  no }, /* MICROSOFT */
   {  44, "cn-gb",                                           936,  no }, /* MICROSOFT */
-  {  45, "gbk",                                             936,  no }, /* IANA */
-  {  45, "cp936",                                           936,  no }, /* IANA */
-  {  45, "ms936",                                           936,  no }, /* IANA */
-  {  45, "windows-936",                                     936,  no }, /* IANA */
+  {  45, "GBK",                                             936,  no }, /* IANA */
+  {  45, "CP936",                                           936,  no }, /* IANA */
+  {  45, "MS936",                                           936,  no }, /* IANA */
+  {  45, "Windows-936",                                     936,  no }, /* IANA */
   {  45, "csgb231280",                                      936,  no }, /* MICROSOFT */
   {  45, "gb2312-80",                                       936,  no }, /* MICROSOFT */
   {  45, "gb231280",                                        936,  no }, /* MICROSOFT */
   {  45, "cn-gb",                                           936,  no }, /* MICROSOFT */
   {  46, "iso-ir-153",                                        0,  no }, /* IANA */
-  {  46, "gost_19768-74",                                     0,  no }, /* IANA */
-  {  46, "st_sev_358-88",                                     0,  no }, /* IANA */
-  {  46, "csiso153gost1976874",                               0,  no }, /* IANA */
+  {  46, "GOST_19768-74",                                     0,  no }, /* IANA */
+  {  46, "ST_SEV_358-88",                                     0,  no }, /* IANA */
+  {  46, "csISO153GOST1976874",                               0,  no }, /* IANA */
   {  47, "iso-ir-150",                                        0,  no }, /* IANA */
   {  47, "greek-ccitt",                                       0,  no }, /* IANA */
-  {  47, "csiso150",                                          0,  no }, /* IANA */
-  {  47, "csiso150greekccitt",                                0,  no }, /* IANA */
+  {  47, "csISO150",                                          0,  no }, /* IANA */
+  {  47, "csISO150GreekCCITT",                                0,  no }, /* IANA */
   {  48, "iso-ir-88",                                         0,  no }, /* IANA */
   {  48, "greek7",                                            0,  no }, /* IANA */
-  {  48, "csiso88greek7",                                     0,  no }, /* IANA */
+  {  48, "csISO88Greek7",                                     0,  no }, /* IANA */
   {  49, "iso-ir-18",                                         0,  no }, /* IANA */
   {  49, "greek7-old",                                        0,  no }, /* IANA */
-  {  49, "csiso18greek7old",                                  0,  no }, /* IANA */
-  {  50, "hp-desktop",                                        0,  no }, /* IANA */
-  {  50, "cshpdesktop",                                       0,  no }, /* IANA */
-  {  51, "hp-legal",                                          0,  no }, /* IANA */
-  {  51, "cshplegal",                                         0,  no }, /* IANA */
-  {  52, "hp-math8",                                          0,  no }, /* IANA */
-  {  52, "cshpmath8",                                         0,  no }, /* IANA */
-  {  53, "hp-pi-font",                                        0,  no }, /* IANA */
-  {  53, "cshppifont",                                        0,  no }, /* IANA */
+  {  49, "csISO18Greek7Old",                                  0,  no }, /* IANA */
+  {  50, "HP-DeskTop",                                        0,  no }, /* IANA */
+  {  50, "csHPDesktop",                                       0,  no }, /* IANA */
+  {  51, "HP-Legal",                                          0,  no }, /* IANA */
+  {  51, "csHPLegal",                                         0,  no }, /* IANA */
+  {  52, "HP-Math8",                                          0,  no }, /* IANA */
+  {  52, "csHPMath8",                                         0,  no }, /* IANA */
+  {  53, "HP-Pi-font",                                        0,  no }, /* IANA */
+  {  53, "csHPPiFont",                                        0,  no }, /* IANA */
   {  54, "hp-roman8",                                         0,  no }, /* IANA */
   {  54, "roman8",                                            0,  no }, /* IANA */
   {  54, "r8",                                                0,  no }, /* IANA */
-  {  54, "cshproman8",                                        0,  no }, /* IANA */
-  {  55, "hz-gb-2312",                                    52936, yes }, /* IANA */
-  {  56, "ibm-symbols",                                       0,  no }, /* IANA */
-  {  56, "csibmsymbols",                                      0,  no }, /* IANA */
-  {  57, "ibm-thai",                                      20838,  no }, /* IANA */
-  {  57, "csibmthai",                                     20838,  no }, /* IANA */
+  {  54, "csHPRoman8",                                        0,  no }, /* IANA */
+  {  55, "HZ-GB-2312",                                    52936, yes }, /* IANA */
+  {  56, "IBM-Symbols",                                       0,  no }, /* IANA */
+  {  56, "csIBMSymbols",                                      0,  no }, /* IANA */
+  {  57, "IBM-Thai",                                      20838,  no }, /* IANA */
+  {  57, "csIBMThai",                                     20838,  no }, /* IANA */
   {  57, "x-ebcdic-thai",                                 20838,  no }, /* MICROSOFT */
-  {  58, "ibm00858",                                        858,  no }, /* IANA */
-  {  58, "ccsid00858",                                      858,  no }, /* IANA */
-  {  58, "cp00858",                                         858,  no }, /* IANA */
-  {  58, "pc-multilingual-850+euro",                        858,  no }, /* IANA */
-  {  59, "ibm00924",                                      20924,  no }, /* IANA */
-  {  59, "ccsid00924",                                    20924,  no }, /* IANA */
-  {  59, "cp00924",                                       20924,  no }, /* IANA */
-  {  59, "ebcdic-latin9--euro",                           20924,  no }, /* IANA */
-  {  60, "ibm01140",                                       1140,  no }, /* IANA */
-  {  60, "ccsid01140",                                     1140,  no }, /* IANA */
-  {  60, "cp01140",                                        1140,  no }, /* IANA */
+  {  58, "IBM00858",                                        858,  no }, /* IANA */
+  {  58, "CCSID00858",                                      858,  no }, /* IANA */
+  {  58, "CP00858",                                         858,  no }, /* IANA */
+  {  58, "PC-Multilingual-850+euro",                        858,  no }, /* IANA */
+  {  59, "IBM00924",                                      20924,  no }, /* IANA */
+  {  59, "CCSID00924",                                    20924,  no }, /* IANA */
+  {  59, "CP00924",                                       20924,  no }, /* IANA */
+  {  59, "ebcdic-Latin9--euro",                           20924,  no }, /* IANA */
+  {  60, "IBM01140",                                       1140,  no }, /* IANA */
+  {  60, "CCSID01140",                                     1140,  no }, /* IANA */
+  {  60, "CP01140",                                        1140,  no }, /* IANA */
   {  60, "ebcdic-us-37+euro",                              1140,  no }, /* IANA */
   {  60, "x-ebcdic-cp-us-euro",                            1140,  no }, /* MICROSOFT */
-  {  61, "ibm01141",                                       1141,  no }, /* IANA */
-  {  61, "ccsid01141",                                     1141,  no }, /* IANA */
-  {  61, "cp01141",                                        1141,  no }, /* IANA */
+  {  61, "IBM01141",                                       1141,  no }, /* IANA */
+  {  61, "CCSID01141",                                     1141,  no }, /* IANA */
+  {  61, "CP01141",                                        1141,  no }, /* IANA */
   {  61, "ebcdic-de-273+euro",                             1141,  no }, /* IANA */
   {  61, "x-ebcdic-germany-euro",                          1141,  no }, /* MICROSOFT */
-  {  62, "ibm01142",                                       1142,  no }, /* IANA */
-  {  62, "ccsid01142",                                     1142,  no }, /* IANA */
-  {  62, "cp01142",                                        1142,  no }, /* IANA */
+  {  62, "IBM01142",                                       1142,  no }, /* IANA */
+  {  62, "CCSID01142",                                     1142,  no }, /* IANA */
+  {  62, "CP01142",                                        1142,  no }, /* IANA */
   {  62, "ebcdic-dk-277+euro",                             1142,  no }, /* IANA */
   {  62, "ebcdic-no-277+euro",                             1142,  no }, /* IANA */
   {  62, "x-ebcdic-denmarknorway-euro",                    1142,  no }, /* MICROSOFT */
-  {  63, "ibm01143",                                       1143,  no }, /* IANA */
-  {  63, "ccsid01143",                                     1143,  no }, /* IANA */
-  {  63, "cp01143",                                        1143,  no }, /* IANA */
+  {  63, "IBM01143",                                       1143,  no }, /* IANA */
+  {  63, "CCSID01143",                                     1143,  no }, /* IANA */
+  {  63, "CP01143",                                        1143,  no }, /* IANA */
   {  63, "ebcdic-fi-278+euro",                             1143,  no }, /* IANA */
   {  63, "ebcdic-se-278+euro",                             1143,  no }, /* IANA */
   {  63, "x-ebcdic-france",                                1143,  no }, /* MICROSOFT */
   {  63, "x-ebcdic-finlandsweden-euro",                    1143,  no }, /* MICROSOFT */
-  {  64, "ibm01144",                                       1144,  no }, /* IANA */
-  {  64, "ccsid01144",                                     1144,  no }, /* IANA */
-  {  64, "cp01144",                                        1144,  no }, /* IANA */
+  {  64, "IBM01144",                                       1144,  no }, /* IANA */
+  {  64, "CCSID01144",                                     1144,  no }, /* IANA */
+  {  64, "CP01144",                                        1144,  no }, /* IANA */
   {  64, "ebcdic-it-280+euro",                             1144,  no }, /* IANA */
   {  64, "x-ebcdic-italy-euro",                            1144,  no }, /* MICROSOFT */
-  {  65, "ibm01145",                                       1145,  no }, /* IANA */
-  {  65, "ccsid01145",                                     1145,  no }, /* IANA */
-  {  65, "cp01145",                                        1145,  no }, /* IANA */
+  {  65, "IBM01145",                                       1145,  no }, /* IANA */
+  {  65, "CCSID01145",                                     1145,  no }, /* IANA */
+  {  65, "CP01145",                                        1145,  no }, /* IANA */
   {  65, "ebcdic-es-284+euro",                             1145,  no }, /* IANA */
   {  65, "x-ebcdic-spain-euro",                            1145,  no }, /* MICROSOFT */
-  {  66, "ibm01146",                                       1146,  no }, /* IANA */
-  {  66, "ccsid01146",                                     1146,  no }, /* IANA */
-  {  66, "cp01146",                                        1146,  no }, /* IANA */
+  {  66, "IBM01146",                                       1146,  no }, /* IANA */
+  {  66, "CCSID01146",                                     1146,  no }, /* IANA */
+  {  66, "CP01146",                                        1146,  no }, /* IANA */
   {  66, "ebcdic-gb-285+euro",                             1146,  no }, /* IANA */
   {  66, "x-ebcdic-uk-euro",                               1146,  no }, /* MICROSOFT */
-  {  67, "ibm01147",                                       1147,  no }, /* IANA */
-  {  67, "ccsid01147",                                     1147,  no }, /* IANA */
-  {  67, "cp01147",                                        1147,  no }, /* IANA */
+  {  67, "IBM01147",                                       1147,  no }, /* IANA */
+  {  67, "CCSID01147",                                     1147,  no }, /* IANA */
+  {  67, "CP01147",                                        1147,  no }, /* IANA */
   {  67, "ebcdic-fr-297+euro",                             1147,  no }, /* IANA */
   {  67, "x-ebcdic-france-euro",                           1147,  no }, /* MICROSOFT */
-  {  68, "ibm01148",                                       1148,  no }, /* IANA */
-  {  68, "ccsid01148",                                     1148,  no }, /* IANA */
-  {  68, "cp01148",                                        1148,  no }, /* IANA */
+  {  68, "IBM01148",                                       1148,  no }, /* IANA */
+  {  68, "CCSID01148",                                     1148,  no }, /* IANA */
+  {  68, "CP01148",                                        1148,  no }, /* IANA */
   {  68, "ebcdic-international-500+euro",                  1148,  no }, /* IANA */
   {  68, "x-ebcdic-international-euro",                    1148,  no }, /* MICROSOFT */
-  {  69, "ibm01149",                                       1149,  no }, /* IANA */
-  {  69, "ccsid01149",                                     1149,  no }, /* IANA */
-  {  69, "cp01149",                                        1149,  no }, /* IANA */
+  {  69, "IBM01149",                                       1149,  no }, /* IANA */
+  {  69, "CCSID01149",                                     1149,  no }, /* IANA */
+  {  69, "CP01149",                                        1149,  no }, /* IANA */
   {  69, "ebcdic-is-871+euro",                             1149,  no }, /* IANA */
   {  69, "x-ebcdic-icelandic-euro",                        1149,  no }, /* MICROSOFT */
-  {  70, "ibm037",                                           37,  no }, /* IANA */
+  {  70, "IBM037",                                           37,  no }, /* IANA */
   {  70, "cp037",                                            37,  no }, /* IANA */
   {  70, "ebcdic-cp-us",                                     37,  no }, /* IANA */
   {  70, "ebcdic-cp-ca",                                     37,  no }, /* IANA */
   {  70, "ebcdic-cp-wt",                                     37,  no }, /* IANA */
   {  70, "ebcdic-cp-nl",                                     37,  no }, /* IANA */
-  {  70, "csibm037",                                         37,  no }, /* IANA */
-  {  71, "ibm038",                                            0,  no }, /* IANA */
-  {  71, "ebcdic-int",                                        0,  no }, /* IANA */
+  {  70, "csIBM037",                                         37,  no }, /* IANA */
+  {  71, "IBM038",                                            0,  no }, /* IANA */
+  {  71, "EBCDIC-INT",                                        0,  no }, /* IANA */
   {  71, "cp038",                                             0,  no }, /* IANA */
-  {  71, "csibm038",                                          0,  no }, /* IANA */
-  {  72, "ibm1026",                                        1026,  no }, /* IANA */
-  {  72, "cp1026",                                         1026,  no }, /* IANA */
-  {  72, "csibm1026",                                      1026,  no }, /* IANA */
-  {  73, "ibm1047",                                           0,  no }, /* IANA */
-  {  73, "ibm-1047",                                          0,  no }, /* IANA */
-  {  74, "ibm273",                                        20273,  no }, /* IANA */
-  {  74, "cp273",                                         20273,  no }, /* IANA */
-  {  74, "csibm273",                                      20273,  no }, /* IANA */
+  {  71, "csIBM038",                                          0,  no }, /* IANA */
+  {  72, "IBM1026",                                        1026,  no }, /* IANA */
+  {  72, "CP1026",                                         1026,  no }, /* IANA */
+  {  72, "csIBM1026",                                      1026,  no }, /* IANA */
+  {  73, "IBM1047",                                           0,  no }, /* IANA */
+  {  73, "IBM-1047",                                          0,  no }, /* IANA */
+  {  74, "IBM273",                                        20273,  no }, /* IANA */
+  {  74, "CP273",                                         20273,  no }, /* IANA */
+  {  74, "csIBM273",                                      20273,  no }, /* IANA */
   {  74, "x-ebcdic-germany",                              20273,  no }, /* MICROSOFT */
-  {  75, "ibm274",                                            0,  no }, /* IANA */
-  {  75, "ebcdic-be",                                         0,  no }, /* IANA */
-  {  75, "cp274",                                             0,  no }, /* IANA */
-  {  75, "csibm274",                                          0,  no }, /* IANA */
-  {  76, "ibm275",                                            0,  no }, /* IANA */
-  {  76, "ebcdic-br",                                         0,  no }, /* IANA */
+  {  75, "IBM274",                                            0,  no }, /* IANA */
+  {  75, "EBCDIC-BE",                                         0,  no }, /* IANA */
+  {  75, "CP274",                                             0,  no }, /* IANA */
+  {  75, "csIBM274",                                          0,  no }, /* IANA */
+  {  76, "IBM275",                                            0,  no }, /* IANA */
+  {  76, "EBCDIC-BR",                                         0,  no }, /* IANA */
   {  76, "cp275",                                             0,  no }, /* IANA */
-  {  76, "csibm275",                                          0,  no }, /* IANA */
-  {  77, "ibm277",                                        20277,  no }, /* IANA */
-  {  77, "ebcdic-cp-dk",                                  20277,  no }, /* IANA */
-  {  77, "ebcdic-cp-no",                                  20277,  no }, /* IANA */
-  {  77, "csibm277",                                      20277,  no }, /* IANA */
+  {  76, "csIBM275",                                          0,  no }, /* IANA */
+  {  77, "IBM277",                                        20277,  no }, /* IANA */
+  {  77, "EBCDIC-CP-DK",                                  20277,  no }, /* IANA */
+  {  77, "EBCDIC-CP-NO",                                  20277,  no }, /* IANA */
+  {  77, "csIBM277",                                      20277,  no }, /* IANA */
   {  77, "x-ebcdic-denmarknorway",                        20277,  no }, /* MICROSOFT */
-  {  78, "ibm278",                                        20278,  no }, /* IANA */
-  {  78, "cp278",                                         20278,  no }, /* IANA */
+  {  78, "IBM278",                                        20278,  no }, /* IANA */
+  {  78, "CP278",                                         20278,  no }, /* IANA */
   {  78, "ebcdic-cp-fi",                                  20278,  no }, /* IANA */
   {  78, "ebcdic-cp-se",                                  20278,  no }, /* IANA */
-  {  78, "csibm278",                                      20278,  no }, /* IANA */
+  {  78, "csIBM278",                                      20278,  no }, /* IANA */
   {  78, "x-ebcdic-finlandsweden",                        20278,  no }, /* MICROSOFT */
-  {  79, "ibm280",                                        20280,  no }, /* IANA */
-  {  79, "cp280",                                         20280,  no }, /* IANA */
+  {  79, "IBM280",                                        20280,  no }, /* IANA */
+  {  79, "CP280",                                         20280,  no }, /* IANA */
   {  79, "ebcdic-cp-it",                                  20280,  no }, /* IANA */
-  {  79, "csibm280",                                      20280,  no }, /* IANA */
+  {  79, "csIBM280",                                      20280,  no }, /* IANA */
   {  79, "x-ebcdic-italy",                                20280,  no }, /* MICROSOFT */
-  {  80, "ibm281",                                            0,  no }, /* IANA */
-  {  80, "ebcdic-jp-e",                                       0,  no }, /* IANA */
+  {  80, "IBM281",                                            0,  no }, /* IANA */
+  {  80, "EBCDIC-JP-E",                                       0,  no }, /* IANA */
   {  80, "cp281",                                             0,  no }, /* IANA */
-  {  80, "csibm281",                                          0,  no }, /* IANA */
-  {  81, "ibm284",                                        20284,  no }, /* IANA */
-  {  81, "cp284",                                         20284,  no }, /* IANA */
+  {  80, "csIBM281",                                          0,  no }, /* IANA */
+  {  81, "IBM284",                                        20284,  no }, /* IANA */
+  {  81, "CP284",                                         20284,  no }, /* IANA */
   {  81, "ebcdic-cp-es",                                  20284,  no }, /* IANA */
-  {  81, "csibm284",                                      20284,  no }, /* IANA */
+  {  81, "csIBM284",                                      20284,  no }, /* IANA */
   {  81, "x-ebcdic-spain",                                20284,  no }, /* MICROSOFT */
-  {  82, "ibm285",                                        20285,  no }, /* IANA */
-  {  82, "cp285",                                         20285,  no }, /* IANA */
+  {  82, "IBM285",                                        20285,  no }, /* IANA */
+  {  82, "CP285",                                         20285,  no }, /* IANA */
   {  82, "ebcdic-cp-gb",                                  20285,  no }, /* IANA */
-  {  82, "csibm285",                                      20285,  no }, /* IANA */
+  {  82, "csIBM285",                                      20285,  no }, /* IANA */
   {  82, "x-ebcdic-uk",                                   20285,  no }, /* MICROSOFT */
-  {  83, "ibm290",                                        20290,  no }, /* IANA */
+  {  83, "IBM290",                                        20290,  no }, /* IANA */
   {  83, "cp290",                                         20290,  no }, /* IANA */
-  {  83, "ebcdic-jp-kana",                                20290,  no }, /* IANA */
-  {  83, "csibm290",                                      20290,  no }, /* IANA */
+  {  83, "EBCDIC-JP-kana",                                20290,  no }, /* IANA */
+  {  83, "csIBM290",                                      20290,  no }, /* IANA */
   {  83, "x-ebcdic-japanesekatakana",                     20290,  no }, /* MICROSOFT */
-  {  84, "ibm297",                                        20297,  no }, /* IANA */
+  {  84, "IBM297",                                        20297,  no }, /* IANA */
   {  84, "cp297",                                         20297,  no }, /* IANA */
   {  84, "ebcdic-cp-fr",                                  20297,  no }, /* IANA */
-  {  84, "csibm297",                                      20297,  no }, /* IANA */
-  {  85, "ibm420",                                        20420,  no }, /* IANA */
+  {  84, "csIBM297",                                      20297,  no }, /* IANA */
+  {  85, "IBM420",                                        20420,  no }, /* IANA */
   {  85, "cp420",                                         20420,  no }, /* IANA */
   {  85, "ebcdic-cp-ar1",                                 20420,  no }, /* IANA */
-  {  85, "csibm420",                                      20420,  no }, /* IANA */
+  {  85, "csIBM420",                                      20420,  no }, /* IANA */
   {  85, "x-ebcdic-arabic",                               20420,  no }, /* MICROSOFT */
-  {  86, "ibm423",                                        20423,  no }, /* IANA */
+  {  86, "IBM423",                                        20423,  no }, /* IANA */
   {  86, "cp423",                                         20423,  no }, /* IANA */
   {  86, "ebcdic-cp-gr",                                  20423,  no }, /* IANA */
-  {  86, "csibm423",                                      20423,  no }, /* IANA */
+  {  86, "csIBM423",                                      20423,  no }, /* IANA */
   {  86, "x-ebcdic-greek",                                20423,  no }, /* MICROSOFT */
-  {  87, "ibm424",                                        20424,  no }, /* IANA */
+  {  87, "IBM424",                                        20424,  no }, /* IANA */
   {  87, "cp424",                                         20424,  no }, /* IANA */
   {  87, "ebcdic-cp-he",                                  20424,  no }, /* IANA */
-  {  87, "csibm424",                                      20424,  no }, /* IANA */
+  {  87, "csIBM424",                                      20424,  no }, /* IANA */
   {  87, "x-ebcdic-hebrew",                               20424,  no }, /* MICROSOFT */
-  {  88, "ibm437",                                          437,  no }, /* IANA */
+  {  88, "IBM437",                                          437,  no }, /* IANA */
   {  88, "cp437",                                           437,  no }, /* IANA */
   {  88, "437",                                             437,  no }, /* IANA */
-  {  88, "cspc8codepage437",                                437,  no }, /* IANA */
+  {  88, "csPC8CodePage437",                                437,  no }, /* IANA */
   {  88, "codepage437",                                     437,  no }, /* MICROSOFT */
   {  88, "cspc8",                                           437,  no }, /* MICROSOFT */
-  {  89, "ibm500",                                          500,  no }, /* IANA */
-  {  89, "cp500",                                           500,  no }, /* IANA */
+  {  89, "IBM500",                                          500,  no }, /* IANA */
+  {  89, "CP500",                                           500,  no }, /* IANA */
   {  89, "ebcdic-cp-be",                                    500,  no }, /* IANA */
   {  89, "ebcdic-cp-ch",                                    500,  no }, /* IANA */
-  {  89, "csibm500",                                        500,  no }, /* IANA */
-  {  90, "ibm775",                                          775,  no }, /* IANA */
+  {  89, "csIBM500",                                        500,  no }, /* IANA */
+  {  90, "IBM775",                                          775,  no }, /* IANA */
   {  90, "cp775",                                           775,  no }, /* IANA */
-  {  90, "cspc775baltic",                                   775,  no }, /* IANA */
-  {  91, "ibm850",                                          850,  no }, /* IANA */
+  {  90, "csPC775Baltic",                                   775,  no }, /* IANA */
+  {  91, "IBM850",                                          850,  no }, /* IANA */
   {  91, "cp850",                                           850,  no }, /* IANA */
   {  91, "850",                                             850,  no }, /* IANA */
-  {  91, "cspc850multilingual",                             850,  no }, /* IANA */
-  {  92, "ibm851",                                            0,  no }, /* IANA */
+  {  91, "csPC850Multilingual",                             850,  no }, /* IANA */
+  {  92, "IBM851",                                            0,  no }, /* IANA */
   {  92, "cp851",                                             0,  no }, /* IANA */
   {  92, "851",                                               0,  no }, /* IANA */
-  {  92, "csibm851",                                          0,  no }, /* IANA */
-  {  93, "ibm852",                                          852,  no }, /* IANA */
+  {  92, "csIBM851",                                          0,  no }, /* IANA */
+  {  93, "IBM852",                                          852,  no }, /* IANA */
   {  93, "cp852",                                           852,  no }, /* IANA */
   {  93, "852",                                             852,  no }, /* IANA */
-  {  93, "cspcp852",                                        852,  no }, /* IANA */
-  {  94, "ibm855",                                          855,  no }, /* IANA */
+  {  93, "csPCp852",                                        852,  no }, /* IANA */
+  {  94, "IBM855",                                          855,  no }, /* IANA */
   {  94, "cp855",                                           855,  no }, /* IANA */
   {  94, "855",                                             855,  no }, /* IANA */
-  {  94, "csibm855",                                        855,  no }, /* IANA */
-  {  95, "ibm857",                                          857,  no }, /* IANA */
+  {  94, "csIBM855",                                        855,  no }, /* IANA */
+  {  95, "IBM857",                                          857,  no }, /* IANA */
   {  95, "cp857",                                           857,  no }, /* IANA */
   {  95, "857",                                             857,  no }, /* IANA */
-  {  95, "csibm857",                                        857,  no }, /* IANA */
-  {  96, "ibm860",                                          860,  no }, /* IANA */
+  {  95, "csIBM857",                                        857,  no }, /* IANA */
+  {  96, "IBM860",                                          860,  no }, /* IANA */
   {  96, "cp860",                                           860,  no }, /* IANA */
   {  96, "860",                                             860,  no }, /* IANA */
-  {  96, "csibm860",                                        860,  no }, /* IANA */
-  {  97, "ibm861",                                          861,  no }, /* IANA */
+  {  96, "csIBM860",                                        860,  no }, /* IANA */
+  {  97, "IBM861",                                          861,  no }, /* IANA */
   {  97, "cp861",                                           861,  no }, /* IANA */
   {  97, "861",                                             861,  no }, /* IANA */
   {  97, "cp-is",                                           861,  no }, /* IANA */
-  {  97, "csibm861",                                        861,  no }, /* IANA */
-  {  98, "ibm862",                                          862,  no }, /* IANA */
+  {  97, "csIBM861",                                        861,  no }, /* IANA */
+  {  98, "IBM862",                                          862,  no }, /* IANA */
   {  98, "cp862",                                           862,  no }, /* IANA */
   {  98, "862",                                             862,  no }, /* IANA */
-  {  98, "cspc862latinhebrew",                              862,  no }, /* IANA */
+  {  98, "csPC862LatinHebrew",                              862,  no }, /* IANA */
   {  98, "dos-862",                                         862,  no }, /* MICROSOFT */
-  {  99, "ibm863",                                          863,  no }, /* IANA */
+  {  99, "IBM863",                                          863,  no }, /* IANA */
   {  99, "cp863",                                           863,  no }, /* IANA */
   {  99, "863",                                             863,  no }, /* IANA */
-  {  99, "csibm863",                                        863,  no }, /* IANA */
-  { 100, "ibm864",                                          864,  no }, /* IANA */
+  {  99, "csIBM863",                                        863,  no }, /* IANA */
+  { 100, "IBM864",                                          864,  no }, /* IANA */
   { 100, "cp864",                                           864,  no }, /* IANA */
-  { 100, "csibm864",                                        864,  no }, /* IANA */
-  { 101, "ibm865",                                          865,  no }, /* IANA */
+  { 100, "csIBM864",                                        864,  no }, /* IANA */
+  { 101, "IBM865",                                          865,  no }, /* IANA */
   { 101, "cp865",                                           865,  no }, /* IANA */
   { 101, "865",                                             865,  no }, /* IANA */
-  { 101, "csibm865",                                        865,  no }, /* IANA */
-  { 102, "ibm866",                                          866,  no }, /* IANA */
+  { 101, "csIBM865",                                        865,  no }, /* IANA */
+  { 102, "IBM866",                                          866,  no }, /* IANA */
   { 102, "cp866",                                           866,  no }, /* IANA */
   { 102, "866",                                             866,  no }, /* IANA */
-  { 102, "csibm866",                                        866,  no }, /* IANA */
-  { 103, "ibm868",                                            0,  no }, /* IANA */
-  { 103, "cp868",                                             0,  no }, /* IANA */
+  { 102, "csIBM866",                                        866,  no }, /* IANA */
+  { 103, "IBM868",                                            0,  no }, /* IANA */
+  { 103, "CP868",                                             0,  no }, /* IANA */
   { 103, "cp-ar",                                             0,  no }, /* IANA */
-  { 103, "csibm868",                                          0,  no }, /* IANA */
-  { 104, "ibm869",                                          869,  no }, /* IANA */
+  { 103, "csIBM868",                                          0,  no }, /* IANA */
+  { 104, "IBM869",                                          869,  no }, /* IANA */
   { 104, "cp869",                                           869,  no }, /* IANA */
   { 104, "869",                                             869,  no }, /* IANA */
   { 104, "cp-gr",                                           869,  no }, /* IANA */
-  { 104, "csibm869",                                        869,  no }, /* IANA */
-  { 105, "ibm870",                                          870,  no }, /* IANA */
-  { 105, "cp870",                                           870,  no }, /* IANA */
+  { 104, "csIBM869",                                        869,  no }, /* IANA */
+  { 105, "IBM870",                                          870,  no }, /* IANA */
+  { 105, "CP870",                                           870,  no }, /* IANA */
   { 105, "ebcdic-cp-roece",                                 870,  no }, /* IANA */
   { 105, "ebcdic-cp-yu",                                    870,  no }, /* IANA */
-  { 105, "csibm870",                                        870,  no }, /* IANA */
-  { 106, "ibm871",                                        20871,  no }, /* IANA */
-  { 106, "cp871",                                         20871,  no }, /* IANA */
+  { 105, "csIBM870",                                        870,  no }, /* IANA */
+  { 106, "IBM871",                                        20871,  no }, /* IANA */
+  { 106, "CP871",                                         20871,  no }, /* IANA */
   { 106, "ebcdic-cp-is",                                  20871,  no }, /* IANA */
-  { 106, "csibm871",                                      20871,  no }, /* IANA */
+  { 106, "csIBM871",                                      20871,  no }, /* IANA */
   { 106, "x-ebcdic-icelandic",                            20871,  no }, /* MICROSOFT */
-  { 107, "ibm880",                                        20880,  no }, /* IANA */
+  { 107, "IBM880",                                        20880,  no }, /* IANA */
   { 107, "cp880",                                         20880,  no }, /* IANA */
-  { 107, "ebcdic-cyrillic",                               20880,  no }, /* IANA */
-  { 107, "csibm880",                                      20880,  no }, /* IANA */
+  { 107, "EBCDIC-Cyrillic",                               20880,  no }, /* IANA */
+  { 107, "csIBM880",                                      20880,  no }, /* IANA */
   { 107, "x-ebcdic-cyrillicrussian",                      20880,  no }, /* MICROSOFT */
-  { 108, "ibm891",                                            0,  no }, /* IANA */
+  { 108, "IBM891",                                            0,  no }, /* IANA */
   { 108, "cp891",                                             0,  no }, /* IANA */
-  { 108, "csibm891",                                          0,  no }, /* IANA */
-  { 109, "ibm903",                                            0,  no }, /* IANA */
+  { 108, "csIBM891",                                          0,  no }, /* IANA */
+  { 109, "IBM903",                                            0,  no }, /* IANA */
   { 109, "cp903",                                             0,  no }, /* IANA */
-  { 109, "csibm903",                                          0,  no }, /* IANA */
-  { 110, "ibm904",                                            0,  no }, /* IANA */
+  { 109, "csIBM903",                                          0,  no }, /* IANA */
+  { 110, "IBM904",                                            0,  no }, /* IANA */
   { 110, "cp904",                                             0,  no }, /* IANA */
   { 110, "904",                                               0,  no }, /* IANA */
-  { 110, "csibbm904",                                         0,  no }, /* IANA */
-  { 111, "ibm905",                                        20905,  no }, /* IANA */
-  { 111, "cp905",                                         20905,  no }, /* IANA */
+  { 110, "csIBBM904",                                         0,  no }, /* IANA */
+  { 111, "IBM905",                                        20905,  no }, /* IANA */
+  { 111, "CP905",                                         20905,  no }, /* IANA */
   { 111, "ebcdic-cp-tr",                                  20905,  no }, /* IANA */
-  { 111, "csibm905",                                      20905,  no }, /* IANA */
+  { 111, "csIBM905",                                      20905,  no }, /* IANA */
   { 111, "x-ebcdic-turkish",                              20905,  no }, /* MICROSOFT */
-  { 112, "ibm918",                                            0,  no }, /* IANA */
-  { 112, "cp918",                                             0,  no }, /* IANA */
+  { 112, "IBM918",                                            0,  no }, /* IANA */
+  { 112, "CP918",                                             0,  no }, /* IANA */
   { 112, "ebcdic-cp-ar2",                                     0,  no }, /* IANA */
-  { 112, "csibm918",                                          0,  no }, /* IANA */
+  { 112, "csIBM918",                                          0,  no }, /* IANA */
   { 113, "iso-ir-143",                                        0,  no }, /* IANA */
-  { 113, "iec_p27-1",                                         0,  no }, /* IANA */
-  { 113, "csiso143iecp271",                                   0,  no }, /* IANA */
+  { 113, "IEC_P27-1",                                         0,  no }, /* IANA */
+  { 113, "csISO143IECP271",                                   0,  no }, /* IANA */
   { 114, "iso-ir-49",                                         0,  no }, /* IANA */
-  { 114, "inis",                                              0,  no }, /* IANA */
-  { 114, "csiso49inis",                                       0,  no }, /* IANA */
+  { 114, "INIS",                                              0,  no }, /* IANA */
+  { 114, "csISO49INIS",                                       0,  no }, /* IANA */
   { 115, "iso-ir-50",                                         0,  no }, /* IANA */
-  { 115, "inis-8",                                            0,  no }, /* IANA */
-  { 115, "csiso50inis8",                                      0,  no }, /* IANA */
+  { 115, "INIS-8",                                            0,  no }, /* IANA */
+  { 115, "csISO50INIS8",                                      0,  no }, /* IANA */
   { 116, "iso-ir-51",                                         0,  no }, /* IANA */
-  { 116, "inis-cyrillic",                                     0,  no }, /* IANA */
-  { 116, "csiso51iniscyrillic",                               0,  no }, /* IANA */
-  { 117, "invariant",                                         0,  no }, /* IANA */
-  { 117, "csinvariant",                                       0,  no }, /* IANA */
-  { 118, "iso-10646-j-1",                                     0,  no }, /* IANA */
-  { 119, "iso-10646-ucs-2",                                1200,  no }, /* IANA */
-  { 119, "csunicode",                                      1200,  no }, /* IANA */
-  { 119, "unicode",                                        1200,  no }, /* MICROSOFT */
-  { 120, "iso-10646-ucs-4",                                   0,  no }, /* IANA */
-  { 120, "csucs4",                                            0,  no }, /* IANA */
-  { 121, "iso-10646-ucs-basic",                               0,  no }, /* IANA */
-  { 121, "csunicodeascii",                                    0,  no }, /* IANA */
-  { 122, "iso-10646-unicode-latin1",                          0,  no }, /* IANA */
-  { 122, "iso-10646",                                         0,  no }, /* IANA */
-  { 122, "csunicodelatin1",                                   0,  no }, /* IANA */
-  { 123, "iso-10646-utf-1",                                   0,  no }, /* IANA */
-  { 123, "csiso10646utf1",                                    0,  no }, /* IANA */
-  { 124, "iso-2022-cn",                                       0, yes }, /* IANA */
-  { 125, "iso-2022-cn-ext",                                   0, yes }, /* IANA */
-  { 126, "iso-2022-jp",                                   50220, yes }, /* IANA */
-  { 126, "csiso2022jp",                                   50220, yes }, /* IANA */
-  { 127, "iso-2022-jp-2",                                 50221, yes }, /* IANA */
-  { 127, "csiso2022jp2",                                  50221, yes }, /* IANA */
-  { 128, "iso-2022-kr",                                   50225, yes }, /* IANA */
-  { 128, "csiso2022kr",                                   50225, yes }, /* IANA */
-  { 129, "iso-8859-1-windows-3.0-latin-1",                    0,  no }, /* IANA */
-  { 129, "cswindows30latin1",                                 0,  no }, /* IANA */
-  { 130, "iso-8859-1-windows-3.1-latin-1",                    0,  no }, /* IANA */
-  { 130, "cswindows31latin1",                                 0,  no }, /* IANA */
-  { 131, "iso-8859-10",                                       0,  no }, /* IANA */
+  { 116, "INIS-cyrillic",                                     0,  no }, /* IANA */
+  { 116, "csISO51INISCyrillic",                               0,  no }, /* IANA */
+  { 117, "INVARIANT",                                         0,  no }, /* IANA */
+  { 117, "csINVARIANT",                                       0,  no }, /* IANA */
+  { 118, "ISO-10646-J-1",                                     0,  no }, /* IANA */
+  { 119, "ISO-10646-UCS-2",                                1200,  no }, /* IANA */
+  { 119, "csUnicode",                                      1200,  no }, /* IANA */
+  { 119, "Unicode",                                        1200,  no }, /* MICROSOFT */
+  { 120, "ISO-10646-UCS-4",                                   0,  no }, /* IANA */
+  { 120, "csUCS4",                                            0,  no }, /* IANA */
+  { 121, "ISO-10646-UCS-Basic",                               0,  no }, /* IANA */
+  { 121, "csUnicodeASCII",                                    0,  no }, /* IANA */
+  { 122, "ISO-10646-Unicode-Latin1",                          0,  no }, /* IANA */
+  { 122, "ISO-10646",                                         0,  no }, /* IANA */
+  { 122, "csUnicodeLatin1",                                   0,  no }, /* IANA */
+  { 123, "ISO-10646-UTF-1",                                   0,  no }, /* IANA */
+  { 123, "csISO10646UTF1",                                    0,  no }, /* IANA */
+  { 124, "ISO-2022-CN",                                       0, yes }, /* IANA */
+  { 125, "ISO-2022-CN-EXT",                                   0, yes }, /* IANA */
+  { 126, "ISO-2022-JP",                                   50220, yes }, /* IANA */
+  { 126, "csISO2022JP",                                   50220, yes }, /* IANA */
+  { 127, "ISO-2022-JP-2",                                 50221, yes }, /* IANA */
+  { 127, "csISO2022JP2",                                  50221, yes }, /* IANA */
+  { 128, "ISO-2022-KR",                                   50225, yes }, /* IANA */
+  { 128, "csISO2022KR",                                   50225, yes }, /* IANA */
+  { 129, "ISO-8859-1-Windows-3.0-Latin-1",                    0,  no }, /* IANA */
+  { 129, "csWindows30Latin1",                                 0,  no }, /* IANA */
+  { 130, "ISO-8859-1-Windows-3.1-Latin-1",                    0,  no }, /* IANA */
+  { 130, "csWindows31Latin1",                                 0,  no }, /* IANA */
+  { 131, "ISO-8859-10",                                       0,  no }, /* IANA */
   { 131, "iso-ir-157",                                        0,  no }, /* IANA */
   { 131, "l6",                                                0,  no }, /* IANA */
-  { 131, "iso_8859-10:1992",                                  0,  no }, /* IANA */
-  { 131, "csisolatin6",                                       0,  no }, /* IANA */
+  { 131, "ISO_8859-10:1992",                                  0,  no }, /* IANA */
+  { 131, "csISOLatin6",                                       0,  no }, /* IANA */
   { 131, "latin6",                                            0,  no }, /* IANA */
-  { 132, "iso-8859-13",                                   28603,  no }, /* IANA */
-  { 133, "iso-8859-14",                                       0,  no }, /* IANA */
+  { 132, "ISO-8859-13",                                   28603,  no }, /* IANA */
+  { 133, "ISO-8859-14",                                       0,  no }, /* IANA */
   { 133, "iso-ir-199",                                        0,  no }, /* IANA */
   { 133, "iso-celtic",                                        0,  no }, /* IANA */
-  { 133, "iso_8859-14:1998",                                  0,  no }, /* IANA */
-  { 133, "iso_8859-14",                                       0,  no }, /* IANA */
+  { 133, "ISO_8859-14:1998",                                  0,  no }, /* IANA */
+  { 133, "ISO_8859-14",                                       0,  no }, /* IANA */
   { 133, "latin8",                                            0,  no }, /* IANA */
   { 133, "l8",                                                0,  no }, /* IANA */
-  { 134, "iso-8859-15",                                   28605,  no }, /* IANA */
-  { 134, "iso_8859-15",                                   28605,  no }, /* IANA */
-  { 134, "latin-9",                                       28605,  no }, /* IANA */
+  { 134, "ISO-8859-15",                                   28605,  no }, /* IANA */
+  { 134, "ISO_8859-15",                                   28605,  no }, /* IANA */
+  { 134, "Latin-9",                                       28605,  no }, /* IANA */
   { 134, "l9",                                            28605,  no }, /* MICROSOFT */
   { 134, "latin9",                                        28605,  no }, /* MICROSOFT */
-  { 135, "iso-8859-16",                                       0,  no }, /* IANA */
+  { 135, "ISO-8859-16",                                       0,  no }, /* IANA */
   { 135, "iso-ir-226",                                        0,  no }, /* IANA */
-  { 135, "iso_8859-16:2001",                                  0,  no }, /* IANA */
-  { 135, "iso_8859-16",                                       0,  no }, /* IANA */
+  { 135, "ISO_8859-16:2001",                                  0,  no }, /* IANA */
+  { 135, "ISO_8859-16",                                       0,  no }, /* IANA */
   { 135, "latin10",                                           0,  no }, /* IANA */
   { 135, "l10",                                               0,  no }, /* IANA */
-  { 136, "iso-8859-2-windows-latin-2",                        0,  no }, /* IANA */
-  { 136, "cswindows31latin2",                                 0,  no }, /* IANA */
-  { 137, "iso-8859-9-windows-latin-5",                        0,  no }, /* IANA */
-  { 137, "cswindows31latin5",                                 0,  no }, /* IANA */
+  { 136, "ISO-8859-2-Windows-Latin-2",                        0,  no }, /* IANA */
+  { 136, "csWindows31Latin2",                                 0,  no }, /* IANA */
+  { 137, "ISO-8859-9-Windows-Latin-5",                        0,  no }, /* IANA */
+  { 137, "csWindows31Latin5",                                 0,  no }, /* IANA */
   { 138, "iso-ir-90",                                         0,  no }, /* IANA */
-  { 138, "csiso90",                                           0,  no }, /* IANA */
-  { 139, "iso-unicode-ibm-1261",                              0,  no }, /* IANA */
-  { 139, "csunicodeibm1261",                                  0,  no }, /* IANA */
-  { 140, "iso-unicode-ibm-1264",                              0,  no }, /* IANA */
-  { 140, "csunicodeibm1264",                                  0,  no }, /* IANA */
-  { 141, "iso-unicode-ibm-1265",                              0,  no }, /* IANA */
-  { 141, "csunicodeibm1265",                                  0,  no }, /* IANA */
-  { 142, "iso-unicode-ibm-1268",                              0,  no }, /* IANA */
-  { 142, "csunicodeibm1268",                                  0,  no }, /* IANA */
-  { 143, "iso-unicode-ibm-1276",                              0,  no }, /* IANA */
-  { 143, "csunicodeibm1276",                                  0,  no }, /* IANA */
+  { 138, "csISO90",                                           0,  no }, /* IANA */
+  { 139, "ISO-Unicode-IBM-1261",                              0,  no }, /* IANA */
+  { 139, "csUnicodeIBM1261",                                  0,  no }, /* IANA */
+  { 140, "ISO-Unicode-IBM-1264",                              0,  no }, /* IANA */
+  { 140, "csUnicodeIBM1264",                                  0,  no }, /* IANA */
+  { 141, "ISO-Unicode-IBM-1265",                              0,  no }, /* IANA */
+  { 141, "csUnicodeIBM1265",                                  0,  no }, /* IANA */
+  { 142, "ISO-Unicode-IBM-1268",                              0,  no }, /* IANA */
+  { 142, "csUnicodeIBM1268",                                  0,  no }, /* IANA */
+  { 143, "ISO-Unicode-IBM-1276",                              0,  no }, /* IANA */
+  { 143, "csUnicodeIBM1276",                                  0,  no }, /* IANA */
   { 144, "iso-ir-155",                                        0,  no }, /* IANA */
-  { 144, "iso_10367-box",                                     0,  no }, /* IANA */
-  { 144, "csiso10367box",                                     0,  no }, /* IANA */
+  { 144, "ISO_10367-box",                                     0,  no }, /* IANA */
+  { 144, "csISO10367Box",                                     0,  no }, /* IANA */
   { 145, "iso-ir-98",                                         0,  no }, /* IANA */
-  { 145, "iso_2033-1983",                                     0,  no }, /* IANA */
+  { 145, "ISO_2033-1983",                                     0,  no }, /* IANA */
   { 145, "e13b",                                              0,  no }, /* IANA */
-  { 145, "csiso2033",                                         0,  no }, /* IANA */
+  { 145, "csISO2033",                                         0,  no }, /* IANA */
   { 146, "iso-ir-37",                                         0,  no }, /* IANA */
-  { 146, "iso_5427",                                          0,  no }, /* IANA */
-  { 146, "csiso5427cyrillic",                                 0,  no }, /* IANA */
+  { 146, "ISO_5427",                                          0,  no }, /* IANA */
+  { 146, "csISO5427Cyrillic",                                 0,  no }, /* IANA */
   { 147, "iso-ir-54",                                         0,  no }, /* IANA */
-  { 147, "iso_5427:1981",                                     0,  no }, /* IANA */
-  { 147, "iso5427cyrillic1981",                               0,  no }, /* IANA */
+  { 147, "ISO_5427:1981",                                     0,  no }, /* IANA */
+  { 147, "ISO5427Cyrillic1981",                               0,  no }, /* IANA */
   { 148, "iso-ir-55",                                         0,  no }, /* IANA */
-  { 148, "iso_5428:1980",                                     0,  no }, /* IANA */
-  { 148, "csiso5428greek",                                    0,  no }, /* IANA */
-  { 149, "iso_646.basic:1983",                                0,  no }, /* IANA */
+  { 148, "ISO_5428:1980",                                     0,  no }, /* IANA */
+  { 148, "csISO5428Greek",                                    0,  no }, /* IANA */
+  { 149, "ISO_646.basic:1983",                                0,  no }, /* IANA */
   { 149, "ref",                                               0,  no }, /* IANA */
-  { 149, "csiso646basic1983",                                 0,  no }, /* IANA */
+  { 149, "csISO646basic1983",                                 0,  no }, /* IANA */
   { 150, "iso-ir-2",                                      20105,  no }, /* IANA */
-  { 150, "iso_646.irv:1983",                              20105,  no }, /* IANA */
+  { 150, "ISO_646.irv:1983",                              20105,  no }, /* IANA */
   { 150, "irv",                                           20105,  no }, /* IANA */
-  { 150, "csiso2intlrefversion",                          20105,  no }, /* IANA */
+  { 150, "csISO2IntlRefVersion",                          20105,  no }, /* IANA */
   { 150, "x-ia5",                                         20105,  no }, /* MICROSOFT */
   { 151, "iso-ir-152",                                        0,  no }, /* IANA */
-  { 151, "iso_6937-2-25",                                     0,  no }, /* IANA */
-  { 151, "csiso6937add",                                      0,  no }, /* IANA */
+  { 151, "ISO_6937-2-25",                                     0,  no }, /* IANA */
+  { 151, "csISO6937Add",                                      0,  no }, /* IANA */
   { 152, "iso-ir-142",                                        0,  no }, /* IANA */
-  { 152, "iso_6937-2-add",                                    0,  no }, /* IANA */
-  { 152, "csisotextcomm",                                     0,  no }, /* IANA */
-  { 153, "iso-8859-1",                                    28591,  no }, /* IANA */
+  { 152, "ISO_6937-2-add",                                    0,  no }, /* IANA */
+  { 152, "csISOTextComm",                                     0,  no }, /* IANA */
+  { 153, "ISO-8859-1",                                    28591,  no }, /* IANA */
   { 153, "iso-ir-100",                                    28591,  no }, /* IANA */
-  { 153, "iso_8859-1:1987",                               28591,  no }, /* IANA */
-  { 153, "iso_8859-1",                                    28591,  no }, /* IANA */
+  { 153, "ISO_8859-1:1987",                               28591,  no }, /* IANA */
+  { 153, "ISO_8859-1",                                    28591,  no }, /* IANA */
   { 153, "latin1",                                        28591,  no }, /* IANA */
   { 153, "l1",                                            28591,  no }, /* IANA */
-  { 153, "ibm819",                                        28591,  no }, /* IANA */
-  { 153, "cp819",                                         28591,  no }, /* IANA */
-  { 153, "csisolatin1",                                   28591,  no }, /* IANA */
+  { 153, "IBM819",                                        28591,  no }, /* IANA */
+  { 153, "CP819",                                         28591,  no }, /* IANA */
+  { 153, "csISOLatin1",                                   28591,  no }, /* IANA */
   { 153, "iso8859-1",                                     28591,  no }, /* MICROSOFT */
-  { 154, "iso-8859-2",                                    28592,  no }, /* IANA */
+  { 154, "ISO-8859-2",                                    28592,  no }, /* IANA */
   { 154, "iso-ir-101",                                    28592,  no }, /* IANA */
-  { 154, "iso_8859-2:1987",                               28592,  no }, /* IANA */
-  { 154, "iso_8859-2",                                    28592,  no }, /* IANA */
+  { 154, "ISO_8859-2:1987",                               28592,  no }, /* IANA */
+  { 154, "ISO_8859-2",                                    28592,  no }, /* IANA */
   { 154, "latin2",                                        28592,  no }, /* IANA */
   { 154, "l2",                                            28592,  no }, /* IANA */
-  { 154, "csisolatin2",                                   28592,  no }, /* IANA */
+  { 154, "csISOLatin2",                                   28592,  no }, /* IANA */
   { 154, "iso8859-2",                                     28592,  no }, /* MICROSOFT */
-  { 155, "iso-8859-3",                                    28593,  no }, /* IANA */
+  { 155, "ISO-8859-3",                                    28593,  no }, /* IANA */
   { 155, "iso-ir-109",                                    28593,  no }, /* IANA */
-  { 155, "iso_8859-3:1988",                               28593,  no }, /* IANA */
-  { 155, "iso_8859-3",                                    28593,  no }, /* IANA */
+  { 155, "ISO_8859-3:1988",                               28593,  no }, /* IANA */
+  { 155, "ISO_8859-3",                                    28593,  no }, /* IANA */
   { 155, "latin3",                                        28593,  no }, /* IANA */
   { 155, "l3",                                            28593,  no }, /* IANA */
-  { 155, "csisolatin3",                                   28593,  no }, /* IANA */
-  { 156, "iso-8859-4",                                    28594,  no }, /* IANA */
+  { 155, "csISOLatin3",                                   28593,  no }, /* IANA */
+  { 156, "ISO-8859-4",                                    28594,  no }, /* IANA */
   { 156, "iso-ir-110",                                    28594,  no }, /* IANA */
-  { 156, "iso_8859-4:1988",                               28594,  no }, /* IANA */
-  { 156, "iso_8859-4",                                    28594,  no }, /* IANA */
+  { 156, "ISO_8859-4:1988",                               28594,  no }, /* IANA */
+  { 156, "ISO_8859-4",                                    28594,  no }, /* IANA */
   { 156, "latin4",                                        28594,  no }, /* IANA */
   { 156, "l4",                                            28594,  no }, /* IANA */
-  { 156, "csisolatin4",                                   28594,  no }, /* IANA */
-  { 157, "iso-8859-5",                                    28595,  no }, /* IANA */
+  { 156, "csISOLatin4",                                   28594,  no }, /* IANA */
+  { 157, "ISO-8859-5",                                    28595,  no }, /* IANA */
   { 157, "iso-ir-144",                                    28595,  no }, /* IANA */
-  { 157, "iso_8859-5:1988",                               28595,  no }, /* IANA */
-  { 157, "iso_8859-5",                                    28595,  no }, /* IANA */
+  { 157, "ISO_8859-5:1988",                               28595,  no }, /* IANA */
+  { 157, "ISO_8859-5",                                    28595,  no }, /* IANA */
   { 157, "cyrillic",                                      28595,  no }, /* IANA */
-  { 157, "csisolatincyrillic",                            28595,  no }, /* IANA */
-  { 158, "iso-8859-6-e",                                      0,  no }, /* IANA */
-  { 158, "iso_8859-6-e",                                      0,  no }, /* IANA */
-  { 158, "csiso88596e",                                       0,  no }, /* IANA */
-  { 159, "iso-8859-6-i",                                      0,  no }, /* IANA */
-  { 159, "iso_8859-6-i",                                      0,  no }, /* IANA */
-  { 159, "csiso88596i",                                       0,  no }, /* IANA */
-  { 160, "iso-8859-6",                                    28596,  no }, /* IANA */
+  { 157, "csISOLatinCyrillic",                            28595,  no }, /* IANA */
+  { 158, "ISO-8859-6-E",                                      0,  no }, /* IANA */
+  { 158, "ISO_8859-6-E",                                      0,  no }, /* IANA */
+  { 158, "csISO88596E",                                       0,  no }, /* IANA */
+  { 159, "ISO-8859-6-I",                                      0,  no }, /* IANA */
+  { 159, "ISO_8859-6-I",                                      0,  no }, /* IANA */
+  { 159, "csISO88596I",                                       0,  no }, /* IANA */
+  { 160, "ISO-8859-6",                                    28596,  no }, /* IANA */
   { 160, "iso-ir-127",                                    28596,  no }, /* IANA */
-  { 160, "iso_8859-6:1987",                               28596,  no }, /* IANA */
-  { 160, "iso_8859-6",                                    28596,  no }, /* IANA */
-  { 160, "ecma-114",                                      28596,  no }, /* IANA */
+  { 160, "ISO_8859-6:1987",                               28596,  no }, /* IANA */
+  { 160, "ISO_8859-6",                                    28596,  no }, /* IANA */
+  { 160, "ECMA-114",                                      28596,  no }, /* IANA */
   { 160, "arabic",                                        28596,  no }, /* IANA */
-  { 160, "csisolatinarabic",                              28596,  no }, /* IANA */
-  { 161, "iso-8859-7",                                    28597,  no }, /* IANA */
+  { 160, "csISOLatinArabic",                              28596,  no }, /* IANA */
+  { 161, "ISO-8859-7",                                    28597,  no }, /* IANA */
   { 161, "iso-ir-126",                                    28597,  no }, /* IANA */
-  { 161, "iso_8859-7:1987",                               28597,  no }, /* IANA */
-  { 161, "iso_8859-7",                                    28597,  no }, /* IANA */
-  { 161, "elot_928",                                      28597,  no }, /* IANA */
-  { 161, "ecma-118",                                      28597,  no }, /* IANA */
+  { 161, "ISO_8859-7:1987",                               28597,  no }, /* IANA */
+  { 161, "ISO_8859-7",                                    28597,  no }, /* IANA */
+  { 161, "ELOT_928",                                      28597,  no }, /* IANA */
+  { 161, "ECMA-118",                                      28597,  no }, /* IANA */
   { 161, "greek",                                         28597,  no }, /* IANA */
   { 161, "greek8",                                        28597,  no }, /* IANA */
-  { 161, "csisolatingreek",                               28597,  no }, /* IANA */
-  { 162, "iso-8859-8-e",                                      0,  no }, /* IANA */
-  { 162, "iso_8859-8-e",                                      0,  no }, /* IANA */
-  { 162, "csiso88598e",                                       0,  no }, /* IANA */
-  { 163, "iso-8859-8-i",                                  38598,  no }, /* IANA */
-  { 163, "iso_8859-8-i",                                  38598,  no }, /* IANA */
-  { 163, "csiso88598i",                                   38598,  no }, /* IANA */
-  { 164, "iso-8859-8",                                    28598,  no }, /* IANA */
+  { 161, "csISOLatinGreek",                               28597,  no }, /* IANA */
+  { 162, "ISO-8859-8-E",                                      0,  no }, /* IANA */
+  { 162, "ISO_8859-8-E",                                      0,  no }, /* IANA */
+  { 162, "csISO88598E",                                       0,  no }, /* IANA */
+  { 163, "ISO-8859-8-I",                                  38598,  no }, /* IANA */
+  { 163, "ISO_8859-8-I",                                  38598,  no }, /* IANA */
+  { 163, "csISO88598I",                                   38598,  no }, /* IANA */
+  { 164, "ISO-8859-8",                                    28598,  no }, /* IANA */
   { 164, "iso-ir-138",                                    28598,  no }, /* IANA */
-  { 164, "iso_8859-8:1988",                               28598,  no }, /* IANA */
-  { 164, "iso_8859-8",                                    28598,  no }, /* IANA */
+  { 164, "ISO_8859-8:1988",                               28598,  no }, /* IANA */
+  { 164, "ISO_8859-8",                                    28598,  no }, /* IANA */
   { 164, "hebrew",                                        28598,  no }, /* IANA */
-  { 164, "csisolatinhebrew",                              28598,  no }, /* IANA */
+  { 164, "csISOLatinHebrew",                              28598,  no }, /* IANA */
   { 164, "logical",                                       28598,  no }, /* MICROSOFT */
   { 164, "visual",                                        28598,  no }, /* MICROSOFT */
-  { 165, "iso-8859-9",                                    28599,  no }, /* IANA */
+  { 165, "ISO-8859-9",                                    28599,  no }, /* IANA */
   { 165, "iso-ir-148",                                    28599,  no }, /* IANA */
-  { 165, "iso_8859-9:1989",                               28599,  no }, /* IANA */
-  { 165, "iso_8859-9",                                    28599,  no }, /* IANA */
+  { 165, "ISO_8859-9:1989",                               28599,  no }, /* IANA */
+  { 165, "ISO_8859-9",                                    28599,  no }, /* IANA */
   { 165, "latin5",                                        28599,  no }, /* IANA */
   { 165, "l5",                                            28599,  no }, /* IANA */
-  { 165, "csisolatin5",                                   28599,  no }, /* IANA */
+  { 165, "csISOLatin5",                                   28599,  no }, /* IANA */
   { 166, "iso-ir-154",                                        0,  no }, /* IANA */
-  { 166, "iso_8859-supp",                                     0,  no }, /* IANA */
+  { 166, "ISO_8859-supp",                                     0,  no }, /* IANA */
   { 166, "latin1-2-5",                                        0,  no }, /* IANA */
-  { 166, "csiso8859supp",                                     0,  no }, /* IANA */
+  { 166, "csISO8859Supp",                                     0,  no }, /* IANA */
   { 167, "iso-ir-15",                                         0,  no }, /* IANA */
-  { 167, "it",                                                0,  no }, /* IANA */
-  { 167, "iso646-it",                                         0,  no }, /* IANA */
-  { 167, "csiso15italian",                                    0,  no }, /* IANA */
+  { 167, "IT",                                                0,  no }, /* IANA */
+  { 167, "ISO646-IT",                                         0,  no }, /* IANA */
+  { 167, "csISO15Italian",                                    0,  no }, /* IANA */
   { 168, "iso-ir-13",                                         0,  no }, /* IANA */
-  { 168, "jis_c6220-1969-jp",                                 0,  no }, /* IANA */
-  { 168, "jis_c6220-1969",                                    0,  no }, /* IANA */
+  { 168, "JIS_C6220-1969-jp",                                 0,  no }, /* IANA */
+  { 168, "JIS_C6220-1969",                                    0,  no }, /* IANA */
   { 168, "katakana",                                          0,  no }, /* IANA */
   { 168, "x0201-7",                                           0,  no }, /* IANA */
-  { 168, "csiso13jisc6220jp",                                 0,  no }, /* IANA */
+  { 168, "csISO13JISC6220jp",                                 0,  no }, /* IANA */
   { 169, "iso-ir-14",                                         0,  no }, /* IANA */
-  { 169, "jis_c6220-1969-ro",                                 0,  no }, /* IANA */
+  { 169, "JIS_C6220-1969-ro",                                 0,  no }, /* IANA */
   { 169, "jp",                                                0,  no }, /* IANA */
-  { 169, "iso646-jp",                                         0,  no }, /* IANA */
-  { 169, "csiso14jisc6220ro",                                 0,  no }, /* IANA */
+  { 169, "ISO646-JP",                                         0,  no }, /* IANA */
+  { 169, "csISO14JISC6220ro",                                 0,  no }, /* IANA */
   { 170, "iso-ir-42",                                         0,  no }, /* IANA */
-  { 170, "jis_c6226-1978",                                    0,  no }, /* IANA */
-  { 170, "csiso42jisc62261978",                               0,  no }, /* IANA */
+  { 170, "JIS_C6226-1978",                                    0,  no }, /* IANA */
+  { 170, "csISO42JISC62261978",                               0,  no }, /* IANA */
   { 171, "iso-ir-87",                                         0,  no }, /* IANA */
-  { 171, "jis_c6226-1983",                                    0,  no }, /* IANA */
+  { 171, "JIS_C6226-1983",                                    0,  no }, /* IANA */
   { 171, "x0208",                                             0,  no }, /* IANA */
-  { 171, "jis_x0208-1983",                                    0,  no }, /* IANA */
-  { 171, "csiso87jisx0208",                                   0,  no }, /* IANA */
+  { 171, "JIS_X0208-1983",                                    0,  no }, /* IANA */
+  { 171, "csISO87JISX0208",                                   0,  no }, /* IANA */
   { 172, "iso-ir-91",                                         0,  no }, /* IANA */
-  { 172, "jis_c6229-1984-a",                                  0,  no }, /* IANA */
+  { 172, "JIS_C6229-1984-a",                                  0,  no }, /* IANA */
   { 172, "jp-ocr-a",                                          0,  no }, /* IANA */
-  { 172, "csiso91jisc62291984a",                              0,  no }, /* IANA */
+  { 172, "csISO91JISC62291984a",                              0,  no }, /* IANA */
   { 173, "iso-ir-92",                                         0,  no }, /* IANA */
-  { 173, "jis_c6229-1984-b",                                  0,  no }, /* IANA */
-  { 173, "iso646-jp-ocr-b",                                   0,  no }, /* IANA */
+  { 173, "JIS_C6229-1984-b",                                  0,  no }, /* IANA */
+  { 173, "ISO646-JP-OCR-B",                                   0,  no }, /* IANA */
   { 173, "jp-ocr-b",                                          0,  no }, /* IANA */
-  { 173, "csiso92jisc62991984b",                              0,  no }, /* IANA */
+  { 173, "csISO92JISC62991984b",                              0,  no }, /* IANA */
   { 174, "iso-ir-93",                                         0,  no }, /* IANA */
-  { 174, "jis_c6229-1984-b-add",                              0,  no }, /* IANA */
+  { 174, "JIS_C6229-1984-b-add",                              0,  no }, /* IANA */
   { 174, "jp-ocr-b-add",                                      0,  no }, /* IANA */
-  { 174, "csiso93jis62291984badd",                            0,  no }, /* IANA */
+  { 174, "csISO93JIS62291984badd",                            0,  no }, /* IANA */
   { 175, "iso-ir-94",                                         0,  no }, /* IANA */
-  { 175, "jis_c6229-1984-hand",                               0,  no }, /* IANA */
+  { 175, "JIS_C6229-1984-hand",                               0,  no }, /* IANA */
   { 175, "jp-ocr-hand",                                       0,  no }, /* IANA */
-  { 175, "csiso94jis62291984hand",                            0,  no }, /* IANA */
+  { 175, "csISO94JIS62291984hand",                            0,  no }, /* IANA */
   { 176, "iso-ir-95",                                         0,  no }, /* IANA */
-  { 176, "jis_c6229-1984-hand-add",                           0,  no }, /* IANA */
+  { 176, "JIS_C6229-1984-hand-add",                           0,  no }, /* IANA */
   { 176, "jp-ocr-hand-add",                                   0,  no }, /* IANA */
-  { 176, "csiso95jis62291984handadd",                         0,  no }, /* IANA */
+  { 176, "csISO95JIS62291984handadd",                         0,  no }, /* IANA */
   { 177, "iso-ir-96",                                         0,  no }, /* IANA */
-  { 177, "jis_c6229-1984-kana",                               0,  no }, /* IANA */
-  { 177, "csiso96jisc62291984kana",                           0,  no }, /* IANA */
-  { 178, "jis_encoding",                                      0,  no }, /* IANA */
-  { 178, "csjisencoding",                                     0,  no }, /* IANA */
-  { 179, "jis_x0201",                                         0,  no }, /* IANA */
-  { 179, "x0201",                                             0,  no }, /* IANA */
-  { 179, "cshalfwidthkatakana",                               0,  no }, /* IANA */
+  { 177, "JIS_C6229-1984-kana",                               0,  no }, /* IANA */
+  { 177, "csISO96JISC62291984kana",                           0,  no }, /* IANA */
+  { 178, "JIS_Encoding",                                      0,  no }, /* IANA */
+  { 178, "csJISEncoding",                                     0,  no }, /* IANA */
+  { 179, "JIS_X0201",                                         0,  no }, /* IANA */
+  { 179, "X0201",                                             0,  no }, /* IANA */
+  { 179, "csHalfWidthKatakana",                               0,  no }, /* IANA */
   { 180, "iso-ir-159",                                        0,  no }, /* IANA */
-  { 180, "jis_x0212-1990",                                    0,  no }, /* IANA */
+  { 180, "JIS_X0212-1990",                                    0,  no }, /* IANA */
   { 180, "x0212",                                             0,  no }, /* IANA */
-  { 180, "csiso159jisx02121990",                              0,  no }, /* IANA */
+  { 180, "csISO159JISX02121990",                              0,  no }, /* IANA */
   { 181, "iso-ir-141",                                        0,  no }, /* IANA */
-  { 181, "jus_i.b1.002",                                      0,  no }, /* IANA */
-  { 181, "iso646-yu",                                         0,  no }, /* IANA */
+  { 181, "JUS_I.B1.002",                                      0,  no }, /* IANA */
+  { 181, "ISO646-YU",                                         0,  no }, /* IANA */
   { 181, "js",                                                0,  no }, /* IANA */
   { 181, "yu",                                                0,  no }, /* IANA */
-  { 181, "csiso141jusib1002",                                 0,  no }, /* IANA */
+  { 181, "csISO141JUSIB1002",                                 0,  no }, /* IANA */
   { 182, "iso-ir-147",                                        0,  no }, /* IANA */
-  { 182, "jus_i.b1.003-mac",                                  0,  no }, /* IANA */
+  { 182, "JUS_I.B1.003-mac",                                  0,  no }, /* IANA */
   { 182, "macedonian",                                        0,  no }, /* IANA */
-  { 182, "csiso147macedonian",                                0,  no }, /* IANA */
+  { 182, "csISO147Macedonian",                                0,  no }, /* IANA */
   { 183, "iso-ir-146",                                        0,  no }, /* IANA */
-  { 183, "jus_i.b1.003-serb",                                 0,  no }, /* IANA */
+  { 183, "JUS_I.B1.003-serb",                                 0,  no }, /* IANA */
   { 183, "serbian",                                           0,  no }, /* IANA */
-  { 183, "csiso146serbian",                                   0,  no }, /* IANA */
-  { 184, "koi8-r",                                        20866,  no }, /* IANA */
-  { 184, "cskoi8r",                                       20866,  no }, /* IANA */
+  { 183, "csISO146Serbian",                                   0,  no }, /* IANA */
+  { 184, "KOI8-R",                                        20866,  no }, /* IANA */
+  { 184, "csKOI8R",                                       20866,  no }, /* IANA */
   { 184, "koi8",                                          20866,  no }, /* MICROSOFT */
   { 184, "koi",                                           20866,  no }, /* MICROSOFT */
   { 184, "koi8r",                                         20866,  no }, /* MICROSOFT */
-  { 185, "koi8-u",                                        21866,  no }, /* IANA */
+  { 185, "KOI8-U",                                        21866,  no }, /* IANA */
   { 185, "koi8-ru",                                       21866,  no }, /* MICROSOFT */
   { 186, "iso-ir-149",                                      949,  no }, /* IANA */
-  { 186, "ks_c_5601-1987",                                  949,  no }, /* IANA */
-  { 186, "ks_c_5601-1989",                                  949,  no }, /* IANA */
-  { 186, "ksc_5601",                                        949,  no }, /* IANA */
+  { 186, "KS_C_5601-1987",                                  949,  no }, /* IANA */
+  { 186, "KS_C_5601-1989",                                  949,  no }, /* IANA */
+  { 186, "KSC_5601",                                        949,  no }, /* IANA */
   { 186, "korean",                                          949,  no }, /* IANA */
-  { 186, "csksc56011987",                                   949,  no }, /* IANA */
+  { 186, "csKSC56011987",                                   949,  no }, /* IANA */
   { 186, "ks_c_5601_1987",                                  949,  no }, /* MICROSOFT */
   { 186, "ksc5601",                                         949,  no }, /* MICROSOFT */
   { 186, "ks_c_5601",                                       949,  no }, /* MICROSOFT */
-  { 187, "ksc5636",                                           0,  no }, /* IANA */
-  { 187, "iso646-kr",                                         0,  no }, /* IANA */
-  { 187, "csksc5636",                                         0,  no }, /* IANA */
+  { 187, "KSC5636",                                           0,  no }, /* IANA */
+  { 187, "ISO646-KR",                                         0,  no }, /* IANA */
+  { 187, "csKSC5636",                                         0,  no }, /* IANA */
   { 188, "iso-ir-19",                                         0,  no }, /* IANA */
   { 188, "latin-greek",                                       0,  no }, /* IANA */
-  { 188, "csiso19latingreek",                                 0,  no }, /* IANA */
+  { 188, "csISO19LatinGreek",                                 0,  no }, /* IANA */
   { 189, "iso-ir-27",                                         0,  no }, /* IANA */
-  { 189, "latin-greek-1",                                     0,  no }, /* IANA */
-  { 189, "csiso27latingreek1",                                0,  no }, /* IANA */
+  { 189, "Latin-greek-1",                                     0,  no }, /* IANA */
+  { 189, "csISO27LatinGreek1",                                0,  no }, /* IANA */
   { 190, "iso-ir-158",                                        0,  no }, /* IANA */
   { 190, "latin-lap",                                         0,  no }, /* IANA */
   { 190, "lap",                                               0,  no }, /* IANA */
-  { 190, "csiso158lap",                                       0,  no }, /* IANA */
+  { 190, "csISO158Lap",                                       0,  no }, /* IANA */
   { 191, "macintosh",                                     10000,  no }, /* IANA */
   { 191, "mac",                                           10000,  no }, /* IANA */
-  { 191, "csmacintosh",                                   10000,  no }, /* IANA */
-  { 192, "microsoft-publishing",                              0,  no }, /* IANA */
-  { 192, "csmicrosoftpublishing",                             0,  no }, /* IANA */
-  { 193, "mnem",                                              0,  no }, /* IANA */
-  { 193, "csmnem",                                            0,  no }, /* IANA */
-  { 194, "mnemonic",                                          0,  no }, /* IANA */
-  { 194, "csmnemonic",                                        0,  no }, /* IANA */
+  { 191, "csMacintosh",                                   10000,  no }, /* IANA */
+  { 192, "Microsoft-Publishing",                              0,  no }, /* IANA */
+  { 192, "csMicrosoftPublishing",                             0,  no }, /* IANA */
+  { 193, "MNEM",                                              0,  no }, /* IANA */
+  { 193, "csMnem",                                            0,  no }, /* IANA */
+  { 194, "MNEMONIC",                                          0,  no }, /* IANA */
+  { 194, "csMnemonic",                                        0,  no }, /* IANA */
   { 195, "iso-ir-86",                                         0,  no }, /* IANA */
-  { 195, "msz_7795.3",                                        0,  no }, /* IANA */
-  { 195, "iso646-hu",                                         0,  no }, /* IANA */
+  { 195, "MSZ_7795.3",                                        0,  no }, /* IANA */
+  { 195, "ISO646-HU",                                         0,  no }, /* IANA */
   { 195, "hu",                                                0,  no }, /* IANA */
-  { 195, "csiso86hungarian",                                  0,  no }, /* IANA */
+  { 195, "csISO86Hungarian",                                  0,  no }, /* IANA */
   { 196, "iso-ir-9-1",                                        0,  no }, /* IANA */
-  { 196, "nats-dano",                                         0,  no }, /* IANA */
-  { 196, "csnatsdano",                                        0,  no }, /* IANA */
+  { 196, "NATS-DANO",                                         0,  no }, /* IANA */
+  { 196, "csNATSDANO",                                        0,  no }, /* IANA */
   { 197, "iso-ir-9-2",                                        0,  no }, /* IANA */
-  { 197, "nats-dano-add",                                     0,  no }, /* IANA */
-  { 197, "csnatsdanoadd",                                     0,  no }, /* IANA */
+  { 197, "NATS-DANO-ADD",                                     0,  no }, /* IANA */
+  { 197, "csNATSDANOADD",                                     0,  no }, /* IANA */
   { 198, "iso-ir-8-1",                                        0,  no }, /* IANA */
-  { 198, "nats-sefi",                                         0,  no }, /* IANA */
-  { 198, "csnatssefi",                                        0,  no }, /* IANA */
+  { 198, "NATS-SEFI",                                         0,  no }, /* IANA */
+  { 198, "csNATSSEFI",                                        0,  no }, /* IANA */
   { 199, "iso-ir-8-2",                                        0,  no }, /* IANA */
-  { 199, "nats-sefi-add",                                     0,  no }, /* IANA */
-  { 199, "csnatssefiadd",                                     0,  no }, /* IANA */
+  { 199, "NATS-SEFI-ADD",                                     0,  no }, /* IANA */
+  { 199, "csNATSSEFIADD",                                     0,  no }, /* IANA */
   { 200, "iso-ir-151",                                        0,  no }, /* IANA */
-  { 200, "nc_nc00-10:81",                                     0,  no }, /* IANA */
+  { 200, "NC_NC00-10:81",                                     0,  no }, /* IANA */
   { 200, "cuba",                                              0,  no }, /* IANA */
-  { 200, "iso646-cu",                                         0,  no }, /* IANA */
-  { 200, "csiso151cuba",                                      0,  no }, /* IANA */
+  { 200, "ISO646-CU",                                         0,  no }, /* IANA */
+  { 200, "csISO151Cuba",                                      0,  no }, /* IANA */
   { 201, "iso-ir-69",                                         0,  no }, /* IANA */
-  { 201, "nf_z_62-010",                                       0,  no }, /* IANA */
-  { 201, "iso646-fr",                                         0,  no }, /* IANA */
+  { 201, "NF_Z_62-010",                                       0,  no }, /* IANA */
+  { 201, "ISO646-FR",                                         0,  no }, /* IANA */
   { 201, "fr",                                                0,  no }, /* IANA */
-  { 201, "csiso69french",                                     0,  no }, /* IANA */
+  { 201, "csISO69French",                                     0,  no }, /* IANA */
   { 202, "iso-ir-25",                                         0,  no }, /* IANA */
-  { 202, "nf_z_62-010_(1973)",                                0,  no }, /* IANA */
-  { 202, "iso646-fr1",                                        0,  no }, /* IANA */
-  { 202, "csiso25french",                                     0,  no }, /* IANA */
+  { 202, "NF_Z_62-010_(1973)",                                0,  no }, /* IANA */
+  { 202, "ISO646-FR1",                                        0,  no }, /* IANA */
+  { 202, "csISO25French",                                     0,  no }, /* IANA */
   { 203, "iso-ir-60",                                     20108,  no }, /* IANA */
-  { 203, "ns_4551-1",                                     20108,  no }, /* IANA */
-  { 203, "iso646-no",                                     20108,  no }, /* IANA */
+  { 203, "NS_4551-1",                                     20108,  no }, /* IANA */
+  { 203, "ISO646-NO",                                     20108,  no }, /* IANA */
   { 203, "no",                                            20108,  no }, /* IANA */
-  { 203, "csiso60danishnorwegian",                        20108,  no }, /* IANA */
-  { 203, "csiso60norwegian1",                             20108,  no }, /* IANA */
+  { 203, "csISO60DanishNorwegian",                        20108,  no }, /* IANA */
+  { 203, "csISO60Norwegian1",                             20108,  no }, /* IANA */
   { 203, "x-ia5-norwegian",                               20108,  no }, /* MICROSOFT */
   { 204, "iso-ir-61",                                         0,  no }, /* IANA */
-  { 204, "ns_4551-2",                                         0,  no }, /* IANA */
-  { 204, "iso646-no2",                                        0,  no }, /* IANA */
+  { 204, "NS_4551-2",                                         0,  no }, /* IANA */
+  { 204, "ISO646-NO2",                                        0,  no }, /* IANA */
   { 204, "no2",                                               0,  no }, /* IANA */
-  { 204, "csiso61norwegian2",                                 0,  no }, /* IANA */
-  { 205, "pc8-danish-norwegian",                              0,  no }, /* IANA */
-  { 205, "cspc8danishnorwegian",                              0,  no }, /* IANA */
-  { 206, "pc8-turkish",                                       0,  no }, /* IANA */
-  { 206, "cspc8turkish",                                      0,  no }, /* IANA */
+  { 204, "csISO61Norwegian2",                                 0,  no }, /* IANA */
+  { 205, "PC8-Danish-Norwegian",                              0,  no }, /* IANA */
+  { 205, "csPC8DanishNorwegian",                              0,  no }, /* IANA */
+  { 206, "PC8-Turkish",                                       0,  no }, /* IANA */
+  { 206, "csPC8Turkish",                                      0,  no }, /* IANA */
   { 207, "iso-ir-16",                                         0,  no }, /* IANA */
-  { 207, "pt",                                                0,  no }, /* IANA */
-  { 207, "iso646-pt",                                         0,  no }, /* IANA */
-  { 207, "csiso16portuguese",                                 0,  no }, /* IANA */
+  { 207, "PT",                                                0,  no }, /* IANA */
+  { 207, "ISO646-PT",                                         0,  no }, /* IANA */
+  { 207, "csISO16Portuguese",                                 0,  no }, /* IANA */
   { 208, "iso-ir-84",                                         0,  no }, /* IANA */
-  { 208, "pt2",                                               0,  no }, /* IANA */
-  { 208, "iso646-pt2",                                        0,  no }, /* IANA */
-  { 208, "csiso84portuguese2",                                0,  no }, /* IANA */
-  { 209, "ptcp154",                                           0,  no }, /* IANA */
-  { 209, "csptcp154",                                         0,  no }, /* IANA */
-  { 209, "pt154",                                             0,  no }, /* IANA */
-  { 209, "cp154",                                             0,  no }, /* IANA */
-  { 209, "cyrillic-asian",                                    0,  no }, /* IANA */
-  { 210, "scsu",                                              0,  no }, /* IANA */
+  { 208, "PT2",                                               0,  no }, /* IANA */
+  { 208, "ISO646-PT2",                                        0,  no }, /* IANA */
+  { 208, "csISO84Portuguese2",                                0,  no }, /* IANA */
+  { 209, "PTCP154",                                           0,  no }, /* IANA */
+  { 209, "csPTCP154",                                         0,  no }, /* IANA */
+  { 209, "PT154",                                             0,  no }, /* IANA */
+  { 209, "CP154",                                             0,  no }, /* IANA */
+  { 209, "Cyrillic-Asian",                                    0,  no }, /* IANA */
+  { 210, "SCSU",                                              0,  no }, /* IANA */
   { 211, "iso-ir-10",                                     20107,  no }, /* IANA */
-  { 211, "sen_850200_b",                                  20107,  no }, /* IANA */
-  { 211, "fi",                                            20107,  no }, /* IANA */
-  { 211, "iso646-fi",                                     20107,  no }, /* IANA */
-  { 211, "iso646-se",                                     20107,  no }, /* IANA */
+  { 211, "SEN_850200_B",                                  20107,  no }, /* IANA */
+  { 211, "FI",                                            20107,  no }, /* IANA */
+  { 211, "ISO646-FI",                                     20107,  no }, /* IANA */
+  { 211, "ISO646-SE",                                     20107,  no }, /* IANA */
   { 211, "se",                                            20107,  no }, /* IANA */
-  { 211, "csiso10swedish",                                20107,  no }, /* IANA */
+  { 211, "csISO10Swedish",                                20107,  no }, /* IANA */
   { 211, "x-ia5-swedish",                                 20107,  no }, /* MICROSOFT */
   { 212, "iso-ir-11",                                         0,  no }, /* IANA */
-  { 212, "sen_850200_c",                                      0,  no }, /* IANA */
-  { 212, "iso646-se2",                                        0,  no }, /* IANA */
+  { 212, "SEN_850200_C",                                      0,  no }, /* IANA */
+  { 212, "ISO646-SE2",                                        0,  no }, /* IANA */
   { 212, "se2",                                               0,  no }, /* IANA */
-  { 212, "csiso11swedishfornames",                            0,  no }, /* IANA */
-  { 213, "shift_jis",                                       932,  no }, /* IANA */
-  { 213, "ms_kanji",                                        932,  no }, /* IANA */
-  { 213, "csshiftjis",                                      932,  no }, /* IANA */
+  { 212, "csISO11SwedishForNames",                            0,  no }, /* IANA */
+  { 213, "Shift_JIS",                                       932,  no }, /* IANA */
+  { 213, "MS_Kanji",                                        932,  no }, /* IANA */
+  { 213, "csShiftJIS",                                      932,  no }, /* IANA */
   { 213, "shift-jis",                                       932,  no }, /* MICROSOFT */
   { 213, "x-ms-cp932",                                      932,  no }, /* MICROSOFT */
   { 213, "x-sjis",                                          932,  no }, /* MICROSOFT */
   { 213, "cp932",                                           932,  no },
   { 213, "sjis",                                            932,  no },
   { 214, "iso-ir-128",                                        0,  no }, /* IANA */
-  { 214, "t.101-g2",                                          0,  no }, /* IANA */
-  { 214, "csiso128t101g2",                                    0,  no }, /* IANA */
+  { 214, "T.101-G2",                                          0,  no }, /* IANA */
+  { 214, "csISO128T101G2",                                    0,  no }, /* IANA */
   { 215, "iso-ir-102",                                        0,  no }, /* IANA */
-  { 215, "t.61-7bit",                                         0,  no }, /* IANA */
-  { 215, "csiso102t617bit",                                   0,  no }, /* IANA */
+  { 215, "T.61-7bit",                                         0,  no }, /* IANA */
+  { 215, "csISO102T617bit",                                   0,  no }, /* IANA */
   { 216, "iso-ir-103",                                        0,  no }, /* IANA */
-  { 216, "t.61-8bit",                                         0,  no }, /* IANA */
-  { 216, "t.61",                                              0,  no }, /* IANA */
-  { 216, "csiso103t618bit",                                   0,  no }, /* IANA */
-  { 217, "tis-620",                                         874,  no }, /* IANA */
-  { 217, "windows-874",                                     874,  no }, /* MICROSOFT */
-  { 217, "iso-8859-11",                                     874,  no }, /* MICROSOFT */
+  { 216, "T.61-8bit",                                         0,  no }, /* IANA */
+  { 216, "T.61",                                              0,  no }, /* IANA */
+  { 216, "csISO103T618bit",                                   0,  no }, /* IANA */
+  { 217, "TIS-620",                                         874,  no }, /* IANA */
+  { 217, "Windows-874",                                     874,  no }, /* MICROSOFT */
+  { 217, "ISO-8859-11",                                     874,  no }, /* MICROSOFT */
   { 217, "dos-874",                                         874,  no }, /* MICROSOFT */
-  { 218, "unicode-1-1",                                       0,  no }, /* IANA */
-  { 218, "csunicode11",                                       0,  no }, /* IANA */
-  { 219, "unicode-1-1-utf-7",                             65000, yes }, /* IANA */
-  { 219, "csunicode11utf7",                               65000, yes }, /* IANA */
+  { 218, "UNICODE-1-1",                                       0,  no }, /* IANA */
+  { 218, "csUnicode11",                                       0,  no }, /* IANA */
+  { 219, "UNICODE-1-1-UTF-7",                             65000, yes }, /* IANA */
+  { 219, "csUnicode11UTF7",                               65000, yes }, /* IANA */
   { 219, "x-unicode-2-0-utf-7",                           65000, yes }, /* MICROSOFT */
-  { 220, "unknown-8bit",                                      0,  no }, /* IANA */
-  { 220, "csunknown8bit",                                     0,  no }, /* IANA */
+  { 220, "UNKNOWN-8BIT",                                      0,  no }, /* IANA */
+  { 220, "csUnknown8BiT",                                     0,  no }, /* IANA */
   { 221, "us-dk",                                             0,  no }, /* IANA */
-  { 221, "csusdk",                                            0,  no }, /* IANA */
-  { 222, "utf-16",                                         1200,  no }, /* IANA */
-  { 222, "unicode",                                        1200,  no }, /* MICROSOFT */
-  { 223, "utf-16be",                                       1201,  no }, /* IANA */
-  { 223, "unicodefffe",                                    1201,  no }, /* MICROSOFT */
-  { 224, "utf-16le",                                       1200,  no }, /* IANA */
-  { 224, "unicode",                                        1200,  no }, /* MICROSOFT */
-  { 225, "utf-32",                                            0,  no }, /* IANA */
-  { 226, "utf-32be",                                          0,  no }, /* IANA */
-  { 227, "utf-32le",                                          0,  no }, /* IANA */
-  { 228, "utf-7",                                         65000, yes }, /* IANA */
+  { 221, "csUSDK",                                            0,  no }, /* IANA */
+  { 222, "UTF-16",                                         1200,  no }, /* IANA */
+  { 222, "Unicode",                                        1200,  no }, /* MICROSOFT */
+  { 223, "UTF-16BE",                                       1201,  no }, /* IANA */
+  { 223, "UnicodeFFFE",                                    1201,  no }, /* MICROSOFT */
+  { 224, "UTF-16LE",                                       1200,  no }, /* IANA */
+  { 224, "Unicode",                                        1200,  no }, /* MICROSOFT */
+  { 225, "UTF-32",                                            0,  no }, /* IANA */
+  { 226, "UTF-32BE",                                          0,  no }, /* IANA */
+  { 227, "UTF-32LE",                                          0,  no }, /* IANA */
+  { 228, "UTF-7",                                         65000, yes }, /* IANA */
   { 228, "x-unicode-2-0-utf-7",                           65000, yes }, /* MICROSOFT */
-  { 229, "utf-8",                                         65001,  no }, /* IANA */
+  { 229, "UTF-8",                                         65001,  no }, /* IANA */
   { 229, "unicode-2-0-utf-8",                             65001,  no }, /* MICROSOFT */
   { 229, "unicode-1-1-utf-8",                             65001,  no }, /* MICROSOFT */
   { 229, "x-unicode-2-0-utf-8",                           65001,  no }, /* MICROSOFT */
-  { 230, "ventura-international",                             0,  no }, /* IANA */
-  { 230, "csventurainternational",                            0,  no }, /* IANA */
-  { 231, "ventura-math",                                      0,  no }, /* IANA */
-  { 231, "csventuramath",                                     0,  no }, /* IANA */
-  { 232, "ventura-us",                                        0,  no }, /* IANA */
-  { 232, "csventuraus",                                       0,  no }, /* IANA */
+  { 230, "Ventura-International",                             0,  no }, /* IANA */
+  { 230, "csVenturaInternational",                            0,  no }, /* IANA */
+  { 231, "Ventura-Math",                                      0,  no }, /* IANA */
+  { 231, "csVenturaMath",                                     0,  no }, /* IANA */
+  { 232, "Ventura-US",                                        0,  no }, /* IANA */
+  { 232, "csVenturaUS",                                       0,  no }, /* IANA */
   { 233, "iso-ir-70",                                         0,  no }, /* IANA */
   { 233, "videotex-suppl",                                    0,  no }, /* IANA */
-  { 233, "csiso70videotexsupp1",                              0,  no }, /* IANA */
-  { 234, "viqr",                                              0,  no }, /* IANA */
-  { 234, "csviqr",                                            0,  no }, /* IANA */
-  { 235, "viscii",                                            0,  no }, /* IANA */
-  { 235, "csviscii",                                          0,  no }, /* IANA */
-  { 236, "windows-1250",                                   1250,  no }, /* IANA */
+  { 233, "csISO70VideotexSupp1",                              0,  no }, /* IANA */
+  { 234, "VIQR",                                              0,  no }, /* IANA */
+  { 234, "csVIQR",                                            0,  no }, /* IANA */
+  { 235, "VISCII",                                            0,  no }, /* IANA */
+  { 235, "csVISCII",                                          0,  no }, /* IANA */
+  { 236, "Windows-1250",                                   1250,  no }, /* IANA */
   { 236, "x-cp1250",                                       1250,  no }, /* MICROSOFT */
-  { 237, "windows-1251",                                   1251,  no }, /* IANA */
+  { 237, "Windows-1251",                                   1251,  no }, /* IANA */
   { 237, "x-cp1251",                                       1251,  no }, /* MICROSOFT */
-  { 238, "windows-1252",                                   1252,  no }, /* IANA */
+  { 238, "Windows-1252",                                   1252,  no }, /* IANA */
   { 238, "x-ansi",                                         1252,  no }, /* MICROSOFT */
-  { 239, "windows-1253",                                   1253,  no }, /* IANA */
-  { 240, "windows-1254",                                   1254,  no }, /* IANA */
-  { 241, "windows-1255",                                   1255,  no }, /* IANA */
-  { 242, "windows-1256",                                   1256,  no }, /* IANA */
+  { 239, "Windows-1253",                                   1253,  no }, /* IANA */
+  { 240, "Windows-1254",                                   1254,  no }, /* IANA */
+  { 241, "Windows-1255",                                   1255,  no }, /* IANA */
+  { 242, "Windows-1256",                                   1256,  no }, /* IANA */
   { 242, "cp1256",                                         1256,  no }, /* MICROSOFT */
-  { 243, "windows-1257",                                   1257,  no }, /* IANA */
-  { 244, "windows-1258",                                   1258,  no }, /* IANA */
-  { 245, "windows-31j",                                     932,  no }, /* IANA */
-  { 245, "cswindows31j",                                    932,  no }, /* IANA */
+  { 243, "Windows-1257",                                   1257,  no }, /* IANA */
+  { 244, "Windows-1258",                                   1258,  no }, /* IANA */
+  { 245, "Windows-31J",                                     932,  no }, /* IANA */
+  { 245, "csWindows31J",                                    932,  no }, /* IANA */
   { 245, "shift-jis",                                       932,  no }, /* MICROSOFT */
   { 245, "x-ms-cp932",                                      932,  no }, /* MICROSOFT */
   { 245, "x-sjis",                                          932,  no }, /* MICROSOFT */
@@ -960,7 +960,7 @@ static struct _charsetInfo
   { 282, "x-mac-korean",                                  10003,  no }, /* MICROSOFT */
   { 283, "x-mac-turkish",                                 10081,  no }, /* MICROSOFT */
   { 284, "cp20932",                                       20932,  no }, /* MICROSOFT */
-  { 285, "asmo-708",                                        708,  no }, /* IANA */
+  { 285, "ASMO-708",                                        708,  no }, /* IANA */
 
   /* final entry */
   {   0, NULL,                                                0,  no }
index 87f4393..c5f14c8 100644 (file)
@@ -1620,8 +1620,8 @@ msgstr "إل&غاء"
 msgid "Test Filter"
 msgstr "فحص المرشح"
 
-msgid "Testing filter..."
-msgstr "يتم فحص المرشح..."
+msgid "Testing filter:"
+msgstr "يتم فحص المرشح:"
 
 msgid "&Enter text to test:"
 msgstr "إدخال ا&لنص للفحص:"
index d69afc0..528d77f 100644 (file)
@@ -2085,8 +2085,8 @@ msgstr "E&zeztatu"
 msgid "Test Filter"
 msgstr "Azterketa Iragazkia"
 
-msgid "Testing filter..."
-msgstr "Iragazkia aztertzen..."
+msgid "Testing filter:"
+msgstr "Iragazkia aztertzen:"
 
 #, c-format
 msgid "&Enter text to test:"
index ff8e2fc..34664ec 100644 (file)
@@ -2089,8 +2089,8 @@ msgstr "&Cancelar"
 msgid "Test Filter"
 msgstr "Testar Filtro"
 
-msgid "Testing filter..."
-msgstr "Testando o filtro..."
+msgid "Testing filter:"
+msgstr "Testando o filtro:"
 
 #, c-format
 msgid "&Enter text to test:"
index 88d6c8d..74d9189 100644 (file)
@@ -1614,8 +1614,8 @@ msgstr "&Отменяне"
 msgid "Test Filter"
 msgstr "Изпробване на филтър"
 
-msgid "Testing filter..."
-msgstr "Изпробване на филтър"
+msgid "Testing filter:"
+msgstr "Изпробване на филтър:"
 
 msgid "&Enter text to test:"
 msgstr "&Въведете текст за изпробване:"
index 8293624..7006302 100644 (file)
@@ -2078,8 +2078,8 @@ msgstr "&Cancel·la"
 msgid "Test Filter"
 msgstr "Prova de filtre"
 
-msgid "Testing filter..."
-msgstr "Provant el filtre..."
+msgid "Testing filter:"
+msgstr "Provant el filtre:"
 
 #, c-format
 msgid "&Enter text to test:"
index 8595ec4..52b4b42 100644 (file)
@@ -1620,8 +1620,8 @@ msgstr "取消(&C)"
 msgid "Test Filter"
 msgstr "测试过滤器"
 
-msgid "Testing filter..."
-msgstr "正在测试过滤器..."
+msgid "Testing filter:"
+msgstr "正在测试过滤器:"
 
 msgid "&Enter text to test:"
 msgstr "输入用以测试的文本(&E):"
index 20b192d..a68e650 100644 (file)
@@ -2094,8 +2094,8 @@ msgstr "取消(&C)"
 msgid "Test Filter"
 msgstr "測試篩選器"
 
-msgid "Testing filter..."
-msgstr "測試篩選器..."
+msgid "Testing filter:"
+msgstr "測試篩選器:"
 
 #, c-format
 msgid "&Enter text to test:"
index ffe8b54..ecb4acc 100644 (file)
@@ -2083,8 +2083,8 @@ msgstr "&Odustajem"
 msgid "Test Filter"
 msgstr "Test filtar"
 
-msgid "Testing filter..."
-msgstr "Testiranje filtra..."
+msgid "Testing filter:"
+msgstr "Testiranje filtra:"
 
 #, c-format
 msgid "&Enter text to test:"
index 2971af6..a60b0a3 100644 (file)
@@ -2081,8 +2081,8 @@ msgstr "Storno"
 msgid "Test Filter"
 msgstr "Zkouška filtru"
 
-msgid "Testing filter..."
-msgstr "Zkouška filtru..."
+msgid "Testing filter:"
+msgstr "Zkouška filtru:"
 
 #, c-format
 msgid "&Enter text to test:"
index e71076a..c746fbd 100644 (file)
@@ -2090,8 +2090,8 @@ msgstr "&Annuller"
 msgid "Test Filter"
 msgstr "Test Filter"
 
-msgid "Testing filter..."
-msgstr "Tester filter..."
+msgid "Testing filter:"
+msgstr "Tester filter:"
 
 #, c-format
 msgid "&Enter text to test:"
index 73fef4c..e3ae6cc 100644 (file)
@@ -1621,8 +1621,8 @@ msgstr "Annuleren"
 msgid "Test Filter"
 msgstr "Filter testen"
 
-msgid "Testing filter..."
-msgstr "Filter testen..."
+msgid "Testing filter:"
+msgstr "Filter testen:"
 
 msgid "&Enter text to test:"
 msgstr "Tekst opgeven om te testen:"
index 557453f..e6bbd02 100644 (file)
@@ -1599,7 +1599,7 @@ msgstr ""
 msgid "Test Filter"
 msgstr ""
 
-msgid "Testing filter..."
+msgid "Testing filter:"
 msgstr ""
 
 msgid "&Enter text to test:"
index 85c5eee..3e69799 100644 (file)
@@ -2089,8 +2089,8 @@ msgid "Test Filter"
 msgstr "Testaa suodin"
 
 #, c-format
-msgid "Testing filter..."
-msgstr "Testataan suodinta..."
+msgid "Testing filter:"
+msgstr "Testataan suodinta:"
 
 #, c-format
 msgid "&Enter text to test:"
index bb19a81..ed9581b 100644 (file)
@@ -2100,8 +2100,8 @@ msgstr "Ann&uler"
 msgid "Test Filter"
 msgstr "Filtre de test"
 
-msgid "Testing filter..."
-msgstr "Tester le filtre..."
+msgid "Testing filter:"
+msgstr "Tester le filtre:"
 
 #, c-format
 msgid "&Enter text to test:"
index fcd41e3..49f3efb 100644 (file)
@@ -2087,8 +2087,8 @@ msgstr "&Cancelar"
 msgid "Test Filter"
 msgstr "Probar filtro"
 
-msgid "Testing filter..."
-msgstr "Probando filtro"
+msgid "Testing filter:"
+msgstr "Probando filtro:"
 
 #, c-format
 msgid "&Enter text to test:"
index 83a2d7c..57977d1 100644 (file)
@@ -2079,8 +2079,8 @@ msgstr "&Abbrechen"
 msgid "Test Filter"
 msgstr "Filter testen"
 
-msgid "Testing filter..."
-msgstr "Filter testen..."
+msgid "Testing filter:"
+msgstr "Filter testen:"
 
 #, c-format
 msgid "&Enter text to test:"
index be1800b..1be6201 100644 (file)
@@ -2078,8 +2078,8 @@ msgstr "Ά&κυρο"
 msgid "Test Filter"
 msgstr "Δοκιμή Φίλτρου"
 
-msgid "Testing filter..."
-msgstr "Δοκιμή Φίλτρου..."
+msgid "Testing filter:"
+msgstr "Δοκιμή Φίλτρου:"
 
 #, c-format
 msgid "&Enter text to test:"
index d67f939..a9af041 100644 (file)
@@ -2079,7 +2079,7 @@ msgstr "&Mégsem"
 msgid "Test Filter"
 msgstr ""
 
-msgid "Testing filter..."
+msgid "Testing filter:"
 msgstr ""
 
 #, c-format
index ef50bb5..e0d1239 100644 (file)
@@ -1619,8 +1619,8 @@ msgstr "Annu&lla"
 msgid "Test Filter"
 msgstr "Verifica filtro"
 
-msgid "Testing filter..."
-msgstr "Verifica filtro in corso..."
+msgid "Testing filter:"
+msgstr "Verifica filtro in corso:"
 
 msgid "&Enter text to test:"
 msgstr "&Inserire il testo di prova:"
index 18e78da..b288118 100644 (file)
@@ -1623,8 +1623,8 @@ msgstr "キャンセル(&C)"
 msgid "Test Filter"
 msgstr "フィルタのテスト"
 
-msgid "Testing filter..."
-msgstr "テストするフィル..."
+msgid "Testing filter:"
+msgstr "テストするフィルタ:"
 
 msgid "&Enter text to test:"
 msgstr "テストするテキストの入力(&E):"
index 7524d8a..16b0c1e 100644 (file)
@@ -2091,8 +2091,8 @@ msgstr "취소(&C)"
 msgid "Test Filter"
 msgstr "필터 테스트"
 
-msgid "Testing filter..."
-msgstr "필터 테스트 중..."
+msgid "Testing filter:"
+msgstr "필터 테스트 중:"
 
 #, c-format
 msgid "&Enter text to test:"
index 06d9331..394380c 100644 (file)
@@ -1608,8 +1608,8 @@ msgstr "&Atsisakyti"
 msgid "Test Filter"
 msgstr "Testuoti filtrą"
 
-msgid "Testing filter..."
-msgstr "Testuojamas filtras..."
+msgid "Testing filter:"
+msgstr "Testuojamas filtras:"
 
 msgid "&Enter text to test:"
 msgstr "Įv&eskite tekstą patikrinimui:"
index 06f7ae7..8252810 100644 (file)
@@ -2083,8 +2083,8 @@ msgstr "&Avbryt"
 msgid "Test Filter"
 msgstr "Test filter"
 
-msgid "Testing filter..."
-msgstr "Tester filter..."
+msgid "Testing filter:"
+msgstr "Tester filter:"
 
 #, c-format
 msgid "&Enter text to test:"
index 0be566f..47fc719 100644 (file)
@@ -2092,8 +2092,8 @@ msgstr "&C لغو "
 msgid "Test Filter"
 msgstr " آزمايش صافي "
 
-msgid "Testing filter..."
-msgstr " آزمايش صافي... "
+msgid "Testing filter:"
+msgstr " آزمايش صافي: "
 
 #, c-format
 msgid "&Enter text to test:"
index 2e5a75e..842466a 100644 (file)
@@ -1606,8 +1606,8 @@ msgstr "Anuluj"
 msgid "Test Filter"
 msgstr "Testuj filtr"
 
-msgid "Testing filter..."
-msgstr "Testowanie filtra ..."
+msgid "Testing filter:"
+msgstr "Testowanie filtra:"
 
 msgid "&Enter text to test:"
 msgstr "Podaj tekst do sprawdzenia:"
index c3c1f6f..94ee827 100644 (file)
@@ -2089,8 +2089,8 @@ msgstr "Cancelar"
 msgid "Test Filter"
 msgstr "Testar filtro"
 
-msgid "Testing filter..."
-msgstr "A testar filtro..."
+msgid "Testing filter:"
+msgstr "A testar filtro:"
 
 #, c-format
 msgid "&Enter text to test:"
index ce95e99..9a08f0c 100644 (file)
@@ -2079,8 +2079,8 @@ msgstr "&Renunţă"
 msgid "Test Filter"
 msgstr "Testează filtru"
 
-msgid "Testing filter..."
-msgstr "Testare filtru..."
+msgid "Testing filter:"
+msgstr "Testare filtru:"
 
 #, c-format
 msgid "&Enter text to test:"
index 0234f38..9f2d073 100644 (file)
@@ -1610,8 +1610,8 @@ msgstr "&Отмена"
 msgid "Test Filter"
 msgstr "Тест фильтра"
 
-msgid "Testing filter..."
-msgstr "Тестировать фильтр ..."
+msgid "Testing filter:"
+msgstr "Тестировать фильтр:"
 
 msgid "&Enter text to test:"
 msgstr "Введите тестовый текст:"
index d2406fd..46b79a3 100644 (file)
@@ -2066,8 +2066,8 @@ msgstr "Откажи"
 msgid "Test Filter"
 msgstr "Провера филтера"
 
-msgid "Testing filter..."
-msgstr "Проверавање филтера..."
+msgid "Testing filter:"
+msgstr "Проверавање филтера:"
 
 #, c-format
 msgid "&Enter text to test:"
index 6e2080e..6cf07c0 100644 (file)
@@ -2078,8 +2078,8 @@ msgstr "&අවලංගු කරන්න"
 msgid "Test Filter"
 msgstr "පෙරනය අත්හදා බැලීම"
 
-msgid "Testing filter..."
-msgstr "පෙරනය පරීක්ෂා කිරීම..."
+msgid "Testing filter:"
+msgstr "පෙරනය පරීක්ෂා කිරීම:"
 
 #, c-format
 msgid "&Enter text to test:"
index 1f2665b..fd9eb61 100644 (file)
@@ -2083,8 +2083,8 @@ msgstr "&Zrušiť"
 msgid "Test Filter"
 msgstr "Test filtra"
 
-msgid "Testing filter..."
-msgstr "Testujem filter..."
+msgid "Testing filter:"
+msgstr "Testujem filter:"
 
 #, c-format
 msgid "&Enter text to test:"
index f7864b0..2421f96 100644 (file)
@@ -2086,8 +2086,8 @@ msgstr "Pre&kliči"
 msgid "Test Filter"
 msgstr "Preizkusi filter"
 
-msgid "Testing filter..."
-msgstr "Preizkus filtra..."
+msgid "Testing filter:"
+msgstr "Preizkus filtra:"
 
 #, c-format
 msgid "&Enter text to test:"
index 697a56a..068099a 100644 (file)
@@ -1623,8 +1623,8 @@ msgstr "&Cancelar"
 msgid "Test Filter"
 msgstr "Prueba de filtro"
 
-msgid "Testing filter..."
-msgstr "Probando filtro..."
+msgid "Testing filter:"
+msgstr "Probando filtro:"
 
 msgid "&Enter text to test:"
 msgstr "&Texto a probar:"
index b378732..865facc 100644 (file)
@@ -2087,8 +2087,8 @@ msgstr "Avbryt"
 msgid "Test Filter"
 msgstr "Testa Filter"
 
-msgid "Testing filter..."
-msgstr "Testar filter..."
+msgid "Testing filter:"
+msgstr "Testar filter:"
 
 #, c-format
 msgid "&Enter text to test:"
index b09b70c..652062a 100644 (file)
@@ -1617,8 +1617,8 @@ msgstr "İ&ptal"
 msgid "Test Filter"
 msgstr "Süzgeci Sına"
 
-msgid "Testing filter..."
-msgstr "Süzgeç sınanıyor..."
+msgid "Testing filter:"
+msgstr "Süzgeç sınanıyor:"
 
 msgid "&Enter text to test:"
 msgstr "Sınanacak m&etni yazın:"
index eaa135d..0f0cb2b 100644 (file)
@@ -2084,8 +2084,8 @@ msgstr "&Скасувати"
 msgid "Test Filter"
 msgstr "Випробування фільтра"
 
-msgid "Testing filter..."
-msgstr "Випробувати фільтр..."
+msgid "Testing filter:"
+msgstr "Випробувати фільтр:"
 
 #, c-format
 msgid "&Enter text to test:"