Index: dll/cpl/intl/date.c =================================================================== --- dll/cpl/intl/date.c (revision 61921) +++ dll/cpl/intl/date.c (working copy) @@ -104,9 +104,7 @@ { if (_istalnum(szShortDateSep[nSepCount]) || (szShortDateSep[nSepCount] == _T('\''))) { - MessageBox(NULL, - _T("Entered short date separator contain incorrect symbol"), - _T("Error"), MB_OK | MB_ICONERROR); + PrintErrorMsgBox(IDS_ERROR_SYMBOL_SEPARATE); return FALSE; } } @@ -156,9 +154,7 @@ !isDateCompAl(szShortDateFmt[nDateCompCount]) && !OpenApostFlg) { - MessageBox(NULL, - _T("Entered short date format contain incorrect symbol"), - _T("Error"), MB_OK | MB_ICONERROR); + PrintErrorMsgBox(IDS_ERROR_SYMBOL_FORMAT_SHORT); return FALSE; } @@ -166,9 +162,7 @@ if (OpenApostFlg) { - MessageBoxW(NULL, - _T("Entered short date format contain incorrect symbol"), - _T("Error"), MB_OK | MB_ICONERROR); + PrintErrorMsgBox(IDS_ERROR_SYMBOL_FORMAT_SHORT); return FALSE; } @@ -214,9 +208,7 @@ !isDateCompAl(szLongDateFmt[nDateCompCount]) && !OpenApostFlg) { - MessageBox(NULL, - _T("Entered long date format contain incorrect symbol"), - _T("Error"), MB_OK | MB_ICONERROR); + PrintErrorMsgBox(IDS_ERROR_SYMBOL_FORMAT_LONG); return FALSE; } @@ -224,9 +216,7 @@ if (OpenApostFlg) { - MessageBoxW(NULL, - _T("Entered long date format contain incorrect symbol"), - _T("Error"), MB_OK | MB_ICONERROR); + PrintErrorMsgBox(IDS_ERROR_SYMBOL_FORMAT_LONG); return FALSE; } @@ -575,9 +565,9 @@ } case IDC_SCR_MAX_YEAR: { - /* Set "Apply" button enabled */ - /* FIXME */ - //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + /* Set "Apply" button enabled */ + /* FIXME */ + //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; case IDC_CALTYPE_COMBO: Index: dll/cpl/intl/generalp.c =================================================================== --- dll/cpl/intl/generalp.c (revision 61921) +++ dll/cpl/intl/generalp.c (working copy) @@ -161,7 +161,7 @@ ret = GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTCODEPAGE, OEMPage, sizeof(OEMPage)/sizeof(TCHAR)); if (ret == 0) { - MessageBox(NULL, _T("Problem reading OEM code page"), _T("Big Problem"), MB_OK); + PrintErrorMsgBox(IDS_ERROR_OEM_CODE_PAGE); return; } @@ -168,7 +168,7 @@ ret = GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTANSICODEPAGE, ACPPage, sizeof(ACPPage)/sizeof(TCHAR)); if (ret == 0) { - MessageBox(NULL, _T("Problem reading ANSI code page"), _T("Big Problem"), MB_OK); + PrintErrorMsgBox(IDS_ERROR_ANSI_CODE_PAGE); return; } @@ -175,9 +175,7 @@ ret = RegOpenKey(HKEY_CURRENT_USER, _T("Control Panel\\International"), &localeKey); if (ret != ERROR_SUCCESS) { - // Some serious error - MessageBox(NULL, _T("Problem opening HKCU\\Control Panel\\International key"), - _T("Big Problem"), MB_OK); + PrintErrorMsgBox(IDS_ERROR_INT_KEY_REG); return; } @@ -190,9 +188,7 @@ ret = RegOpenKey(HKEY_USERS, _T(".DEFAULT\\Control Panel\\International"), &localeKey); if (ret != ERROR_SUCCESS) { - // Some serious error - MessageBox(NULL, _T("Problem opening HKU\\.DEFAULT\\Control Panel\\International key"), - _T("Big Problem"), MB_OK); + PrintErrorMsgBox(IDS_ERROR_DEF_INT_KEY_REG); return; } @@ -206,8 +202,7 @@ ret = RegOpenKey(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"), &langKey); if (ret != ERROR_SUCCESS) { - MessageBoxW(NULL, _T("Problem opening HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language key"), - _T("Big Problem"), MB_OK); + PrintErrorMsgBox(IDS_ERROR_NLS_KEY_REG); return; } @@ -221,8 +216,7 @@ ret = RegOpenKey(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"), &langKey); if (ret != ERROR_SUCCESS) { - MessageBox(NULL, _T("Problem opening HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage key"), - _T("Big Problem"), MB_OK); + PrintErrorMsgBox(IDS_ERROR_NLS_CODE_REG); return; } Index: dll/cpl/intl/intl.c =================================================================== --- dll/cpl/intl/intl.c (revision 61921) +++ dll/cpl/intl/intl.c (working copy) @@ -28,6 +28,7 @@ #include #define NUM_APPLETS (1) +const size_t nBufferSize = 512; static LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam); @@ -46,7 +47,18 @@ {IDC_CPLICON, IDS_CPLNAME, IDS_CPLDESCRIPTION, Applet} }; +VOID +PrintErrorMsgBox(UINT msg) +{ + TCHAR szErrorText[nBufferSize]; + TCHAR szErrorCaption[nBufferSize]; + LoadString(hApplet, msg, szErrorText, sizeof(szErrorText)/sizeof(TCHAR)); + LoadString(hApplet, IDS_ERROR, szErrorCaption, sizeof(szErrorCaption)/sizeof(TCHAR)); + + MessageBox(NULL, szErrorText, szErrorCaption, MB_OK | MB_ICONERROR); +} + static VOID InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) { @@ -124,7 +136,7 @@ { PROPSHEETPAGE psp[3]; PROPSHEETHEADER psh; - TCHAR Caption[256]; + TCHAR Caption[nBufferSize]; if (OpenSetupInf()) { Index: dll/cpl/intl/intl.h =================================================================== --- dll/cpl/intl/intl.h (revision 61921) +++ dll/cpl/intl/intl.h (working copy) @@ -57,6 +57,7 @@ extern DWORD UnattendLCID; /* intl.c */ +VOID PrintErrorMsgBox(UINT msg); /* languages.c */ INT_PTR CALLBACK Index: dll/cpl/intl/lang/bg-BG.rc =================================================================== --- dll/cpl/intl/lang/bg-BG.rc (revision 61921) +++ dll/cpl/intl/lang/bg-BG.rc (working copy) @@ -191,3 +191,18 @@ IDS_CPLNAME "Местни и езикови настройки" IDS_CPLDESCRIPTION "Избор на езици и изписване на числата, валутите, времето и датата." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END Index: dll/cpl/intl/lang/cs-CZ.rc =================================================================== --- dll/cpl/intl/lang/cs-CZ.rc (revision 61921) +++ dll/cpl/intl/lang/cs-CZ.rc (working copy) @@ -196,3 +196,18 @@ IDS_CPLNAME "Místní nastavení" IDS_CPLDESCRIPTION "Zde lze nastavit zobrazení jazyků, čísel, měn, času a dat." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END Index: dll/cpl/intl/lang/de-DE.rc =================================================================== --- dll/cpl/intl/lang/de-DE.rc (revision 61921) +++ dll/cpl/intl/lang/de-DE.rc (working copy) @@ -191,3 +191,18 @@ IDS_CPLNAME "Regionale Einstellungen" IDS_CPLDESCRIPTION "Wählen Sie Anzeigeeinstellungen für Sprache, Zahlen, Währung, Uhrzeit und Datum aus." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END Index: dll/cpl/intl/lang/en-US.rc =================================================================== --- dll/cpl/intl/lang/en-US.rc (revision 61921) +++ dll/cpl/intl/lang/en-US.rc (working copy) @@ -191,3 +191,18 @@ IDS_CPLNAME "Regional Options" IDS_CPLDESCRIPTION "Select languages and format numbers, currencies, times and date." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END Index: dll/cpl/intl/lang/es-ES.rc =================================================================== --- dll/cpl/intl/lang/es-ES.rc (revision 61921) +++ dll/cpl/intl/lang/es-ES.rc (working copy) @@ -193,3 +193,18 @@ IDS_CPLNAME "Opciones regionales" IDS_CPLDESCRIPTION "Personaliza la configuración para mostrar idiomas, números, horas y fechas." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END Index: dll/cpl/intl/lang/fr-FR.rc =================================================================== --- dll/cpl/intl/lang/fr-FR.rc (revision 61921) +++ dll/cpl/intl/lang/fr-FR.rc (working copy) @@ -190,6 +190,21 @@ STRINGTABLE BEGIN - IDS_CPLNAME "Options régionales" - IDS_CPLDESCRIPTION "Sélectionner les langues, les formats de nombres, les monnaies, l'heure et la date." + IDS_CPLNAME "Options régionales" + IDS_CPLDESCRIPTION "Sélectionner les langues, les formats de nombres, les monnaies, l'heure et la date." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END Index: dll/cpl/intl/lang/he-IL.rc =================================================================== --- dll/cpl/intl/lang/he-IL.rc (revision 61921) +++ dll/cpl/intl/lang/he-IL.rc (working copy) @@ -193,3 +193,18 @@ IDS_CPLNAME "אפשרויות אזוריות" IDS_CPLDESCRIPTION "Select languages and format numbers, currencies, times and date." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END Index: dll/cpl/intl/lang/it-IT.rc =================================================================== --- dll/cpl/intl/lang/it-IT.rc (revision 61921) +++ dll/cpl/intl/lang/it-IT.rc (working copy) @@ -193,3 +193,18 @@ IDS_CPLNAME "Opzioni internazionali e della lingua" IDS_CPLDESCRIPTION "Personalizza le impostazioni per la visualizzazione delle lingue, numeri, ora e data." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END Index: dll/cpl/intl/lang/no-NO.rc =================================================================== --- dll/cpl/intl/lang/no-NO.rc (revision 61921) +++ dll/cpl/intl/lang/no-NO.rc (working copy) @@ -191,3 +191,18 @@ IDS_CPLNAME "Regionale innstillinger" IDS_CPLDESCRIPTION "Velg språk og nummer format, valuta, tid og dato." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END Index: dll/cpl/intl/lang/pl-PL.rc =================================================================== --- dll/cpl/intl/lang/pl-PL.rc (revision 61921) +++ dll/cpl/intl/lang/pl-PL.rc (working copy) @@ -199,3 +199,18 @@ IDS_CPLNAME "Ustawienia regionalne" IDS_CPLDESCRIPTION "Ustawienia języków oraz formaty liczb, walut, daty i czasu." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END Index: dll/cpl/intl/lang/ro-RO.rc =================================================================== --- dll/cpl/intl/lang/ro-RO.rc (revision 61921) +++ dll/cpl/intl/lang/ro-RO.rc (working copy) @@ -190,6 +190,21 @@ STRINGTABLE BEGIN - IDS_CPLNAME "Opțiuni regionale" - IDS_CPLDESCRIPTION "Configurarea limbii și formatarea numerelor, valutelor, datei și orei." + IDS_CPLNAME "Opțiuni regionale" + IDS_CPLDESCRIPTION "Configurarea limbii și formatarea numerelor, valutelor, datei și orei." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END Index: dll/cpl/intl/lang/ru-RU.rc =================================================================== --- dll/cpl/intl/lang/ru-RU.rc (revision 61921) +++ dll/cpl/intl/lang/ru-RU.rc (working copy) @@ -193,3 +193,18 @@ IDS_CPLNAME "Язык и региональные стандарты" IDS_CPLDESCRIPTION "Выбор языка, формата чисел, денежных единиц, времени и даты." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END Index: dll/cpl/intl/lang/sk-SK.rc =================================================================== --- dll/cpl/intl/lang/sk-SK.rc (revision 61921) +++ dll/cpl/intl/lang/sk-SK.rc (working copy) @@ -197,3 +197,18 @@ IDS_CPLNAME "Miestne a jazykové nastavenia" IDS_CPLDESCRIPTION "Select languages and format numbers, currencies, times and date." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END Index: dll/cpl/intl/lang/tr-TR.rc =================================================================== --- dll/cpl/intl/lang/tr-TR.rc (revision 61921) +++ dll/cpl/intl/lang/tr-TR.rc (working copy) @@ -193,3 +193,18 @@ IDS_CPLNAME "Bölgelik Ayarlar" IDS_CPLDESCRIPTION "Dilleri ve sayı, para birimi, saat ve târih biçimlerini seçer." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END Index: dll/cpl/intl/lang/uk-UA.rc =================================================================== --- dll/cpl/intl/lang/uk-UA.rc (revision 61921) +++ dll/cpl/intl/lang/uk-UA.rc (working copy) @@ -199,3 +199,18 @@ IDS_CPLNAME "Регіональні стандарти" IDS_CPLDESCRIPTION "Налаштування мовних параметрів і формату чисел, грошових одиниць, часу й дат." END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END Index: dll/cpl/intl/lang/zh-CN.rc =================================================================== --- dll/cpl/intl/lang/zh-CN.rc (revision 61921) +++ dll/cpl/intl/lang/zh-CN.rc (working copy) @@ -195,3 +195,18 @@ IDS_CPLNAME "区域选项" IDS_CPLDESCRIPTION "选择语言、数字、货币、时间和日期的显示设置。" END + +STRINGTABLE +BEGIN + IDS_ERROR "Error" + IDS_ERROR_SYMBOL_SEPARATE "Entered short date separator contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_SHORT "Entered short date format contain incorrect symbol" + IDS_ERROR_SYMBOL_FORMAT_LONG "Entered long date format contain incorrect symbol" + IDS_ERROR_OEM_CODE_PAGE "Problem reading OEM code page" + IDS_ERROR_ANSI_CODE_PAGE "Problem reading ANSI code page" + IDS_ERROR_INT_KEY_REG "Problem opening HKCU\\Control Panel\\International key" + IDS_ERROR_DEF_INT_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_KEY_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_NLS_CODE_REG "Problem opening HKU\\.DEFAULT\\Control Panel\\International key" + IDS_ERROR_INPUT_DLL "Can't start input.dll" +END Index: dll/cpl/intl/languages.c =================================================================== --- dll/cpl/intl/languages.c (revision 61921) +++ dll/cpl/intl/languages.c (working copy) @@ -31,10 +31,7 @@ shInputDll.lpParameters = _T("shell32.dll,Control_RunDLL input.dll"); if (ShellExecuteEx(&shInputDll) == 0) { - MessageBox(NULL, - _T("Can't start input.dll"), - _T("Error"), - MB_OK | MB_ICONERROR); + PrintErrorMsgBox(IDS_ERROR_INPUT_DLL); } } break; Index: dll/cpl/intl/resource.h =================================================================== --- dll/cpl/intl/resource.h (revision 61921) +++ dll/cpl/intl/resource.h (working copy) @@ -76,3 +76,16 @@ #define IDS_SPAIN 1003 #define IDS_METRIC 1004 #define IDS_IMPERIAL 1005 + +#define IDS_ERROR 1006 +#define IDS_ERROR_ANSI_CODE_PAGE 1007 +#define IDS_ERROR_INT_KEY_REG 1008 +#define IDS_ERROR_DEF_INT_KEY_REG 1009 +#define IDS_ERROR_NLS_KEY_REG 1010 +#define IDS_ERROR_NLS_CODE_REG 1011 +#define IDS_ERROR_OEM_CODE_PAGE 1012 +#define IDS_ERROR_SYMBOL_SEPARATE 1013 +#define IDS_ERROR_SYMBOL_FORMAT_SHORT 1014 +#define IDS_ERROR_SYMBOL_FORMAT_LONG 1015 +#define IDS_ERROR_INPUT_DLL 1016 +