Ros-diffs February 2023

ros-diffs@reactos.org

16 participants
97 discussions

[reactos] 01/01: [COMDLG32] Find/Replace: Correctly set flags (#5097)
by Katayama Hirofumi MZ 25 Feb '23

25 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4bb0ae37620b5925b714… commit f4bb0ae37620b5925b7149319d1669b0cddd3c92 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 25 09:16:36 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 25 09:16:36 2023 +0900 [COMDLG32] Find/Replace: Correctly set flags (#5097) The flags were not updated correctly. CORE-17064 --- dll/win32/comdlg32/finddlg.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dll/win32/comdlg32/finddlg.c b/dll/win32/comdlg32/finddlg.c index d769325e9f0..fc13f8a7d54 100644 --- a/dll/win32/comdlg32/finddlg.c +++ b/dll/win32/comdlg32/finddlg.c @@ -168,6 +168,12 @@ Replace: EnableWindow(GetDlgItem(hDlgWnd, psh2), enable); } } +#ifdef __REACTOS__ + else if (NotifyCode == EN_KILLFOCUS && Id == edt1) + { + pData->user_fr.fra->Flags |= COMDLG32_FR_GetFlags(hDlgWnd); + } +#endif } /***********************************************************************

1 0

[reactos] 01/01: [USETUP] Speed up DoFileCopy +24% (#5089)
by Katayama Hirofumi MZ 24 Feb '23

24 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=13cf4c52f50692587873a… commit 13cf4c52f50692587873a0e038d1821b79342aec Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Feb 24 10:19:53 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 24 10:19:53 2023 +0900 [USETUP] Speed up DoFileCopy +24% (#5089) Make STRING_COPYING cached. CORE-18838 --- base/setup/usetup/usetup.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index e58638c1a7f..199f3b4a1be 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -3650,6 +3650,8 @@ FileCopyCallback(PVOID Context, } else if (Notification == SPFILENOTIFY_STARTCOPY) { + static PCSTR s_pszCopying = NULL; /* Cached for speed */ + /* Display copy message */ ASSERT(Param2 == FILEOP_COPY); @@ -3658,8 +3660,9 @@ FileCopyCallback(PVOID Context, if (DstFileName) ++DstFileName; else DstFileName = FilePathInfo->Target; - CONSOLE_SetStatusText(MUIGetString(STRING_COPYING), - DstFileName); + if (!s_pszCopying) + s_pszCopying = MUIGetString(STRING_COPYING); + CONSOLE_SetStatusText(s_pszCopying, DstFileName); #ifdef __REACTOS__ /* HACK */ DoWatchDestFileName(DstFileName); #endif

1 0

[reactos] 01/01: [BOOTDATA][INF] Add pt-PT translation (#4926)
by Jose Carlos Jesus 23 Feb '23

23 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d2012ac3b4dddb0f19ff… commit 6d2012ac3b4dddb0f19fff79ccc9738709979715 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Wed Feb 22 20:51:33 2023 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 23 09:51:33 2023 +0900 [BOOTDATA][INF] Add pt-PT translation (#4926) --- boot/bootdata/hivesft.inf | 587 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 587 insertions(+) diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index 9affb07c433..dc9903f7d34 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -5431,6 +5431,593 @@ GMT_PLUS_13_A_DESC ="(GMT+13:00) ヌクアロファ" GMT_PLUS_13_A_DAYLIGHT="トンガ夏時間" GMT_PLUS_13_A_STANDARD="トンガ標準時" +; LANG_PORTUGUESE SUBLANG_NEUTRAL +[Strings.0816] +COUNTRY_AD="Andorra" +COUNTRY_AE="Emirados Árabes Unidos" +COUNTRY_AF="Afghanistão" +COUNTRY_AG="Antigua e Barbuda" +COUNTRY_AI="Anguilla" +COUNTRY_AL="Albânia" +COUNTRY_AM="Arménia" +COUNTRY_AO="Angola" +COUNTRY_AQ="Antárctica" +COUNTRY_AR="Argentina" +COUNTRY_AS="Samoa Americana" +COUNTRY_AT="Austria" +COUNTRY_AU="Austrália" +COUNTRY_AW="Aruba" +COUNTRY_AX="Ilhas Åland" +COUNTRY_AZ="Azerbaijão" +COUNTRY_BA="Bósnia e Herzegovina" +COUNTRY_BB="Barbados" +COUNTRY_BD="Bangladesh" +COUNTRY_BE="Bélgica" +COUNTRY_BF="Burkina Faso" +COUNTRY_BG="Bulgária" +COUNTRY_BH="Bahrain" +COUNTRY_BI="Burundi" +COUNTRY_BJ="Benin" +COUNTRY_BL="Saint Barthélemy" +COUNTRY_BM="Bermuda" +COUNTRY_BN="Brunei Darussalam" +COUNTRY_BO="Bolívia, Estado plurinacional da" +COUNTRY_BQ="Bonaire, Saint Eustatius and Saba" +COUNTRY_BR="Brasil" +COUNTRY_BS="Bahamas" +COUNTRY_BT="Butão" +COUNTRY_BV="Bouvet Island" +COUNTRY_BW="Botswana" +COUNTRY_BY="Belarus" +COUNTRY_BZ="Belize" +COUNTRY_CA="Canadá" +COUNTRY_CC="Cocos (Keeling) Islands" +COUNTRY_CD="Congo, República Democrática do" +COUNTRY_CF="República Central Africana" +COUNTRY_CG="Congo" +COUNTRY_CH="Suissa" +COUNTRY_CI="Côte d'Ivoire" +COUNTRY_CK="Ilhas Cook" +COUNTRY_CL="Chile" +COUNTRY_CM="Camarões" +COUNTRY_CN="China" +COUNTRY_CO="Colombia" +COUNTRY_CR="Costa Rica" +COUNTRY_CU="Cuba" +COUNTRY_CV="Cabo Verde" +COUNTRY_CW="Curação" +COUNTRY_CX="Ihas Natal" +COUNTRY_CY="Chipre" +COUNTRY_CZ="República Checa" +COUNTRY_DE="Alemanha" +COUNTRY_DJ="Djibouti" +COUNTRY_DK="Dinamarca" +COUNTRY_DM="Dominica" +COUNTRY_DO="República Dominicana" +COUNTRY_DZ="Algéria" +COUNTRY_EC="Equador" +COUNTRY_EE="Estónia" +COUNTRY_EG="Egipto" +COUNTRY_EH="Sahara Oeste" +COUNTRY_ER="Eritreia" +COUNTRY_ES="Espanha" +COUNTRY_ET="Ethiópia" +COUNTRY_FI="Finlandia" +COUNTRY_FJ="Fiji" +COUNTRY_FK="Ilhas Falkland (Malvinas)" +COUNTRY_FM="Micronésia, Estados Federados da" +COUNTRY_FO="Faroe Islands" +COUNTRY_FR="França" +COUNTRY_GA="Gabão" +COUNTRY_GD="Granada" +COUNTRY_GE="Geórgia" +COUNTRY_GF="Guiana Francesa" +COUNTRY_GG="Guernsey" +COUNTRY_GH="Ghana" +COUNTRY_GI="Gibraltar" +COUNTRY_GL="Greenland" +COUNTRY_GM="Gambia" +COUNTRY_GN="Guiné" +COUNTRY_GP="Guadeloupe" +COUNTRY_GQ="Guiné Equatorial" +COUNTRY_GR="Grécia" +COUNTRY_GS="South Georgia and the South Sandwich Islands" +COUNTRY_GT="Guatemala" +COUNTRY_GU="Guam" +COUNTRY_GW="Guiné-Bissau" +COUNTRY_GY="Guyana" +COUNTRY_HK="Hong Kong" +COUNTRY_HM="Heard Island and McDonald Islands" +COUNTRY_HN="Honduras" +COUNTRY_HR="Croácia" +COUNTRY_HT="Haiti" +COUNTRY_HU="Hungria" +COUNTRY_ID="Indonésia" +COUNTRY_IE="Irlanda" +COUNTRY_IL="Israel" +COUNTRY_IM="Isle of Man" +COUNTRY_IN="Índia" +COUNTRY_IO="British Indian Ocean Territory" +COUNTRY_IQ="Iraque" +COUNTRY_IR="Irão, Repúblic Islamica do" +COUNTRY_IS="Iceland" +COUNTRY_IT="Itália" +COUNTRY_JE="Jersey" +COUNTRY_JM="Jamaica" +COUNTRY_JO="Jordania" +COUNTRY_JP="Japão" +COUNTRY_KE="Quénia" +COUNTRY_KG="Kyrgyzstan" +COUNTRY_KH="Cambójia" +COUNTRY_KI="Kiribati" +COUNTRY_KM="Comoros" +COUNTRY_KN="Saint Kitts and Nevis" +COUNTRY_KP="Coreia, República Popular Democrática da" +COUNTRY_KR="Coreia, República da" +COUNTRY_KW="Kuwait" +COUNTRY_KY="Ilhas Caimão" +COUNTRY_KZ="Cazaquistão" +COUNTRY_LA="República Popular Democrática do Laos" +COUNTRY_LB="Líbano" +COUNTRY_LC="Santa Lúcia" +COUNTRY_LI="Liechtenstein" +COUNTRY_LK="Sri Lanka" +COUNTRY_LR="Libéria" +COUNTRY_LS="Lesotho" +COUNTRY_LT="Lithuania" +COUNTRY_LU="Luxemburgo" +COUNTRY_LV="Latvia" +COUNTRY_LY="Libyan Arab Jamahiriya" +COUNTRY_MA="Marrocos" +COUNTRY_MC="Monaco" +COUNTRY_MD="Moldova, República da" +COUNTRY_ME="Montenegro" +COUNTRY_MF="Saint Martin (French part)" +COUNTRY_MG="Madagascar" +COUNTRY_MH="Ilhas Marshall" +COUNTRY_MK="Macedónia, the former Yugoslav Republic of" +COUNTRY_ML="Mali" +COUNTRY_MM="Myanmar" +COUNTRY_MN="Mongólia" +COUNTRY_MO="Macau" +COUNTRY_MP="Northern Mariana Islands" +COUNTRY_MQ="Martinique" +COUNTRY_MR="Mauritania" +COUNTRY_MS="Montserrat" +COUNTRY_MT="Malta" +COUNTRY_MU="Mauritius" +COUNTRY_MV="Maldives" +COUNTRY_MW="Malawi" +COUNTRY_MX="Mexico" +COUNTRY_MY="Malásia" +COUNTRY_MZ="Moçambique" +COUNTRY_NA="Namibia" +COUNTRY_NC="Nova Caledonia" +COUNTRY_NE="Niger" +COUNTRY_NF="Ilha de Norfolk" +COUNTRY_NG="Nigéria" +COUNTRY_NI="Nicarágua" +COUNTRY_NL="Holanda" +COUNTRY_NO="Noroega" +COUNTRY_NP="Nepal" +COUNTRY_NR="Nauru" +COUNTRY_NU="Niue" +COUNTRY_NZ="Nova Zelândia" +COUNTRY_OM="Oman" +COUNTRY_PA="Panamá" +COUNTRY_PE="Peru" +COUNTRY_PF="Polynésia Francesa" +COUNTRY_PG="Papua Nova Guiné" +COUNTRY_PH="Filipinas" +COUNTRY_PK="Paquistão" +COUNTRY_PL="Polónia" +COUNTRY_PM="Saint Pierre and Miquelon" +COUNTRY_PN="Pitcairn" +COUNTRY_PR="Porto Rico" +COUNTRY_PS="Territórios, Ocupados da Palestina" +COUNTRY_PT="Portugal" +COUNTRY_PW="Palau" +COUNTRY_PY="Paraguai" +COUNTRY_QA="Qatar" +COUNTRY_RE="Réunion" +COUNTRY_RO="Romenia" +COUNTRY_RS="Serbia" +COUNTRY_RU="Federação Russa" +COUNTRY_RW="Ruanda" +COUNTRY_SA="Arábia Saudita" +COUNTRY_SB="Ilhas Salomão" +COUNTRY_SC="Seychelles" +COUNTRY_SD="Sudão" +COUNTRY_SE="Suissa" +COUNTRY_SG="Singapura" +COUNTRY_SH="Santa Helena, Ascension e Tristão da Cunha" +COUNTRY_SI="Eslovénia" +COUNTRY_SJ="Svalbard and Jan Mayen" +COUNTRY_SK="Eslovakia" +COUNTRY_SL="Serra Leoa" +COUNTRY_SM="San Marino" +COUNTRY_SN="Senegal" +COUNTRY_SO="Somália" +COUNTRY_SR="Suriname" +COUNTRY_ST="Sao Tomé e Príncipe" +COUNTRY_SV="El Salvador" +COUNTRY_SX="Sint Maarten (Dutch part)" +COUNTRY_SY="República Árabe da Síria" +COUNTRY_SZ="Swaziland" +COUNTRY_TC="Turks and Caicos Islands" +COUNTRY_TD="Chad" +COUNTRY_TF="French Southern Territories" +COUNTRY_TG="Togo" +COUNTRY_TH="Thailandia" +COUNTRY_TJ="Tajikistão" +COUNTRY_TK="Tokelau" +COUNTRY_TL="Timor-Leste" +COUNTRY_TM="Turkmenistan" +COUNTRY_TN="Tunisia" +COUNTRY_TO="Tonga" +COUNTRY_TR="Turkia" +COUNTRY_TT="Trinidad and Tobago" +COUNTRY_TV="Tuvalu" +COUNTRY_TW="Taiwan, Provincia da China" +COUNTRY_TZ="República da Tanzânia" +COUNTRY_UA="Ukrania" +COUNTRY_UG="Uganda" +COUNTRY_UK="Reino-Unido" +COUNTRY_UM="Ilhas Menores Estados Unidos" +COUNTRY_US="Estados Unidos da América" +COUNTRY_UY="Uruguai" +COUNTRY_UZ="Uzbekistão" +COUNTRY_VA="Holy See (Vatican City State)" +COUNTRY_VC="Saint Vincent and the Grenadines" +COUNTRY_VE="Venezuela, República Bolivariana" +COUNTRY_VG="Virgin Islands, British" +COUNTRY_VI="Virgin Islands, U.S." +COUNTRY_VN="Vietnam" +COUNTRY_VU="Vanuatu" +COUNTRY_WF="Wallis and Futuna" +COUNTRY_WS="Samoa" +COUNTRY_YE="Yemen" +COUNTRY_YT="Mayotte" +COUNTRY_ZA="África do Sul" +COUNTRY_ZM="Zambia" +COUNTRY_ZW="Zimbabwe" + +GMT_MINUS_12_A_DESC ="(GMT-12:00) Eniwetok, Kwajalein" +GMT_MINUS_12_A_DAYLIGHT="Horário de verão da Linha Internacional de data" +GMT_MINUS_12_A_STANDARD="Horário padrão da Linha Internacional de data" + +GMT_MINUS_11_A_DESC ="(GMT-11:00) Ilhas Midway, Samoa" +GMT_MINUS_11_A_DAYLIGHT="Horário de verão de Samoa" +GMT_MINUS_11_A_STANDARD="Horário padrão de Samoa" + +GMT_MINUS_10_A_DESC ="(GMT-10:00) Havai" +GMT_MINUS_10_A_DAYLIGHT="Horário de verão do Havai" +GMT_MINUS_10_A_STANDARD="Horário padrão do Havai" + +GMT_MINUS_09_A_DESC ="(GMT-09:00) Alasca" +GMT_MINUS_09_A_DAYLIGHT="Horário de verão do Alasca" +GMT_MINUS_09_A_STANDARD="Horário padrão do Alasca" + +GMT_MINUS_08_A_DESC ="(GMT-08:00) Hora do Pacífico (E.U.A. e Canadá); Tijuana" +GMT_MINUS_08_A_DAYLIGHT="Horário de verão do Pacífico" +GMT_MINUS_08_A_STANDARD="Horário padrão do Pacífico" + +GMT_MINUS_07_A_DESC ="(GMT-07:00) Hora das Regiões Montanhosas (E.U.A. e Canadá" +GMT_MINUS_07_A_DAYLIGHT="Horário de verão das Regiões Montanhosas(E.U.A. e Canadá)" +GMT_MINUS_07_A_STANDARD="Horário padrão das Regiões Montanhosas(E.U.A. e Canadá)" + +GMT_MINUS_07_B_DESC ="(GMT-07:00) Chihuahua, La Paz, Mazatlan" +GMT_MINUS_07_B_DAYLIGHT="Horário de verão das Montanhas (México)" +GMT_MINUS_07_B_STANDARD="Horário padrão das Montanhas (México)" + +GMT_MINUS_07_C_DESC ="(GMT-07:00) Arizona" +GMT_MINUS_07_C_DAYLIGHT="Horário de verão das Regiões Montanhosas(E.U.A.)" +GMT_MINUS_07_C_STANDARD="Horário padrão das Regiões Montanhosas(E.U.A.)" + +GMT_MINUS_06_A_DESC ="(GMT-06:00) Hora da América Central (E.U.A. e Canadá)" +GMT_MINUS_06_A_DAYLIGHT="Horário de verão da América Central" +GMT_MINUS_06_A_STANDARD="Horário padrão da América Central" + +GMT_MINUS_06_B_DESC ="(GMT-06:00) Saskatchewan" +GMT_MINUS_06_B_DAYLIGHT="Horário de verão Canadá Central" +GMT_MINUS_06_B_STANDARD="Horário padrão Canadá Central" + +GMT_MINUS_06_C_DESC ="(GMT-06:00) Guadalajara, Cidade do México, Monterrey" +GMT_MINUxsS_06_C_DAYLIGHT="Horário de verão A. Central (México)" +GMT_MINUS_06_C_STANDARD="Horário padrão A. Central (México)" + +GMT_MINUS_06_D_DESC ="(GMT-06:00) América Central" +GMT_MINUS_06_D_DAYLIGHT="Horário de verão da América Central" +GMT_MINUS_06_D_STANDARD="Horário padrão da América Central" + +GMT_MINUS_05_A_DESC ="(GMT-05:00) Hora do Leste (E.U.A. e Canadá)" +GMT_MINUS_05_A_DAYLIGHT="Horário de verão do Leste" +GMT_MINUS_05_A_STANDARD="Horário padrão do Leste" + +GMT_MINUS_05_B_DESC ="(GMT-05:00) Indiana (Leste)" +GMT_MINUS_05_B_DAYLIGHT="Horário de verão do Leste E.U.A." +GMT_MINUS_05_B_STANDARD="Horário padrão do Leste E.U.A." + +GMT_MINUS_05_C_DESC ="(GMT-05:00) Bogota, Lima, Quito, Rio Branco" +GMT_MINUS_05_C_DAYLIGHT="Horário de verão do SA Pacifico" +GMT_MINUS_05_C_STANDARD="Horário padrão do SA Pacifico" + +GMT_MINUS_04_A_DESC ="(GMT-04:00) Hora do Atlântico (Canadá)" +GMT_MINUS_04_A_DAYLIGHT="Horário de verão do Atlântico" +GMT_MINUS_04_A_STANDARD="Horário padrão do Atlântico" + +GMT_MINUS_04_B_DESC ="(GMT-04:00) La Paz" +GMT_MINUS_04_B_DAYLIGHT="Horário de verão SA Oeste" +GMT_MINUS_04_B_STANDARD="Horário padrão SA Oeste" + +GMT_MINUS_0330_A_DESC ="(GMT-03:30) Terra Nova" +GMT_MINUS_0330_A_DAYLIGHT="Horário de verão Terra Nova" +GMT_MINUS_0330_A_STANDARD="Horário padrão Terra Nova" + +GMT_MINUS_03_A_DESC ="(GMT-03:00) Santiago" +GMT_MINUS_03_A_DAYLIGHT="Horário de verão do SA Pacifico" +GMT_MINUS_03_A_STANDARD="Horário padrão do SA Pacifico" + +GMT_MINUS_03_B_DESC ="(GMT-03:00) Brasília" +GMT_MINUS_03_B_DAYLIGHT="Horário de verão E. América do Sul" +GMT_MINUS_03_B_STANDARD="Horário padrão E. América do Sul" + +GMT_MINUS_03_C_DESC ="(GMT-03:00) Buenos Aires, Georgetown" +GMT_MINUS_03_C_DAYLIGHT="Horário de verão SA Leste" +GMT_MINUS_03_C_STANDARD="Horário padrão SA Leste" + +GMT_MINUS_03_D_DESC ="(GMT-03:00) Gronelândia" +GMT_MINUS_03_D_DAYLIGHT="Horário de verão Gronelândia" +GMT_MINUS_03_D_STANDARD="Horário padrão Gronelândia" + +GMT_MINUS_02_A_DESC ="(GMT-02:00) Atlântico Médio" +GMT_MINUS_02_A_DAYLIGHT="Horário de verão Atlântico Médio" +GMT_MINUS_02_A_STANDARD="Horário padrão Atlântico Médio" + +GMT_MINUS_01_A_DESC ="(GMT-01:00) Arquipélago dos Açores" +GMT_MINUS_01_A_DAYLIGHT="Horário de verão dos Açores" +GMT_MINUS_01_A_STANDARD="Horário padrão dos Açores" + +GMT_MINUS_01_B_DESC ="(GMT-01:00) Ilha de Cabo Verde" +GMT_MINUS_01_B_DAYLIGHT="Horário de verão de Cabo Verde" +GMT_MINUS_01_B_STANDARD="Horário padrão de Cabo Verde" + +GMT_PLUS_00_A_DESC ="(GMT+00:00)Merid. de Greenwich: Dublin, Edinburgo, Lisboa, Londres" +GMT_PLUS_00_A_DAYLIGHT="Horário de verão GMT" +GMT_PLUS_00_A_STANDARD="Horário padrão GMT" + +GMT_PLUS_00_B_DESC ="(GMT+00:00) Casablanca, Monrovia, Reykjavik" +GMT_PLUS_00_B_DAYLIGHT="Horário de verão Greenwich" +GMT_PLUS_00_B_STANDARD="Horário padrão Greenwich" + +GMT_PLUS_01_A_DESC ="(GMT+01:00) Belgrado, Bratislava, Budapest, Ljubljana, Praga" +GMT_PLUS_01_A_DAYLIGHT="Horário de verão Europa Central" +GMT_PLUS_01_A_STANDARD="Horário padrão Europa Central" + +GMT_PLUS_01_B_DESC ="(GMT+01:00) Sarajevo, Skopje, Warsaw, Zagreb" +GMT_PLUS_01_B_DAYLIGHT="Horário de verão Europa Central" +GMT_PLUS_01_B_STANDARD="Horário padrão Europa Central" + +GMT_PLUS_01_C_DESC ="(GMT+01:00) Bruxelas, Copenhaga, Madrid, Paris" +GMT_PLUS_01_C_DAYLIGHT="Horário de verão Romance" +GMT_PLUS_01_C_STANDARD="Horário padrão Romance" + +GMT_PLUS_01_D_DESC ="(GMT+01:00) Amsterdam, Berlin, Berna, Roma, Estocolmo, Viena" +GMT_PLUS_01_D_DAYLIGHT="Horário de verão W. Europe" +GMT_PLUS_01_D_STANDARD="Horário padrão W. Europe" + +GMT_PLUS_02_A_DESC ="(GMT+02:00) Chisinau" +GMT_PLUS_02_A_DAYLIGHT="Horário de verão E. Europe" +GMT_PLUS_02_A_STANDARD="Horário padrão E. Europe" + +GMT_PLUS_02_B_DESC ="(GMT+02:00) Cairo" +GMT_PLUS_02_B_DAYLIGHT="Horário de verão Egipto" +GMT_PLUS_02_B_STANDARD="Horário padrão Egipto" + +GMT_PLUS_02_C_DESC ="(GMT+02:00) Helsinkia, Kyiv, Riga, Sófia, Tallinn, Vilnius" +GMT_PLUS_02_C_DAYLIGHT="Horário de verão FLE" +GMT_PLUS_02_C_STANDARD="Horário padrão FLE" + +GMT_PLUS_02_D_DESC ="(GMT+02:00) Atenas, Bucareste" +GMT_PLUS_02_D_DAYLIGHT="Horário de verão GTB" +GMT_PLUS_02_D_STANDARD="Horário padrão GTB" + +GMT_PLUS_02_E_DESC ="(GMT+02:00) Jerusalém" +GMT_PLUS_02_E_DAYLIGHT="Horário de verão de Israel" +GMT_PLUS_02_E_STANDARD="Horário padrão de Israel" + +GMT_PLUS_02_F_DESC ="(GMT+02:00) Harare, Pretória" +GMT_PLUS_02_F_DAYLIGHT="Horário de verão da África do Sul" +GMT_PLUS_02_F_STANDARD="Horário padrão da África do Sul" + +GMT_PLUS_02_G_DESC ="(GMT+02:00) Kaliningrado" +GMT_PLUS_02_G_DAYLIGHT="Horário de verão RTZ 1" +GMT_PLUS_02_G_STANDARD="Horário padrão RTZ 1" + +GMT_PLUS_03_A_DESC ="(GMT+03:00) Minsk" +GMT_PLUS_03_A_DAYLIGHT="Horário de verão Belarus" +GMT_PLUS_03_A_STANDARD="Horário padrão Belarus" + +GMT_PLUS_03_B_DESC ="(GMT+03:00) Moscovo, St. Petersburg" +GMT_PLUS_03_B_DAYLIGHT="Horário de verão RTZ 2" +GMT_PLUS_03_B_STANDARD="Horário padrão RTZ 2" + +GMT_PLUS_03_C_DESC ="(GMT+03:00) Kuwait, Riyadh" +GMT_PLUS_03_C_DAYLIGHT="Horário de verão Arábia" +GMT_PLUS_03_C_STANDARD="Horário padrão Arábia" + +GMT_PLUS_03_D_DESC ="(GMT+03:00) Nairobi" +GMT_PLUS_03_D_DAYLIGHT="Horário de verão E. África" +GMT_PLUS_03_D_STANDARD="Horário padrão E. África" + +GMT_PLUS_03_E_DESC ="(GMT+03:00) Baghdad" +GMT_PLUS_03_E_DAYLIGHT="Horário de verão Iraque" +GMT_PLUS_03_E_STANDARD="Horário padrão Iraque" + +GMT_PLUS_03_F_DESC ="(GMT+03:00) Istambul" +GMT_PLUS_03_F_DAYLIGHT="Horário de verão Turquia" +GMT_PLUS_03_F_STANDARD="Horário padrão Turquia" + +GMT_PLUS_0330_A_DESC ="(GMT+03:30) Teerão" +GMT_PLUS_0330_A_DAYLIGHT="Horário de verão do Irão" +GMT_PLUS_0330_A_STANDARD="Horário padrão do Irão" + +GMT_PLUS_04_A_DESC ="(GMT+04:00) Abu Dhabi, Muscat" +GMT_PLUS_04_A_DAYLIGHT="Horário de verão Arábia" +GMT_PLUS_04_A_STANDARD="Horário padrão Arábia" + +GMT_PLUS_04_B_DESC ="(GMT+04:00) Yerevan" +GMT_PLUS_04_B_DAYLIGHT="Horário de verão Caucasus" +GMT_PLUS_04_B_STANDARD="Horário padrão Caucasus" + +GMT_PLUS_04_C_DESC ="(GMT+04:00) Izhevsk, Samara, Volgograd" +GMT_PLUS_04_C_DAYLIGHT="Horário de verão RTZ 3" +GMT_PLUS_04_C_STANDARD="Horário padrão RTZ 3" + +GMT_PLUS_0430_A_DESC ="(GMT+04:30) Kabul" +GMT_PLUS_0430_A_DAYLIGHT="Horário de verão Afghanistão" +GMT_PLUS_0430_A_STANDARD="Horário padrão Afghanistão" + +GMT_PLUS_05_A_DESC ="(GMT+05:00) Ekaterinburg" +GMT_PLUS_05_A_DAYLIGHT="Horário de verão RTZ 4" +GMT_PLUS_05_A_STANDARD="Horário padrão RTZ 4" + +GMT_PLUS_05_B_DESC ="(GMT+05:00) Islamabad, Karachi, Tashkent" +GMT_PLUS_05_B_DAYLIGHT="Horário de verão West Asia" +GMT_PLUS_05_B_STANDARD="Horário padrão West Asia" + +GMT_PLUS_0530_A_DESC ="(GMT+05:30) Chennai, Kolkata, Mumbai, Nova Delhi" +GMT_PLUS_0530_A_DAYLIGHT="Horário de verão Índia" +GMT_PLUS_0530_A_STANDARD="Horário padrão Índia" + +GMT_PLUS_0530_B_DESC ="(GMT+05:30) Sri Jayawardenepura" +GMT_PLUS_0530_B_DAYLIGHT="Horário de verão Sri Lanka" +GMT_PLUS_0530_B_STANDARD="Horário padrão Sri Lanka" + +GMT_PLUS_0545_A_DESC ="(GMT+05:45) Kathmandu" +GMT_PLUS_0545_A_DAYLIGHT="Horário de verão Nepal" +GMT_PLUS_0545_A_STANDARD="Horário padrão Nepal" + +GMT_PLUS_06_A_DESC ="(GMT+06:00) Astana, Dhaka" +GMT_PLUS_06_A_DAYLIGHT="Horário de verão Ásia Central" +GMT_PLUS_06_A_STANDARD="Horário padrão Ásia Central" + +GMT_PLUS_06_B_DESC ="(GMT+06:00) Omsk" +GMT_PLUS_06_B_DAYLIGHT="Horário de verão Omsk" +GMT_PLUS_06_B_STANDARD="Horário padrão Omsk" + +GMT_PLUS_0630_A_DESC ="(GMT+06:30) Yangon (Rangoon)" +GMT_PLUS_0630_A_DAYLIGHT="Horário de verão Myanmar" +GMT_PLUS_0630_A_STANDARD="Horário padrão Myanmar" + +GMT_PLUS_07_A_DESC ="(GMT+07:00) Novosibirsk" +GMT_PLUS_07_A_DAYLIGHT="Horário de verão Novosibirsk" +GMT_PLUS_07_A_STANDARD="Horário padrão Novosibirsk" + +GMT_PLUS_07_B_DESC ="(GMT+07:00) Bangcoque, Hanói, Jakarta" +GMT_PLUS_07_B_DAYLIGHT="Horário de verão SE Asia" +GMT_PLUS_07_B_STANDARD="Horário padrão SE Asia" + +GMT_PLUS_07_C_DESC ="(GMT+07:00) Krasnoyarsk" +GMT_PLUS_07_C_DAYLIGHT="Horário de verão RTZ 6" +GMT_PLUS_07_C_STANDARD="Horário padrão RTZ 6" + +GMT_PLUS_07_D_DESC ="(GMT+07:00) Tomsk" +GMT_PLUS_07_D_DAYLIGHT="Horário de verão de Tomsk" +GMT_PLUS_07_D_STANDARD="Horário padrão de Tomsk" + +GMT_PLUS_08_A_DESC ="(GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi" +GMT_PLUS_08_A_DAYLIGHT="Horário de verão da China" +GMT_PLUS_08_A_STANDARD="Horário padrão da China" + +GMT_PLUS_08_B_DESC ="(GMT+08:00) Kuala Lumpur, Singapura" +GMT_PLUS_08_B_DAYLIGHT="Horário de verão em Singapura" +GMT_PLUS_08_B_STANDARD="Horário padrão em Singapura" + +GMT_PLUS_08_C_DESC ="(GMT+08:00) Taipei" +GMT_PLUS_08_C_DAYLIGHT="Horário de verão em Taipei" +GMT_PLUS_08_C_STANDARD="Horário padrão de Taipei" + +GMT_PLUS_08_D_DESC ="(GMT+08:00) Perth" +GMT_PLUS_08_D_DAYLIGHT="Horário de verão W. Austrália" +GMT_PLUS_08_D_STANDARD="Horário de padrão W. Austrália" + +GMT_PLUS_08_E_DESC ="(GMT+08:00) UlaanBataar" +GMT_PLUS_08_E_DAYLIGHT="Horário de verão de Ulaanbaatar" +GMT_PLUS_08_E_STANDARD="Horário padrão de Ulaanbaatar" + +GMT_PLUS_08_F_DESC ="(GMT+08:00) Irkutsk" +GMT_PLUS_08_F_DAYLIGHT="Horário de verão da RTZ 7" +GMT_PLUS_08_F_STANDARD="Horário padrão da RTZ 7" + +GMT_PLUS_09_A_DESC ="(GMT+09:00) Seoul" +GMT_PLUS_09_A_DAYLIGHT="Horário de verão de Coreia" +GMT_PLUS_09_A_STANDARD="Horário padrão de Coreia" + +GMT_PLUS_09_B_DESC ="(GMT+09:00) Osaka, Sapporo, Tóquio" +GMT_PLUS_09_B_DAYLIGHT="Horário de verão de Tóquio" +GMT_PLUS_09_B_STANDARD="Horário padrão de Tóquio" + +GMT_PLUS_09_C_DESC ="(GMT+09:00) Yakutsk" +GMT_PLUS_09_C_DAYLIGHT="Horário de verão da RTZ 9" +GMT_PLUS_09_C_STANDARD="Horário padrão da RTZ 9" + +GMT_PLUS_0930_A_DESC ="(GMT+09:30) Darwin" +GMT_PLUS_0930_A_DAYLIGHT="Horário de verão de Austrália Central" +GMT_PLUS_0930_A_STANDARD="Horário padrão de Austrália Central" + +GMT_PLUS_0930_B_DESC ="(GMT+09:30) Adelaide" +GMT_PLUS_0930_B_DAYLIGHT="Horário de verão de Austrália Central" +GMT_PLUS_0930_B_STANDARD="Horário padrão de Austrália Central" + +GMT_PLUS_10_A_DESC ="(GMT+10:00) Canberra, Melbourne, Sydney" +GMT_PLUS_10_A_DAYLIGHT="Horário de verão de AUS Eastern" +GMT_PLUS_10_A_STANDARD="Horário padrão de AUS Eastern" + +GMT_PLUS_10_B_DESC ="(GMT+10:00) Brisbane" +GMT_PLUS_10_B_DAYLIGHT="Horário de verão de E.Austrália" +GMT_PLUS_10_B_STANDARD="Horário padrão de E.Austrália" + +GMT_PLUS_10_C_DESC ="(GMT+10:00) Hobart" +GMT_PLUS_10_C_DAYLIGHT="Horário de verão da Tasmânia" +GMT_PLUS_10_C_STANDARD="Horário padrão da Tasmânia" + +GMT_PLUS_10_D_DESC ="(GMT+10:00) Vladivostok" +GMT_PLUS_10_D_DAYLIGHT="Horário de verão da RTZ 9" +GMT_PLUS_10_D_STANDARD="Horário padrão da RTZ 9" + +GMT_PLUS_10_E_DESC ="(GMT+10:00) Guam, Port Moresby" +GMT_PLUS_10_E_DAYLIGHT="Horário de verão Pacífico Oeste" +GMT_PLUS_10_E_STANDARD="Horário padrão Pacífico Oeste" + +GMT_PLUS_11_A_DESC ="(GMT+11:00) Ilhas Salomão, Nova Caledónia" +GMT_PLUS_11_A_DAYLIGHT="Horário de verão Pacífico Central" +GMT_PLUS_11_A_STANDARD="Horário padrão Pacífico Central" + +GMT_PLUS_11_B_DESC ="(GMT+11:00) Chokurdakh" +GMT_PLUS_11_B_DAYLIGHT="Horário de verão da RTZ 10" +GMT_PLUS_11_B_STANDARD="Horário padrão da RTZ 10" + +GMT_PLUS_11_C_DESC ="(GMT+11:00) Magadã" +GMT_PLUS_11_C_DAYLIGHT="Horário de verão de Magadan" +GMT_PLUS_11_C_STANDARD="Horário padrão de Magadan" + +GMT_PLUS_12_A_DESC ="(GMT+12:00) Fiji, Kamchatka, Ilhas Marshall." +GMT_PLUS_12_A_DAYLIGHT="Horário de verão de Fiji" +GMT_PLUS_12_A_STANDARD="Horário padrão de Fiji" + +GMT_PLUS_12_B_DESC ="(GMT+12:00) Anadyr, Petropavlovsk-Kamchatsky" +GMT_PLUS_12_B_DAYLIGHT="Horário de verão da RTZ 11" +GMT_PLUS_12_B_STANDARD="Horário padrão da RTZ 11" + +GMT_PLUS_12_C_DESC ="(GMT+12:00) Auckland, Wellington" +GMT_PLUS_12_C_DAYLIGHT="Horário de verão de Nova Zelandia" +GMT_PLUS_12_C_STANDARD="Horário padrão de Nova Zelandia" + +GMT_PLUS_13_A_DESC ="(GMT+13:00) Nuku'alofa" +GMT_PLUS_13_A_DAYLIGHT="Horário de verão de Tonga" +GMT_PLUS_13_A_STANDARD="Horário padrão de Tonga" + ; LANG_TURKISH SUBLANG_NEUTRAL [Strings.041F] COUNTRY_AD="Andorra"

1 0

[reactos] 01/01: [SHELL32] Move error message to rc files so can be translated (CORE-18786) (#4997)
by Jose Carlos Jesus 23 Feb '23

23 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23cd14d78bbfc8421ba78… commit 23cd14d78bbfc8421ba7830ed71b6088e5a1e40f Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Wed Feb 22 20:43:53 2023 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 23 09:43:53 2023 +0900 [SHELL32] Move error message to rc files so can be translated (CORE-18786) (#4997) CORE-18786 --- dll/win32/shell32/CNewMenu.cpp | 6 ++++-- dll/win32/shell32/lang/bg-BG.rc | 2 ++ dll/win32/shell32/lang/ca-ES.rc | 2 ++ dll/win32/shell32/lang/cs-CZ.rc | 2 ++ dll/win32/shell32/lang/da-DK.rc | 2 ++ dll/win32/shell32/lang/de-DE.rc | 2 ++ dll/win32/shell32/lang/el-GR.rc | 2 ++ dll/win32/shell32/lang/en-GB.rc | 2 ++ dll/win32/shell32/lang/en-US.rc | 2 ++ dll/win32/shell32/lang/es-ES.rc | 2 ++ dll/win32/shell32/lang/et-EE.rc | 2 ++ dll/win32/shell32/lang/eu-ES.rc | 2 ++ dll/win32/shell32/lang/fi-FI.rc | 2 ++ dll/win32/shell32/lang/fr-FR.rc | 2 ++ dll/win32/shell32/lang/he-IL.rc | 2 ++ dll/win32/shell32/lang/hi-IN.rc | 2 ++ dll/win32/shell32/lang/hu-HU.rc | 2 ++ dll/win32/shell32/lang/id-ID.rc | 2 ++ dll/win32/shell32/lang/it-IT.rc | 2 ++ dll/win32/shell32/lang/ja-JP.rc | 2 ++ dll/win32/shell32/lang/ko-KR.rc | 2 ++ dll/win32/shell32/lang/nl-NL.rc | 2 ++ dll/win32/shell32/lang/no-NO.rc | 2 ++ dll/win32/shell32/lang/pl-PL.rc | 2 ++ dll/win32/shell32/lang/pt-BR.rc | 2 ++ dll/win32/shell32/lang/pt-PT.rc | 6 ++++-- dll/win32/shell32/lang/ro-RO.rc | 2 ++ dll/win32/shell32/lang/ru-RU.rc | 2 ++ dll/win32/shell32/lang/sk-SK.rc | 2 ++ dll/win32/shell32/lang/sl-SI.rc | 2 ++ dll/win32/shell32/lang/sq-AL.rc | 2 ++ dll/win32/shell32/lang/sv-SE.rc | 2 ++ dll/win32/shell32/lang/tr-TR.rc | 2 ++ dll/win32/shell32/lang/uk-UA.rc | 2 ++ dll/win32/shell32/lang/zh-CN.rc | 2 ++ dll/win32/shell32/lang/zh-HK.rc | 2 ++ dll/win32/shell32/lang/zh-TW.rc | 2 ++ dll/win32/shell32/shresdef.h | 2 ++ 38 files changed, 80 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/CNewMenu.cpp b/dll/win32/shell32/CNewMenu.cpp index 87559e017f4..f3ec59cf3da 100644 --- a/dll/win32/shell32/CNewMenu.cpp +++ b/dll/win32/shell32/CNewMenu.cpp @@ -565,8 +565,10 @@ HRESULT CNewMenu::NewItemByNonCommand(SHELLNEW_ITEM *pItem, LPWSTR wszName, } else { - StringCbPrintfW(wszBuf, sizeof(wszBuf), L"Cannot create file: %s", wszName); - MessageBoxW(NULL, wszBuf, L"Cannot create file", MB_OK | MB_ICONERROR); // FIXME load localized error msg + CStringW Caption(MAKEINTRESOURCEW(IDS_CREATEFILE_CAPTION)); + CStringW Message(MAKEINTRESOURCEW(IDS_CREATEFILE_DENIED)); + Message.FormatMessage(Message.GetString(), wszName); + MessageBoxW(0, Message, Caption, MB_ICONEXCLAMATION | MB_OK); } return S_OK; diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 889ca032828..be62be7fa57 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -809,6 +809,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Потвърдете изтриване на файла" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index cb45cb2c1be..b96f2a33e8e 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -808,6 +808,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Confirm File Deletion" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 585feead1c6..a5508bc23ac 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -814,6 +814,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Složku '%1' nebylo možné vytvořit" IDS_CREATEFOLDER_CAPTION "Složku nebylo možné vytvořit" IDS_DELETEITEM_CAPTION "Potvrdit odstranění souboru" diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 150485e6b78..f8041238667 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -814,6 +814,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Bekræft sletning af fil" diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index cef3e293e0d..a9cccf0065f 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -809,6 +809,8 @@ BEGIN IDS_MOVEERROR "'%s' kann nicht verschoben werden: %s" IDS_COPYERROR "'%s' kann nicht kopiert werden: %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED " Der Ordner kann nicht erstellt werden '%1'" IDS_CREATEFOLDER_CAPTION " Der Ordner kann nicht erstellt werden." IDS_DELETEITEM_CAPTION "Bestätigung: Objekt löschen" diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index e9f7631ff40..7ad21a193db 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -808,6 +808,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Επιβεβαίωση διαγραφής αρχείου" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index cf7b1bcb2b4..723449a545c 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -808,6 +808,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Confirm File Deletion" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 0370c2a3b91..6597e6198ba 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -808,6 +808,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Confirm File Deletion" diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index dfbe955e01b..18ed800d0c0 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -817,6 +817,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "No se pudo crear la carpeta '%1'" IDS_CREATEFOLDER_CAPTION "No se pudo crear la carpeta" IDS_DELETEITEM_CAPTION "Confirmar eliminación de archivos" diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index cfab4569ab2..7e4881deeef 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -815,6 +815,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Ei saa luua kausta '%1'" IDS_CREATEFOLDER_CAPTION "Ei saa kausta luua" IDS_DELETEITEM_CAPTION "Kinnita faili kustutamine" diff --git a/dll/win32/shell32/lang/eu-ES.rc b/dll/win32/shell32/lang/eu-ES.rc index ae68e1d936f..36928e4af05 100644 --- a/dll/win32/shell32/lang/eu-ES.rc +++ b/dll/win32/shell32/lang/eu-ES.rc @@ -813,6 +813,8 @@ BEGIN IDS_MOVEERRORSUBFOLDER "Ezin da lekuz aldatu '%s': La carpeta de destino es un subdirectorio de la de origen." IDS_COPYERRORSUBFOLDER "Ezin da kopiatu '%s': La carpeta de destino es un subdirectorio de la de origen." + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Ezin da sortu '%1'" IDS_CREATEFOLDER_CAPTION "Ezin da sortu karpeta" IDS_DELETEITEM_CAPTION "Fitxategi ezabatzea baieztatu" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index d2774cb54a0..6938479bb4d 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -808,6 +808,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Vahvista tiedoston tuhoaminen" diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index beffc7cd40f..8f0d20c740a 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -808,6 +808,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Impossible de créer le dossier '%1'" IDS_CREATEFOLDER_CAPTION "Impossible de créer un dossier" IDS_DELETEITEM_CAPTION "Confirmer la suppression du fichier" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index c7dbb920ea5..6b69cd4a248 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -810,6 +810,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "וידוי מחיקת קובץ" diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 3e467d0990b..10e30d44a12 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -808,6 +808,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "फ़ोल्डर '%1' बनाने में असमर्थ" IDS_CREATEFOLDER_CAPTION "फ़ोल्डर बनाने में असमर्थ" IDS_DELETEITEM_CAPTION "फ़ाइल हटाए जाने की पुष्टि करें" diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 3d5b3a3d051..ee0b93401b7 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -807,6 +807,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Nem sikerült a(z) '%1' mappa létrehozása." IDS_CREATEFOLDER_CAPTION "Nem sikerült létrehozni a mappát" IDS_DELETEITEM_CAPTION "Állomány törlés megerősítése" diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index f39db662892..c1a90895bf7 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -805,6 +805,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Tidak bisa membuat folder folder '%1'" IDS_CREATEFOLDER_CAPTION "Tidak bisa membuat folder" IDS_DELETEITEM_CAPTION "Konfirmasi Penghapusan Berkas" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index b84dd2aa607..4fd5b36705f 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -808,6 +808,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Confermare la cancellazione del file" diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 3bf8ede3010..b4cb4538eff 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -805,6 +805,8 @@ BEGIN IDS_MOVEERROR "移動できません '%s': %s" IDS_COPYERROR "コピーできません '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "フォルダ '%1' を作成できません" IDS_CREATEFOLDER_CAPTION "フォルダを作成できません" IDS_DELETEITEM_CAPTION "ファイル削除の確認" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index c2ac56c7fdc..39fcd10f167 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -815,6 +815,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Confirm File Deletion" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index d9317f6817d..03533b2dd17 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -808,6 +808,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Confirm File Deletion" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 2b389f122bc..54708e59847 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -808,6 +808,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Bekreft filsletting" diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 3163b1d614e..73213eea15e 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -814,6 +814,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Nie można utworzyć folderu '%1'" IDS_CREATEFOLDER_CAPTION "Nie można utworzyć folderu" IDS_DELETEITEM_CAPTION "Potwierdź usunięcie pliku" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index e5f662489df..f410e8a957f 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -808,6 +808,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Não foi possível criar o ficheiro %1" + IDS_CREATEFILE_CAPTION "Erro ao criar o ficheiro" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Confirmar exclusão de arquivo" diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 6da36e57473..b8eec0444b2 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -808,8 +808,10 @@ BEGIN IDS_MOVEERROR "Impossivel mover '%s': %s" IDS_COPYERROR "Impossivel copiar '%s': %s" - IDS_CREATEFOLDER_DENIED "Impossivel criar pasta '%1'" - IDS_CREATEFOLDER_CAPTION "Impossivel criar pasta" + IDS_CREATEFILE_DENIED "Não foi possível criar o ficheiro %1" + IDS_CREATEFILE_CAPTION "Erro ao criar o ficheiro" + IDS_CREATEFOLDER_DENIED "Não foi possível criar a pasta '%1'" + IDS_CREATEFOLDER_CAPTION "Erro ao criar pasta" IDS_DELETEITEM_CAPTION "Confirmar exclusão do ficheiro" IDS_DELETEFOLDER_CAPTION "Confirmar exclusão da pasta" IDS_DELETEITEM_TEXT "Tem a certeza que deseja excluir '%1'?" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 5dd1b2527de..a329d63ae92 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -810,6 +810,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Nu poate fi creat un dosar cu numele „%1”" IDS_CREATEFOLDER_CAPTION "Nu poate fi creat dosar" IDS_DELETEITEM_CAPTION "Confirmarea ștergerii fișierului" diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 7315b78d1ef..b3931478987 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -815,6 +815,8 @@ BEGIN IDS_MOVEERROR "Не удаётся переместить '%s': %s" IDS_COPYERROR "Не удаётся скопировать '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Невозможно создать папку '%1'" IDS_CREATEFOLDER_CAPTION "Невозможно создать папку" IDS_DELETEITEM_CAPTION "Подтверждение удаления файла" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index dc275f972bc..27135d0645f 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -808,6 +808,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Potvrdenie odstránenia súboru" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 3cd81c7ecec..81a8f6375a5 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -808,6 +808,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Confirm File Deletion" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index e5ec851050a..3c42675ecb9 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -812,6 +812,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" IDS_DELETEITEM_CAPTION "Konfirmo fshirjen e dokumentit" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 223fb02b50f..e4964c77566 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -808,6 +808,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Kunde inte skapa mappen '%1'" IDS_CREATEFOLDER_CAPTION "Kunde inte skapa mapp" IDS_DELETEITEM_CAPTION "Bekräfta borttagning av fil" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 0abbb8380c6..3c6a1d8c3c2 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -810,6 +810,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED """%1"" dizini oluşturulamıyor." IDS_CREATEFOLDER_CAPTION "Dizin Oluşturulamıyor" IDS_DELETEITEM_CAPTION "Dosya Silmeyi Onayla" diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 8fa830b900c..13ef5465f5d 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -808,6 +808,8 @@ BEGIN IDS_MOVEERROR "Cannot move '%s': %s" IDS_COPYERROR "Cannot copy '%s': %s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "Не вдалося створити папку '%1'" IDS_CREATEFOLDER_CAPTION "Не вдалося створити папку" IDS_DELETEITEM_CAPTION "Підтвердження вилучення файлу" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 4e0bf96736d..a8020c94bfb 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -816,6 +816,8 @@ BEGIN IDS_MOVEERROR "无法移动“%s”：%s" IDS_COPYERROR "无法复制“%s”：%s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "无法创建文件夹“%1”" IDS_CREATEFOLDER_CAPTION "无法创建文件夹" IDS_DELETEITEM_CAPTION "确认文件删除" diff --git a/dll/win32/shell32/lang/zh-HK.rc b/dll/win32/shell32/lang/zh-HK.rc index 28f0577cb10..851bbe22524 100644 --- a/dll/win32/shell32/lang/zh-HK.rc +++ b/dll/win32/shell32/lang/zh-HK.rc @@ -814,6 +814,8 @@ BEGIN IDS_MOVEERROR "無法移動「%s」：%s" IDS_COPYERROR "無法複製「%s」：%s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "無法建立資料夾「%1」" IDS_CREATEFOLDER_CAPTION "無法建立資料夾" IDS_DELETEITEM_CAPTION "確認刪除檔案" diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 371f99222a2..8f8584eb0c0 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -815,6 +815,8 @@ BEGIN IDS_MOVEERROR "無法移動「%s」：%s" IDS_COPYERROR "無法複製「%s」：%s" + IDS_CREATEFILE_DENIED "Could not create file %1" + IDS_CREATEFILE_CAPTION "Error creating file" IDS_CREATEFOLDER_DENIED "無法建立資料夾「%1」" IDS_CREATEFOLDER_CAPTION "無法建立資料夾" IDS_DELETEITEM_CAPTION "確認刪除檔案" diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 33f7bfe3b2c..f7a72000745 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -117,6 +117,8 @@ #define IDS_DRIVE_REMOVABLE 76 #define IDS_FS_UNKNOWN 77 +#define IDS_CREATEFILE_CAPTION 126 +#define IDS_CREATEFILE_DENIED 127 #define IDS_CREATEFOLDER_DENIED 128 #define IDS_CREATEFOLDER_CAPTION 129 #define IDS_DELETEITEM_CAPTION 130

1 0

[reactos] 01/01: [NOTEPAD] Improve DIALOG_GoTo (#5082)
by Katayama Hirofumi MZ 22 Feb '23

22 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a351943caa8ecb60b330c… commit a351943caa8ecb60b330c0c8404c063a5a7fb297 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Feb 22 21:18:05 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 22 21:18:05 2023 +0900 [NOTEPAD] Improve DIALOG_GoTo (#5082) - Don't use text directly in DIALOG_GoTo function. Rely the EM_* message handlers. - Fix and improve DIALOG_GOTO resource dialog (that was wrong in some points). - Add STRING_LINE_NUMBER_OUT_OF_RANGE. CORE-18837 --- base/applications/notepad/dialog.c | 110 +++++++++++++++++--------------- base/applications/notepad/lang/bg-BG.rc | 9 +-- base/applications/notepad/lang/cs-CZ.rc | 9 +-- base/applications/notepad/lang/da-DK.rc | 9 +-- base/applications/notepad/lang/de-DE.rc | 9 +-- base/applications/notepad/lang/el-GR.rc | 9 +-- base/applications/notepad/lang/en-US.rc | 9 +-- base/applications/notepad/lang/es-ES.rc | 9 +-- base/applications/notepad/lang/et-EE.rc | 9 +-- base/applications/notepad/lang/eu-ES.rc | 9 +-- base/applications/notepad/lang/fi-FI.rc | 9 +-- base/applications/notepad/lang/fr-FR.rc | 9 +-- base/applications/notepad/lang/he-IL.rc | 9 +-- base/applications/notepad/lang/hi-IN.rc | 9 +-- base/applications/notepad/lang/hr-HR.rc | 9 +-- base/applications/notepad/lang/hu-HU.rc | 9 +-- base/applications/notepad/lang/hy-AM.rc | 9 +-- base/applications/notepad/lang/id-ID.rc | 9 +-- base/applications/notepad/lang/it-IT.rc | 9 +-- base/applications/notepad/lang/ja-JP.rc | 9 +-- base/applications/notepad/lang/lt-LT.rc | 9 +-- base/applications/notepad/lang/ms-MY.rc | 9 +-- base/applications/notepad/lang/nl-NL.rc | 9 +-- base/applications/notepad/lang/no-NO.rc | 9 +-- base/applications/notepad/lang/pl-PL.rc | 9 +-- base/applications/notepad/lang/pt-BR.rc | 9 +-- base/applications/notepad/lang/pt-PT.rc | 9 +-- base/applications/notepad/lang/ro-RO.rc | 9 +-- base/applications/notepad/lang/ru-RU.rc | 9 +-- base/applications/notepad/lang/sk-SK.rc | 9 +-- base/applications/notepad/lang/sl-SI.rc | 9 +-- base/applications/notepad/lang/sq-AL.rc | 9 +-- base/applications/notepad/lang/sv-SE.rc | 9 +-- base/applications/notepad/lang/th-TH.rc | 9 +-- base/applications/notepad/lang/tr-TR.rc | 9 +-- base/applications/notepad/lang/uk-UA.rc | 9 +-- base/applications/notepad/lang/uz-UZ.rc | 9 +-- base/applications/notepad/lang/zh-CN.rc | 9 +-- base/applications/notepad/lang/zh-HK.rc | 9 +-- base/applications/notepad/lang/zh-TW.rc | 9 +-- base/applications/notepad/notepad_res.h | 1 + 41 files changed, 255 insertions(+), 207 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 27f651c67c1..b62c2768b09 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -1083,82 +1083,90 @@ VOID DIALOG_Replace(VOID) DIALOG_SearchDialog(ReplaceText); } +typedef struct tagGOTO_DATA +{ + UINT iLine; + UINT cLines; +} GOTO_DATA, *PGOTO_DATA; + static INT_PTR CALLBACK DIALOG_GoTo_DialogProc(HWND hwndDialog, UINT uMsg, WPARAM wParam, LPARAM lParam) { - BOOL bResult = FALSE; - HWND hTextBox; - TCHAR szText[32]; + static PGOTO_DATA s_pGotoData; - switch(uMsg) { - case WM_INITDIALOG: - hTextBox = GetDlgItem(hwndDialog, ID_LINENUMBER); - _sntprintf(szText, ARRAY_SIZE(szText), _T("%Id"), lParam); - SetWindowText(hTextBox, szText); - break; - case WM_COMMAND: - if (HIWORD(wParam) == BN_CLICKED) + switch (uMsg) + { + case WM_INITDIALOG: + s_pGotoData = (PGOTO_DATA)lParam; + SetDlgItemInt(hwndDialog, ID_LINENUMBER, s_pGotoData->iLine, FALSE); + return TRUE; /* Set focus */ + + case WM_COMMAND: { if (LOWORD(wParam) == IDOK) { - hTextBox = GetDlgItem(hwndDialog, ID_LINENUMBER); - GetWindowText(hTextBox, szText, ARRAY_SIZE(szText)); - EndDialog(hwndDialog, _ttoi(szText)); - bResult = TRUE; + UINT iLine = GetDlgItemInt(hwndDialog, ID_LINENUMBER, NULL, FALSE); + if (iLine <= 0 || s_pGotoData->cLines < iLine) /* Out of range */ + { + /* Show error message */ + WCHAR title[128], text[256]; + LoadStringW(Globals.hInstance, STRING_NOTEPAD, title, ARRAY_SIZE(title)); + LoadStringW(Globals.hInstance, STRING_LINE_NUMBER_OUT_OF_RANGE, text, ARRAY_SIZE(text)); + MessageBoxW(hwndDialog, text, title, MB_OK); + + SendDlgItemMessageW(hwndDialog, ID_LINENUMBER, EM_SETSEL, 0, -1); + SetFocus(GetDlgItem(hwndDialog, ID_LINENUMBER)); + break; + } + s_pGotoData->iLine = iLine; + EndDialog(hwndDialog, IDOK); } else if (LOWORD(wParam) == IDCANCEL) { - EndDialog(hwndDialog, 0); - bResult = TRUE; + EndDialog(hwndDialog, IDCANCEL); } + break; } - break; } - return bResult; + return 0; } VOID DIALOG_GoTo(VOID) { - INT_PTR nLine; - LPTSTR pszText; - int nLength, i; - DWORD dwStart, dwEnd; - - nLength = GetWindowTextLength(Globals.hEdit); - pszText = (LPTSTR) HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(*pszText)); - if (!pszText) - return; + GOTO_DATA GotoData; + DWORD dwStart = 0, dwEnd = 0; + INT ich, cch = GetWindowTextLength(Globals.hEdit); - /* Retrieve current text */ - GetWindowText(Globals.hEdit, pszText, nLength + 1); + /* Get the current line number and the total line number */ SendMessage(Globals.hEdit, EM_GETSEL, (WPARAM) &dwStart, (LPARAM) &dwEnd); - - nLine = 1; - for (i = 0; (i < (int) dwStart) && pszText[i]; i++) + GotoData.iLine = (UINT)SendMessage(Globals.hEdit, EM_LINEFROMCHAR, dwStart, 0) + 1; + GotoData.cLines = (UINT)SendMessage(Globals.hEdit, EM_GETLINECOUNT, 0, 0); + + /* Ask the user for line number */ + if (DialogBoxParam(Globals.hInstance, + MAKEINTRESOURCE(DIALOG_GOTO), + Globals.hMainWnd, + DIALOG_GoTo_DialogProc, + (LPARAM)&GotoData) != IDOK) { - if (pszText[i] == '\n') - nLine++; + return; /* Canceled */ } - nLine = DialogBoxParam(Globals.hInstance, - MAKEINTRESOURCE(DIALOG_GOTO), - Globals.hMainWnd, - DIALOG_GoTo_DialogProc, - nLine); + --GotoData.iLine; /* Make it zero-based */ - if (nLine >= 1) - { - for (i = 0; pszText[i] && (nLine > 1) && (i < nLength - 1); i++) - { - if (pszText[i] == '\n') - nLine--; - } - SendMessage(Globals.hEdit, EM_SETSEL, i, i); - SendMessage(Globals.hEdit, EM_SCROLLCARET, 0, 0); - } - HeapFree(GetProcessHeap(), 0, pszText); + /* Get ich (the target character index) from line number */ + if (GotoData.iLine <= 0) + ich = 0; + else if (GotoData.iLine >= GotoData.cLines) + ich = cch; + else + ich = (INT)SendMessage(Globals.hEdit, EM_LINEINDEX, GotoData.iLine, 0); + + /* Move the caret */ + SendMessage(Globals.hEdit, EM_SETSEL, ich, ich); + SendMessage(Globals.hEdit, EM_SCROLLCARET, 0, 0); } VOID DIALOG_StatusBarUpdateCaretPos(VOID) diff --git a/base/applications/notepad/lang/bg-BG.rc b/base/applications/notepad/lang/bg-BG.rc index 075c3bcfd3f..955ea84c56f 100644 --- a/base/applications/notepad/lang/bg-BG.rc +++ b/base/applications/notepad/lang/bg-BG.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Отиване на ред" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Ред номер:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "Добре", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Отказ", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Ред номер:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "Добре", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Отказ", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -167,6 +167,7 @@ BEGIN STRING_LINE_COLUMN "Ред %d, стълб %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Възпроизводствено право 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/cs-CZ.rc b/base/applications/notepad/lang/cs-CZ.rc index ad4e4f87391..c50c65a8b54 100644 --- a/base/applications/notepad/lang/cs-CZ.rc +++ b/base/applications/notepad/lang/cs-CZ.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Přejít na řádek" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Číslo řádku:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Storno", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Číslo řádku:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Storno", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -168,6 +168,7 @@ paměti." STRING_LINE_COLUMN "Řádek %d, sloupec %d" STRING_PRINTERROR "Soubor '%s' nebylo možné vytisknout.\n\nZkontrolujte, zda je tiskárna zapnutá a správně nastavená." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Textový dokument" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/da-DK.rc b/base/applications/notepad/lang/da-DK.rc index 6bb09d1e48d..f0b8b8e7acb 100644 --- a/base/applications/notepad/lang/da-DK.rc +++ b/base/applications/notepad/lang/da-DK.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Goto line" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Line number:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Line number:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -168,6 +168,7 @@ hukommelse, og prøv så igen." STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/de-DE.rc b/base/applications/notepad/lang/de-DE.rc index c8168630ddb..6143b98bbb9 100644 --- a/base/applications/notepad/lang/de-DE.rc +++ b/base/applications/notepad/lang/de-DE.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Gehe zu Zeile" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Zeilennummer:", 0x155, 5, 12, 45, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Zeilennummer:", 0x155, 5, 12, 45, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Abbrechen", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -169,6 +169,7 @@ um diese Funktion\nabzuschließen. Beenden Sie eine oder mehrere \ STRING_LINE_COLUMN "Zeile %d, Spalte %d" STRING_PRINTERROR "Die Datei '%s' kann nicht gedruckt werden.\n\nStellen Sie sicher, dass der Drucker angeschlossen und richtig konfiguriert ist." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Textdokument" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/el-GR.rc b/base/applications/notepad/lang/el-GR.rc index a9a39044505..c362a1c76d5 100644 --- a/base/applications/notepad/lang/el-GR.rc +++ b/base/applications/notepad/lang/el-GR.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Μετάβαση στη γραμμή" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Αριθμός γραμμής:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Ακύρωση", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Αριθμός γραμμής:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Ακύρωση", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -168,6 +168,7 @@ BEGIN STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/en-US.rc b/base/applications/notepad/lang/en-US.rc index 3fda7325bc4..2dd54fc24f9 100644 --- a/base/applications/notepad/lang/en-US.rc +++ b/base/applications/notepad/lang/en-US.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Goto line" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Line number:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Line number:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -167,6 +167,7 @@ task.\nClose one or more applications to increase the amount of\nfree memory." STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/es-ES.rc b/base/applications/notepad/lang/es-ES.rc index 786b1b3c1d9..b4d68c439cb 100644 --- a/base/applications/notepad/lang/es-ES.rc +++ b/base/applications/notepad/lang/es-ES.rc @@ -125,10 +125,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Ir a la línea" BEGIN - EDITTEXT ID_LINENUMBER, 89, 10, 86, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Número de línea:", 0x155, 5, 12, 56, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "Aceptar", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Cancelar", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Número de línea:", 0x155, 5, 12, 56, 12 + EDITTEXT ID_LINENUMBER, 89, 10, 86, 12, ES_NUMBER + DEFPUSHBUTTON "Aceptar", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Cancelar", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -170,6 +170,7 @@ aumentar la cantidad\nde memoria libre." STRING_LINE_COLUMN "Línea %d, columna %d" STRING_PRINTERROR "No se puede imprimir el archivo '%s'.\n\nAsegúrese de que la impresora esté encendida y configurada correctamente." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Documento de texto" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/et-EE.rc b/base/applications/notepad/lang/et-EE.rc index 625b5011163..08101d5ac6b 100644 --- a/base/applications/notepad/lang/et-EE.rc +++ b/base/applications/notepad/lang/et-EE.rc @@ -131,10 +131,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Mine reale" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Rea number:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Loobu", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Rea number:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Loobu", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -175,6 +175,7 @@ käsu lõpetamiseks.\nSulge üks või enam rakendust, et suurendada\nvaba mälu STRING_LINE_COLUMN "Rida %d, veerg %d" STRING_PRINTERROR "Ei suuda printida faili '%s'.\n\nVeendu et printer on sisse lülitatud ja korralikult sättestatud." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Tekstidokument" STRING_NOTEPAD_AUTHORS "Autoriõigus 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/eu-ES.rc b/base/applications/notepad/lang/eu-ES.rc index c39b5d5aca6..55fce4b4ff5 100644 --- a/base/applications/notepad/lang/eu-ES.rc +++ b/base/applications/notepad/lang/eu-ES.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Joan lerrora" BEGIN - EDITTEXT ID_LINENUMBER, 60, 10, 100, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Lerro zenbakia:", 0x155, 5, 12, 54, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "Ados", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Utzi", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Lerro zenbakia:", 0x155, 5, 12, 54, 12 + EDITTEXT ID_LINENUMBER, 60, 10, 100, 12, ES_NUMBER + DEFPUSHBUTTON "Ados", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Utzi", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -168,6 +168,7 @@ memoria librearen\nkopurua handitzeko." STRING_LINE_COLUMN "%d linea, %d columna" STRING_PRINTERROR "'%s' fitxategia inprimatu ez ahal du.\n\nZihurtatu behar duzu inmprimagailua pistuta eta ongi konfiguratuta dago." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/fi-FI.rc b/base/applications/notepad/lang/fi-FI.rc index 31278ed53d1..fc140b42480 100644 --- a/base/applications/notepad/lang/fi-FI.rc +++ b/base/applications/notepad/lang/fi-FI.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Goto line" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Line number:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Line number:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -168,6 +168,7 @@ muistia." STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/fr-FR.rc b/base/applications/notepad/lang/fr-FR.rc index 35340a79710..bbdaa8511c2 100644 --- a/base/applications/notepad/lang/fr-FR.rc +++ b/base/applications/notepad/lang/fr-FR.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Atteindre..." BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Numéro de ligne :", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Annuler", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Numéro de ligne :", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Annuler", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -168,6 +168,7 @@ de la mémoire." STRING_LINE_COLUMN "Ligne %d, colonne %d" STRING_PRINTERROR "Impossible d'imprimer le fichier '%s'.\n\nVérifiez que l'imprimante est allumée et correctement configurée." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Document Texte" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/he-IL.rc b/base/applications/notepad/lang/he-IL.rc index 14208a81b3a..a1a320a3850 100644 --- a/base/applications/notepad/lang/he-IL.rc +++ b/base/applications/notepad/lang/he-IL.rc @@ -126,10 +126,10 @@ EXSTYLE WS_EX_LAYOUTRTL FONT 8, "MS Shell Dlg" CAPTION "מעבר אל שורה" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "מספר שורה:", 0x155, 3, 12, 43, 11, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "אישור", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "ביטול", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "מספר שורה:", 0x155, 3, 12, 43, 11 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "אישור", IDOK, 75, 30, 40, 15 + PUSHBUTTON "ביטול", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -170,6 +170,7 @@ task.\nClose one or more applications to increase the amount of\nfree memory." STRING_LINE_COLUMN "שורה %d, עמודה %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/hi-IN.rc b/base/applications/notepad/lang/hi-IN.rc index f205d05538e..15f70a0e759 100644 --- a/base/applications/notepad/lang/hi-IN.rc +++ b/base/applications/notepad/lang/hi-IN.rc @@ -130,10 +130,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "गोटो लाइन" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "लाइन संख्या:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "ओके", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "रद्द करें", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "लाइन संख्या:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "ओके", IDOK, 75, 30, 40, 15 + PUSHBUTTON "रद्द करें", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -174,6 +174,7 @@ BEGIN STRING_LINE_COLUMN "लाइन%d, स्तंभ%d" STRING_PRINTERROR "फ़ाइल '%s' मुद्रित नहीं कर सकता।\n\n सुनिश्चित करें कि प्रिंटर चालू है और ठीक से कॉन्फ़िगर किया गया है।" STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "टेक्स्ट डॉक्यूमॅन्ट" STRING_NOTEPAD_AUTHORS "कॉपीराइट 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/hr-HR.rc b/base/applications/notepad/lang/hr-HR.rc index 4ec5d860647..7cd1fea757e 100644 --- a/base/applications/notepad/lang/hr-HR.rc +++ b/base/applications/notepad/lang/hr-HR.rc @@ -130,10 +130,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Idi na liniju" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Broj linije:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "U redu", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Odustani", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Broj linije:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "U redu", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Odustani", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -174,6 +174,7 @@ zadatak.\nZatvorite jednu ili više aplikacija da povećate\nslobodnu memoriju." STRING_LINE_COLUMN "Linija %d, Stupac %d" STRING_PRINTERROR "Ne mogu ispisati datoteku '%s'.\n\nProvjerite je li pisač uključen i je li pravilno konfiguiran." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Tekstni dokument" STRING_NOTEPAD_AUTHORS "Copyright 1997, 98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/hu-HU.rc b/base/applications/notepad/lang/hu-HU.rc index cf257619dd9..ff0ed7099b0 100644 --- a/base/applications/notepad/lang/hu-HU.rc +++ b/base/applications/notepad/lang/hu-HU.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Ugrás sorra" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Sor száma:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Mégse", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Sor száma:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Mégse", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -168,6 +168,7 @@ Szeretné menteni a változásokat?" STRING_LINE_COLUMN "Sor: %d, oszlop: %d" STRING_PRINTERROR "Nem sikerült kinyomtatni a következő fájlt: '%s'.\n\nEllenőrizze hogy a nyomtató be van-e kapcsolva és megfelelően van-e konfigurálva." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Szöveges dokumentum" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/hy-AM.rc b/base/applications/notepad/lang/hy-AM.rc index d6b34ddf072..78501b77a81 100644 --- a/base/applications/notepad/lang/hy-AM.rc +++ b/base/applications/notepad/lang/hy-AM.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Անցնել տող..." BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Տողի համարը:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Չնդունել", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Տողի համարը:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Չնդունել", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -167,6 +167,7 @@ Would you like to save the changes ?" STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/id-ID.rc b/base/applications/notepad/lang/id-ID.rc index f080b0d01e9..c690e7d0c87 100644 --- a/base/applications/notepad/lang/id-ID.rc +++ b/base/applications/notepad/lang/id-ID.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Pergi ke Baris" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Nomor Baris:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Batal", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Nomor Baris:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Batal", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -168,6 +168,7 @@ bebas." STRING_LINE_COLUMN "Baris %d, kolom %d" STRING_PRINTERROR "Tidak bisa mencetak '%s'.\n\nPastikan pencetak telah menyala dan bisa digunakan dengan benar." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Teks Dokumen" STRING_NOTEPAD_AUTHORS "Hak Cipta 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/it-IT.rc b/base/applications/notepad/lang/it-IT.rc index 03f5ce48fa0..2bf7cb3c202 100644 --- a/base/applications/notepad/lang/it-IT.rc +++ b/base/applications/notepad/lang/it-IT.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Vai a riga" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Numero di riga:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Annulla", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Numero di riga:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Annulla", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -168,6 +168,7 @@ di memoria libera." STRING_LINE_COLUMN "Linea %d, colonna %d" STRING_PRINTERROR "Impossibile stampare il file '%s'.\n\nControllare che la stampante sia accesa e impostata correttamente." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Documento di testo" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/ja-JP.rc b/base/applications/notepad/lang/ja-JP.rc index 9ccc5f27419..ff0fbb033e6 100644 --- a/base/applications/notepad/lang/ja-JP.rc +++ b/base/applications/notepad/lang/ja-JP.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 9, "MS UI Gothic" CAPTION "行へ移動" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "行番号:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "キャンセル", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "行番号:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "キャンセル", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -168,6 +168,7 @@ BEGIN STRING_LINE_COLUMN "%d 行、%d 列" STRING_PRINTERROR "ファイル '%s'を印刷できません。\n\nプリンタがオンになっていて、正しく設定されているか確認して下さい。" STRING_DEFAULTFONT "ＭＳゴシック" /* MS Gothic */ + STRING_LINE_NUMBER_OUT_OF_RANGE "指定された行番号は範囲外です。" STRING_TEXT_DOCUMENT "テキスト文書" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/lt-LT.rc b/base/applications/notepad/lang/lt-LT.rc index dd8baa3418e..55ea57b7134 100644 --- a/base/applications/notepad/lang/lt-LT.rc +++ b/base/applications/notepad/lang/lt-LT.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Eiti į eilutę" BEGIN - EDITTEXT ID_LINENUMBER, 64, 10, 96, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Eilutės numeris:", 0x155, 5, 12, 54, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "Gerai", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Atsisakyti", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Eilutės numeris:", 0x155, 5, 12, 54, 12 + EDITTEXT ID_LINENUMBER, 64, 10, 96, 12, ES_NUMBER + DEFPUSHBUTTON "Gerai", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Atsisakyti", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -167,6 +167,7 @@ Ar norite išsaugoti pakeitimus?" STRING_LINE_COLUMN "Eilutė %d, stulpelis %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "(C) 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/ms-MY.rc b/base/applications/notepad/lang/ms-MY.rc index 24b94da7ebd..a261729f19c 100644 --- a/base/applications/notepad/lang/ms-MY.rc +++ b/base/applications/notepad/lang/ms-MY.rc @@ -125,10 +125,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Pergi ke garisan" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Nombor baris:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Batal", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Nombor baris:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Batal", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -169,6 +169,7 @@ tugas ini.\nTutup satu atau lebih aplikasi untuk menambah jumlah\ningatan kosong STRING_LINE_COLUMN "Garisan %d, Kolum %d" STRING_PRINTERROR "Tidak boleh mencetak fail '%s'.\n\nPastikan pencetak dihidupkan dan dikonfigurasikan dengan betul." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/nl-NL.rc b/base/applications/notepad/lang/nl-NL.rc index cd1f4f4a3a6..f1451f7edd0 100644 --- a/base/applications/notepad/lang/nl-NL.rc +++ b/base/applications/notepad/lang/nl-NL.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Goto line" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Line number:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Line number:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -167,6 +167,7 @@ Wilt u de wijzigingen opslaan?" STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/no-NO.rc b/base/applications/notepad/lang/no-NO.rc index ab0b3fe71f8..bfd23c526cb 100644 --- a/base/applications/notepad/lang/no-NO.rc +++ b/base/applications/notepad/lang/no-NO.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Gå til linje" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Line nummer:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Avbryt", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Line nummer:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Avbryt", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -168,6 +168,7 @@ minne." STRING_LINE_COLUMN "Linje %d, kolonne %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Enerett 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/pl-PL.rc b/base/applications/notepad/lang/pl-PL.rc index 2ea5139af72..6c064cfd089 100644 --- a/base/applications/notepad/lang/pl-PL.rc +++ b/base/applications/notepad/lang/pl-PL.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Idź do linii" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Numer linii:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Anuluj", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Numer linii:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Anuluj", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -162,6 +162,7 @@ BEGIN STRING_LINE_COLUMN "Linia %d, kolumna %d" STRING_PRINTERROR "Nie można wydrukować pliku '%s'.\n\nUpewnij się, że drukarka jest włączona i poprawnie skonfigurowana." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Dokument tekstowy" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/pt-BR.rc b/base/applications/notepad/lang/pt-BR.rc index a3012bf1ecc..9bf26297c29 100644 --- a/base/applications/notepad/lang/pt-BR.rc +++ b/base/applications/notepad/lang/pt-BR.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Ir para linha" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Número da linha:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Cancelar", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Número da linha:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Cancelar", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -167,6 +167,7 @@ tarefa.\nFeche uma ou mais aplicações para aumentar a quantidade de memória l STRING_LINE_COLUMN "Linha %d, coluna %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/pt-PT.rc b/base/applications/notepad/lang/pt-PT.rc index 3a15441d46b..6eb677293c2 100644 --- a/base/applications/notepad/lang/pt-PT.rc +++ b/base/applications/notepad/lang/pt-PT.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Ir para linha" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Número da linha:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Cancelar", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Número da linha:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Cancelar", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -167,6 +167,7 @@ tarefa.\nFeche uma ou mais aplicações para aumentar a quantidade de memória l STRING_LINE_COLUMN "Linha %d, coluna %d" STRING_PRINTERROR "Impossível imprimir o ficheiro '%s'.\n\nCertifique-se de que a impressora está ligada e correctamente configurada." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Documento de texto" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/ro-RO.rc b/base/applications/notepad/lang/ro-RO.rc index 230c34a52b6..f8ee0a8a557 100644 --- a/base/applications/notepad/lang/ro-RO.rc +++ b/base/applications/notepad/lang/ro-RO.rc @@ -128,10 +128,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Salt la poziție" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Număr linie:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "Con&firmă", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "A&nulează", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Număr linie:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "Con&firmă", IDOK, 75, 30, 40, 15 + PUSHBUTTON "A&nulează", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -172,6 +172,7 @@ Păstrați modificările aduse?" STRING_LINE_COLUMN "Linia %d, coloana %d" STRING_PRINTERROR "Fișierul „%s” nu a putut fi imprimat.\n\nAsigurați-vă că imprimanta este pornită și configurată corespunzător." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Document text" STRING_NOTEPAD_AUTHORS "Drept de autor 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/ru-RU.rc b/base/applications/notepad/lang/ru-RU.rc index 92d073f40a3..1b52362c6f8 100644 --- a/base/applications/notepad/lang/ru-RU.rc +++ b/base/applications/notepad/lang/ru-RU.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Перейти к строке" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Номер строки:", 0x155, 5, 12, 49, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Отмена", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Номер строки:", 0x155, 5, 12, 49, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Отмена", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -167,6 +167,7 @@ BEGIN STRING_LINE_COLUMN "Строка %d, столбец %d" STRING_PRINTERROR "Невозможно распечатать файл '%s'.\n\nПроверьте, включен ли принтер, и настроен ли он правильно." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Текстовый документ" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/sk-SK.rc b/base/applications/notepad/lang/sk-SK.rc index 0f5fc7ac423..7b7d740e85d 100644 --- a/base/applications/notepad/lang/sk-SK.rc +++ b/base/applications/notepad/lang/sk-SK.rc @@ -131,10 +131,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Riadok, na ktorý sa má prejsť" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Číslo riadka:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Zrušiť", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Číslo riadka:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Zrušiť", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -175,6 +175,7 @@ alebo viac aplikácií, aby sa uvoľnila pamäť a skúste to znova." STRING_LINE_COLUMN "Riadok %d, stĺpec %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/sl-SI.rc b/base/applications/notepad/lang/sl-SI.rc index 7cb591e0df3..d3c655f8828 100644 --- a/base/applications/notepad/lang/sl-SI.rc +++ b/base/applications/notepad/lang/sl-SI.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Goto line" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Line number:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Line number:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -167,6 +167,7 @@ operacijo.\nÈe ga želite sprostiti, konèajte enega ali veè programov in posk STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/sq-AL.rc b/base/applications/notepad/lang/sq-AL.rc index 3381c59ffbe..9ad098f2948 100644 --- a/base/applications/notepad/lang/sq-AL.rc +++ b/base/applications/notepad/lang/sq-AL.rc @@ -127,10 +127,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Shko tek linja" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Numri i linjes:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Anulo", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Numri i linjes:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Anulo", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -171,6 +171,7 @@ detyrë.\nMbyll nje ose me shume programe te rrisesh shumën e\nmemories." STRING_LINE_COLUMN "Linje %d, kolonë %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/sv-SE.rc b/base/applications/notepad/lang/sv-SE.rc index 8f124547918..120eefdc5cc 100644 --- a/base/applications/notepad/lang/sv-SE.rc +++ b/base/applications/notepad/lang/sv-SE.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Gå till rad" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Radnummer:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Avbryt", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Radnummer:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Avbryt", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -167,6 +167,7 @@ den här åtgärden.\nAvsluta ett eller flera program för att frigöra mer minn STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/th-TH.rc b/base/applications/notepad/lang/th-TH.rc index b59aeffba94..3af4eef7ea1 100644 --- a/base/applications/notepad/lang/th-TH.rc +++ b/base/applications/notepad/lang/th-TH.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Goto line" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Line number:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Line number:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -162,6 +162,7 @@ BEGIN STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/tr-TR.rc b/base/applications/notepad/lang/tr-TR.rc index 1485fa6c107..78e609ca893 100644 --- a/base/applications/notepad/lang/tr-TR.rc +++ b/base/applications/notepad/lang/tr-TR.rc @@ -126,10 +126,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Satıra Git" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "&Satır Numarası:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "Tamam", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "İptal", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "&Satır Numarası:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "Tamam", IDOK, 75, 30, 40, 15 + PUSHBUTTON "İptal", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -165,6 +165,7 @@ BEGIN STRING_LINE_COLUMN "%d. Satır, %d. Sütun" STRING_PRINTERROR """%s"" dosyası yazdırılamıyor.\n\nYazıcının açık olduğundan ve doğru yapılandırıldığından emin olunuz." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Metin Belgesi" STRING_NOTEPAD_AUTHORS "Telif Hakları: 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/uk-UA.rc b/base/applications/notepad/lang/uk-UA.rc index 312dbd390c9..854d1407c5a 100644 --- a/base/applications/notepad/lang/uk-UA.rc +++ b/base/applications/notepad/lang/uk-UA.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Перехід до рядка" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Номер рядка:", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Скасувати", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Номер рядка:", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Скасувати", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -167,6 +167,7 @@ BEGIN STRING_LINE_COLUMN "Рядок %d, стовпчик %d" STRING_PRINTERROR "Неможливо розпечатати файл '%s'.\n\nПереконайтесь, що принтер ввімкнено, та налаштовано." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Текстовий документ" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/uz-UZ.rc b/base/applications/notepad/lang/uz-UZ.rc index 0ed6903c641..42a4d14afd0 100644 --- a/base/applications/notepad/lang/uz-UZ.rc +++ b/base/applications/notepad/lang/uz-UZ.rc @@ -123,10 +123,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Qatorga o‘tish" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "Q&ator raqami:", 0x155, 5, 12, 49, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "O‘tmoq", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "Bekor qilmoq", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "Q&ator raqami:", 0x155, 5, 12, 49, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "O‘tmoq", IDOK, 75, 30, 40, 15 + PUSHBUTTON "Bekor qilmoq", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -167,6 +167,7 @@ O‘zgarishlarni saqlashni istaysizmi?" STRING_LINE_COLUMN "Qator %d, Ustun %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/zh-CN.rc b/base/applications/notepad/lang/zh-CN.rc index 0fade682a67..4808a2e015b 100644 --- a/base/applications/notepad/lang/zh-CN.rc +++ b/base/applications/notepad/lang/zh-CN.rc @@ -131,10 +131,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 9, "宋体" CAPTION "转到行" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "行数：", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "确定", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "取消", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "行数：", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "确定", IDOK, 75, 30, 40, 15 + PUSHBUTTON "取消", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -175,6 +175,7 @@ BEGIN STRING_LINE_COLUMN "行 %d，列 %d" STRING_PRINTERROR "无法打印文件“%s”。\n\n请确保打印机已打开，并且已正确配置。" STRING_DEFAULTFONT "宋体" /* SimSun */ + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "文本文档" STRING_NOTEPAD_AUTHORS "版权所有 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/zh-HK.rc b/base/applications/notepad/lang/zh-HK.rc index cd08e43b22c..2ceb617aaed 100644 --- a/base/applications/notepad/lang/zh-HK.rc +++ b/base/applications/notepad/lang/zh-HK.rc @@ -131,10 +131,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 9, "新細明體" CAPTION "跳到行數" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "行數(&L)：", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "確定", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "取消", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "行數(&L)：", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "確定", IDOK, 75, 30, 40, 15 + PUSHBUTTON "取消", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -176,6 +176,7 @@ BEGIN STRING_PRINTERROR "檔案「%s」列印失敗。\n\ 請檢查印表機是否已經開機及正確設定。" STRING_DEFAULTFONT "新細明體" /* PMingLiU */ + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "純文字檔案" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/zh-TW.rc b/base/applications/notepad/lang/zh-TW.rc index a1cfd19ca4d..f83d9d8c80f 100644 --- a/base/applications/notepad/lang/zh-TW.rc +++ b/base/applications/notepad/lang/zh-TW.rc @@ -131,10 +131,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 9, "新細明體" CAPTION "跳到行數" BEGIN - EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP - LTEXT "行數(&L)：", 0x155, 5, 12, 41, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER - DEFPUSHBUTTON "確定", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP - PUSHBUTTON "取消", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP + LTEXT "行數(&L)：", 0x155, 5, 12, 41, 12 + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, ES_NUMBER + DEFPUSHBUTTON "確定", IDOK, 75, 30, 40, 15 + PUSHBUTTON "取消", IDCANCEL, 120, 30, 40, 15 END STRINGTABLE @@ -175,6 +175,7 @@ BEGIN STRING_LINE_COLUMN "第 %d 行，第 %d 字元" STRING_PRINTERROR "檔案「%s」列印失敗。\n\n請檢查印表機是否已經開機和正確設定。" STRING_DEFAULTFONT "新細明體" /* PMingLiU */ + STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." STRING_TEXT_DOCUMENT "純文字檔案" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/notepad_res.h b/base/applications/notepad/notepad_res.h index c4556771b2e..460a7c8d3d4 100644 --- a/base/applications/notepad/notepad_res.h +++ b/base/applications/notepad/notepad_res.h @@ -101,6 +101,7 @@ #define STRING_LINE_COLUMN 0x188 #define STRING_PRINTERROR 0x189 #define STRING_DEFAULTFONT 0x18A +#define STRING_LINE_NUMBER_OUT_OF_RANGE 0x18B #define STRING_TEXT_DOCUMENT 0x200

1 0

[reactos] 01/01: [NTUSER] Send WM_IME_SYSTEM:IMS_UPDATEIMEUI (#5075)
by Katayama Hirofumi MZ 21 Feb '23

21 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95a64cbdd2dab47c38cb3… commit 95a64cbdd2dab47c38cb3be48a753e9213e7be15 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Feb 22 08:35:55 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 22 08:35:55 2023 +0900 [NTUSER] Send WM_IME_SYSTEM:IMS_UPDATEIMEUI (#5075) Send WM_IME_SYSTEM:IMS_UPDATEIMEUI message after window position change to improve IME UI sync. CORE-11700, CORE-15289 --- win32ss/user/ntuser/winpos.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index ba4d451de93..45c721de368 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -4,9 +4,11 @@ * PURPOSE: Windows * FILE: win32ss/user/ntuser/winpos.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include <win32k.h> +#include <ddk/immdev.h> DBG_DEFAULT_CHANNEL(UserWinpos); /* GLOBALS *******************************************************************/ @@ -1743,6 +1745,43 @@ ForceNCPaintErase(PWND Wnd, HRGN hRgn, PREGION pRgn) } } +static VOID FASTCALL IntImeWindowPosChanged(VOID) +{ + HWND *phwnd; + PWND pwndNode, pwndDesktop = UserGetDesktopWindow(); + PWINDOWLIST pWL; + USER_REFERENCE_ENTRY Ref; + + if (!pwndDesktop) + return; + + /* Enumerate the windows to get the IME windows (of default and non-default) */ + pWL = IntBuildHwndList(pwndDesktop->spwndChild, IACE_LIST, gptiCurrent); + if (!pWL) + return; + + for (phwnd = pWL->ahwnd; *phwnd != HWND_TERMINATOR; ++phwnd) + { + if (gptiCurrent->TIF_flags & TIF_INCLEANUP) + break; + + pwndNode = ValidateHwndNoErr(*phwnd); + if (pwndNode == NULL || + pwndNode->head.pti != gptiCurrent || + pwndNode->pcls->atomClassName != gpsi->atomSysClass[ICLS_IME]) + { + continue; + } + + /* Now hwndNode is an IME window of the current thread */ + UserRefObjectCo(pwndNode, &Ref); + co_IntSendMessage(*phwnd, WM_IME_SYSTEM, IMS_UPDATEIMEUI, 0); + UserDerefObjectCo(pwndNode); + } + + IntFreeHwndList(pWL); +} + /* x and y are always screen relative */ BOOLEAN FASTCALL co_WinPosSetWindowPos( @@ -2303,6 +2342,13 @@ co_WinPosSetWindowPos( IntNotifyWinEvent(EVENT_OBJECT_LOCATIONCHANGE, pWnd, OBJID_WINDOW, CHILDID_SELF, WEF_SETBYWNDPTI); } + /* Send WM_IME_SYSTEM:IMS_UPDATEIMEUI to the IME windows if necessary */ + if ((WinPos.flags & (SWP_NOMOVE | SWP_NOSIZE)) != (SWP_NOMOVE | SWP_NOSIZE)) + { + if (IS_IMM_MODE()) + IntImeWindowPosChanged(); + } + if(bPointerInWindow != IntPtInWindow(Window, gpsi->ptCursor.x, gpsi->ptCursor.y)) { /* Generate mouse move message */ @@ -3165,6 +3211,7 @@ BOOL FASTCALL IntEndDeferWindowPosEx(HDWP hdwp, BOOL bAsync) UserDerefObjectCo(pwnd); } + ExFreePoolWithTag(pDWP->acvr, USERTAG_SWP); UserDereferenceObject(pDWP); UserDeleteObject(hdwp, TYPE_SETWINDOWPOS);

1 0

[reactos] 01/01: [NOTEPAD] Avoid half-initialized status of settings (#5078)
by Katayama Hirofumi MZ 21 Feb '23

21 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ead9366ef79747a9c2ea1… commit ead9366ef79747a9c2ea12492de6688f34005fb2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Feb 21 09:22:41 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Feb 21 09:22:41 2023 +0900 [NOTEPAD] Avoid half-initialized status of settings (#5078) - Avoid buffer overrun in QueryString helper function. - Improve NOTEPAD_LoadSettingsFromRegistry function. CORE-18837 --- base/applications/notepad/main.c | 6 +- base/applications/notepad/settings.c | 129 ++++++++++++++++++----------------- 2 files changed, 67 insertions(+), 68 deletions(-) diff --git a/base/applications/notepad/main.c b/base/applications/notepad/main.c index f99fb40621a..e42b0c749e0 100644 --- a/base/applications/notepad/main.c +++ b/base/applications/notepad/main.c @@ -560,6 +560,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE prev, LPTSTR cmdline, int sh HMONITOR monitor; MONITORINFO info; INT x, y; + RECT rcIntersect; static const TCHAR className[] = _T("Notepad"); static const TCHAR winName[] = _T("Notepad"); @@ -609,10 +610,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE prev, LPTSTR cmdline, int sh x = Globals.main_rect.left; y = Globals.main_rect.top; - if (Globals.main_rect.left >= info.rcWork.right || - Globals.main_rect.top >= info.rcWork.bottom || - Globals.main_rect.right < info.rcWork.left || - Globals.main_rect.bottom < info.rcWork.top) + if (!IntersectRect(&rcIntersect, &Globals.main_rect, &info.rcWork)) x = y = CW_USEDEFAULT; Globals.hMainWnd = CreateWindow(className, diff --git a/base/applications/notepad/settings.c b/base/applications/notepad/settings.c index 0031e14f9b0..32bfd098683 100644 --- a/base/applications/notepad/settings.c +++ b/base/applications/notepad/settings.c @@ -100,9 +100,14 @@ static BOOL QueryBool(HKEY hKey, LPCTSTR pszValueName, BOOL *pbResult) return TRUE; } -static BOOL QueryString(HKEY hKey, LPCTSTR pszValueName, LPTSTR pszResult, DWORD dwResultSize) +static BOOL QueryString(HKEY hKey, LPCTSTR pszValueName, LPTSTR pszResult, DWORD dwResultLength) { - return QueryGeneric(hKey, pszValueName, REG_SZ, pszResult, dwResultSize * sizeof(TCHAR)); + if (dwResultLength == 0) + return FALSE; + if (!QueryGeneric(hKey, pszValueName, REG_SZ, pszResult, dwResultLength * sizeof(TCHAR))) + return FALSE; + pszResult[dwResultLength - 1] = 0; /* Avoid buffer overrun */ + return TRUE; } /*********************************************************************** @@ -113,24 +118,38 @@ static BOOL QueryString(HKEY hKey, LPCTSTR pszValueName, LPTSTR pszResult, DWORD */ void NOTEPAD_LoadSettingsFromRegistry(void) { - HKEY hKey = NULL; + HKEY hKey; HFONT hFont; - DWORD dwPointSize = 0; - INT base_length, dx, dy; - - base_length = (GetSystemMetrics(SM_CXSCREEN) > GetSystemMetrics(SM_CYSCREEN)) ? - GetSystemMetrics(SM_CYSCREEN) : GetSystemMetrics(SM_CXSCREEN); - - dx = (INT)(base_length * .95); - dy = dx * 3 / 4; - SetRect(&Globals.main_rect, 0, 0, dx, dy); - - if (RegOpenKey(HKEY_CURRENT_USER, s_szRegistryKey, &hKey) == ERROR_SUCCESS) + DWORD dwPointSize, cx, cy; + DWORD cxScreen = GetSystemMetrics(SM_CXSCREEN), cyScreen = GetSystemMetrics(SM_CYSCREEN); + + /* Set the default values */ + Globals.bShowStatusBar = TRUE; + Globals.bWrapLongLines = FALSE; + SetRect(&Globals.lMargins, 750, 1000, 750, 1000); + ZeroMemory(&Globals.lfFont, sizeof(Globals.lfFont)); + Globals.lfFont.lfCharSet = DEFAULT_CHARSET; + dwPointSize = 100; + Globals.lfFont.lfWeight = FW_NORMAL; + Globals.lfFont.lfPitchAndFamily = FIXED_PITCH | FF_MODERN; + Globals.main_rect.left = CW_USEDEFAULT; + Globals.main_rect.top = CW_USEDEFAULT; + cx = min((cxScreen * 3) / 4, 640); + cy = min((cyScreen * 3) / 4, 480); + + /* FIXME: Globals.fSaveWindowPositions = FALSE; */ + /* FIXME: Globals.fMLE_is_broken = FALSE; */ + + /* Open the target registry key */ + if (RegOpenKey(HKEY_CURRENT_USER, s_szRegistryKey, &hKey) != ERROR_SUCCESS) + hKey = NULL; + + /* Load the values from registry */ + if (hKey) { QueryByte(hKey, _T("lfCharSet"), &Globals.lfFont.lfCharSet); QueryByte(hKey, _T("lfClipPrecision"), &Globals.lfFont.lfClipPrecision); QueryDword(hKey, _T("lfEscapement"), (DWORD*)&Globals.lfFont.lfEscapement); - QueryString(hKey, _T("lfFaceName"), Globals.lfFont.lfFaceName, ARRAY_SIZE(Globals.lfFont.lfFaceName)); QueryByte(hKey, _T("lfItalic"), &Globals.lfFont.lfItalic); QueryDword(hKey, _T("lfOrientation"), (DWORD*)&Globals.lfFont.lfOrientation); QueryByte(hKey, _T("lfOutPrecision"), &Globals.lfFont.lfOutPrecision); @@ -140,10 +159,10 @@ void NOTEPAD_LoadSettingsFromRegistry(void) QueryByte(hKey, _T("lfUnderline"), &Globals.lfFont.lfUnderline); QueryDword(hKey, _T("lfWeight"), (DWORD*)&Globals.lfFont.lfWeight); QueryDword(hKey, _T("iPointSize"), &dwPointSize); + QueryBool(hKey, _T("fWrap"), &Globals.bWrapLongLines); QueryBool(hKey, _T("fStatusBar"), &Globals.bShowStatusBar); - QueryString(hKey, _T("szHeader"), Globals.szHeader, ARRAY_SIZE(Globals.szHeader)); - QueryString(hKey, _T("szTrailer"), Globals.szFooter, ARRAY_SIZE(Globals.szFooter)); + QueryDword(hKey, _T("iMarginLeft"), (DWORD*)&Globals.lMargins.left); QueryDword(hKey, _T("iMarginTop"), (DWORD*)&Globals.lMargins.top); QueryDword(hKey, _T("iMarginRight"), (DWORD*)&Globals.lMargins.right); @@ -151,62 +170,44 @@ void NOTEPAD_LoadSettingsFromRegistry(void) QueryDword(hKey, _T("iWindowPosX"), (DWORD*)&Globals.main_rect.left); QueryDword(hKey, _T("iWindowPosY"), (DWORD*)&Globals.main_rect.top); - QueryDword(hKey, _T("iWindowPosDX"), (DWORD*)&dx); - QueryDword(hKey, _T("iWindowPosDY"), (DWORD*)&dy); - - Globals.main_rect.right = Globals.main_rect.left + dx; - Globals.main_rect.bottom = Globals.main_rect.top + dy; + QueryDword(hKey, _T("iWindowPosDX"), &cx); + QueryDword(hKey, _T("iWindowPosDY"), &cy); + } - if (dwPointSize != 0) - Globals.lfFont.lfHeight = HeightFromPointSize(dwPointSize); - else - Globals.lfFont.lfHeight = HeightFromPointSize(100); + Globals.lfFont.lfHeight = HeightFromPointSize(dwPointSize); + Globals.main_rect.right = Globals.main_rect.left + cx; + Globals.main_rect.bottom = Globals.main_rect.top + cy; - RegCloseKey(hKey); - } - else + if (!hKey || !QueryString(hKey, _T("lfFaceName"), + Globals.lfFont.lfFaceName, ARRAY_SIZE(Globals.lfFont.lfFaceName))) { - /* If no settings are found in the registry, then use default values */ - Globals.bShowStatusBar = TRUE; - Globals.bWrapLongLines = FALSE; - SetRect(&Globals.lMargins, 750, 1000, 750, 1000); - - /* FIXME: Globals.fSaveWindowPositions = FALSE; */ - /* FIXME: Globals.fMLE_is_broken = FALSE; */ + LoadString(Globals.hInstance, STRING_DEFAULTFONT, Globals.lfFont.lfFaceName, + ARRAY_SIZE(Globals.lfFont.lfFaceName)); + } + if (!hKey || !QueryString(hKey, _T("szHeader"), Globals.szHeader, ARRAY_SIZE(Globals.szHeader))) + { LoadString(Globals.hInstance, STRING_PAGESETUP_HEADERVALUE, Globals.szHeader, ARRAY_SIZE(Globals.szHeader)); + } + + if (!hKey || !QueryString(hKey, _T("szTrailer"), Globals.szFooter, ARRAY_SIZE(Globals.szFooter))) + { LoadString(Globals.hInstance, STRING_PAGESETUP_FOOTERVALUE, Globals.szFooter, ARRAY_SIZE(Globals.szFooter)); + } - ZeroMemory(&Globals.lfFont, sizeof(Globals.lfFont)); - Globals.lfFont.lfCharSet = DEFAULT_CHARSET; - Globals.lfFont.lfClipPrecision = CLIP_STROKE_PRECIS; - Globals.lfFont.lfEscapement = 0; - LoadString(Globals.hInstance, STRING_DEFAULTFONT, Globals.lfFont.lfFaceName, - ARRAY_SIZE(Globals.lfFont.lfFaceName)); - Globals.lfFont.lfItalic = FALSE; - Globals.lfFont.lfOrientation = 0; - Globals.lfFont.lfOutPrecision = OUT_STRING_PRECIS; - - /* WORKAROUND: Far East Asian users may not have suitable fixed-pitch fonts. */ - switch (PRIMARYLANGID(GetUserDefaultLangID())) - { - case LANG_CHINESE: - case LANG_JAPANESE: - case LANG_KOREAN: - Globals.lfFont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; - break; - default: - Globals.lfFont.lfPitchAndFamily = FIXED_PITCH | FF_MODERN; - break; - } - - Globals.lfFont.lfQuality = PROOF_QUALITY; - Globals.lfFont.lfStrikeOut = FALSE; - Globals.lfFont.lfUnderline = FALSE; - Globals.lfFont.lfWeight = FW_NORMAL; - Globals.lfFont.lfHeight = HeightFromPointSize(100); + if (hKey) + RegCloseKey(hKey); + + /* WORKAROUND: Far East Asian users may not have suitable fixed-pitch fonts. */ + switch (PRIMARYLANGID(GetUserDefaultLangID())) + { + case LANG_CHINESE: + case LANG_JAPANESE: + case LANG_KOREAN: + Globals.lfFont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; + break; } hFont = CreateFontIndirect(&Globals.lfFont);

1 0

[reactos] 01/01: [SHLWAPI][SHLWAPI_APITEST] Expand string in SHLoadIndirectString (#5084)
by Katayama Hirofumi MZ 21 Feb '23

21 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c1e83d5145c2433a2153… commit 4c1e83d5145c2433a21533e3d098107422bea8b6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Feb 21 09:17:47 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Feb 21 09:17:47 2023 +0900 [SHLWAPI][SHLWAPI_APITEST] Expand string in SHLoadIndirectString (#5084) - shlwapi!SHLoadIndirectString expands the environmental strings if the first character was '@'. - Implement SHLoadRegUIStringA function. CORE-10667 --- dll/win32/shlwapi/ordinal.c | 27 ++++++ dll/win32/shlwapi/shlwapi.spec | 2 +- dll/win32/shlwapi/string.c | 10 +++ modules/rostests/apitests/shlwapi/CMakeLists.txt | 3 +- .../rostests/apitests/shlwapi/SHLoadRegUIString.c | 96 ++++++++++++++++++++++ modules/rostests/apitests/shlwapi/testlist.c | 2 + 6 files changed, 138 insertions(+), 2 deletions(-) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index b8b93a60372..8286fe22e2f 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -4121,6 +4121,33 @@ BOOL WINAPI IsOS(DWORD feature) return FALSE; } +#ifdef __REACTOS__ +/************************************************************************* + * @ [SHLWAPI.438] + */ +HRESULT WINAPI SHLoadRegUIStringA(HKEY hkey, LPCSTR value, LPSTR buf, DWORD size) +{ + WCHAR valueW[MAX_PATH], bufferW[MAX_PATH]; + DWORD dwSize = ARRAY_SIZE(bufferW) * sizeof(CHAR); + HRESULT hr; + + MultiByteToWideChar(CP_ACP, 0, value, -1, valueW, ARRAY_SIZE(valueW)); + valueW[ARRAY_SIZE(valueW) - 1] = UNICODE_NULL; /* Avoid buffer overrun */ + + if (RegQueryValueExW(hkey, valueW, NULL, NULL, (LPBYTE)bufferW, &dwSize) != ERROR_SUCCESS) + return E_FAIL; + + hr = SHLoadIndirectString(bufferW, bufferW, ARRAY_SIZE(bufferW), NULL); + if (FAILED(hr)) + return hr; + + WideCharToMultiByte(CP_ACP, 0, bufferW, -1, buf, size, NULL, NULL); + if (size > 0) + buf[size - 1] = ANSI_NULL; /* Avoid buffer overrun */ + return S_OK; +} +#endif + /************************************************************************* * @ [SHLWAPI.439] */ diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index dd1e3cd7d1b..bcd304fda15 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -435,7 +435,7 @@ 435 stdcall -noname CLSIDFromProgIDWrap(wstr ptr) ole32.CLSIDFromProgID 436 stdcall -noname CLSIDFromStringWrap(wstr ptr) 437 stdcall -noname IsOS(long) -438 stub -noname SHLoadRegUIStringA +438 stdcall -noname SHLoadRegUIStringA(ptr str ptr long) 439 stdcall -noname SHLoadRegUIStringW(ptr wstr ptr long) 440 stdcall -noname SHGetWebFolderFilePathA(str ptr long) 441 stdcall -noname SHGetWebFolderFilePathW(wstr ptr long) diff --git a/dll/win32/shlwapi/string.c b/dll/win32/shlwapi/string.c index cb6489b7030..6dc9ff8e59d 100644 --- a/dll/win32/shlwapi/string.c +++ b/dll/win32/shlwapi/string.c @@ -2878,6 +2878,9 @@ HRESULT WINAPI SHLoadIndirectString(LPCWSTR src, LPWSTR dst, UINT dst_len, void WCHAR *dllname = NULL; HMODULE hmod = NULL; HRESULT hr = E_FAIL; +#ifdef __REACTOS__ + WCHAR szExpanded[512]; +#endif TRACE("(%s %p %08x %p)\n", debugstr_w(src), dst, dst_len, reserved); @@ -2886,6 +2889,13 @@ HRESULT WINAPI SHLoadIndirectString(LPCWSTR src, LPWSTR dst, UINT dst_len, void WCHAR *index_str; int index; +#ifdef __REACTOS__ + if (wcschr(src, '%') != NULL) + { + ExpandEnvironmentStringsW(src, szExpanded, ARRAY_SIZE(szExpanded)); + src = szExpanded; + } +#endif dst[0] = 0; dllname = StrDupW(src + 1); index_str = strchrW(dllname, ','); diff --git a/modules/rostests/apitests/shlwapi/CMakeLists.txt b/modules/rostests/apitests/shlwapi/CMakeLists.txt index 9712d77969b..47636a5cae6 100644 --- a/modules/rostests/apitests/shlwapi/CMakeLists.txt +++ b/modules/rostests/apitests/shlwapi/CMakeLists.txt @@ -13,6 +13,7 @@ list(APPEND SOURCE PathUnExpandEnvStringsForUser.c SHAreIconsEqual.c SHLoadIndirectString.c + SHLoadRegUIString.c StrFormatByteSizeW.c testdata.rc testlist.c) @@ -23,6 +24,6 @@ add_rc_deps(testdata.rc ${CMAKE_CURRENT_BINARY_DIR}/shlwapi_resource_dll/shlwapi add_executable(shlwapi_apitest ${SOURCE}) set_module_type(shlwapi_apitest win32cui) target_link_libraries(shlwapi_apitest ${PSEH_LIB}) -add_importlibs(shlwapi_apitest shlwapi user32 msvcrt kernel32) +add_importlibs(shlwapi_apitest shlwapi user32 advapi32 msvcrt kernel32) add_dependencies(shlwapi_apitest shlwapi_resource_dll) add_rostests_file(TARGET shlwapi_apitest) diff --git a/modules/rostests/apitests/shlwapi/SHLoadRegUIString.c b/modules/rostests/apitests/shlwapi/SHLoadRegUIString.c new file mode 100644 index 00000000000..d761853801a --- /dev/null +++ b/modules/rostests/apitests/shlwapi/SHLoadRegUIString.c @@ -0,0 +1,96 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for SHLoadRegUIStringA/W + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include <apitest.h> +#include <shlwapi.h> + +typedef HRESULT (WINAPI *FN_SHLoadRegUIStringA)(HKEY hkey, LPCSTR value, LPSTR buf, DWORD size); +typedef HRESULT (WINAPI *FN_SHLoadRegUIStringW)(HKEY hkey, LPCWSTR value, LPWSTR buf, DWORD size); + +static FN_SHLoadRegUIStringA pSHLoadRegUIStringA = NULL; +static FN_SHLoadRegUIStringW pSHLoadRegUIStringW = NULL; + +static void test_SHLoadRegUIStringA(HKEY hKey) +{ + HRESULT hr; + CHAR szBuff[MAX_PATH]; + + hr = pSHLoadRegUIStringA(hKey, "TestValue1", szBuff, _countof(szBuff)); + ok_long(hr, S_OK); + ok_str(szBuff, "%WINDIR%\\TEST"); + + hr = pSHLoadRegUIStringA(hKey, "TestValue2", szBuff, _countof(szBuff)); + ok_long(hr, S_OK); + ok_str(szBuff, "Test string one."); +} + +static void test_SHLoadRegUIStringW(HKEY hKey) +{ + HRESULT hr; + WCHAR szBuff[MAX_PATH]; + + hr = pSHLoadRegUIStringW(hKey, L"TestValue1", szBuff, _countof(szBuff)); + ok_long(hr, S_OK); + ok_wstr(szBuff, L"%WINDIR%\\TEST"); + + hr = pSHLoadRegUIStringW(hKey, L"TestValue2", szBuff, _countof(szBuff)); + ok_long(hr, S_OK); + ok_wstr(szBuff, L"Test string one."); +} + +BOOL extract_resource(const WCHAR* Filename, LPCWSTR ResourceName); + +START_TEST(SHLoadRegUIString) +{ + LONG error; + HKEY hKey; + DWORD cbValue; + static const WCHAR s_szTestValue1[] = L"%WINDIR%\\TEST"; + static const WCHAR s_szTestValue2[] = L"@SHLoadRegUIString.dll%EmptyEnvVar%,-3"; + HMODULE hSHLWAPI; + + SetEnvironmentVariableW(L"EmptyEnvVar", L""); + + /* Get procedures */ + hSHLWAPI = GetModuleHandleW(L"shlwapi"); + pSHLoadRegUIStringA = (FN_SHLoadRegUIStringA)GetProcAddress(hSHLWAPI, (LPCSTR)438); + pSHLoadRegUIStringW = (FN_SHLoadRegUIStringW)GetProcAddress(hSHLWAPI, (LPCSTR)439); + if (!pSHLoadRegUIStringA || !pSHLoadRegUIStringW) + { + skip("No procedure found\n"); + return; + } + + if (!extract_resource(L"SHLoadRegUIString.dll", MAKEINTRESOURCEW(101))) + { + skip("File 'SHLoadRegUIString.dll' cannot be extracted\n"); + return; + } + + /* Open registry key and write some test values */ + error = RegOpenKeyExW(HKEY_CURRENT_USER, L"Software", 0, KEY_READ | KEY_WRITE, &hKey); + ok_long(error, ERROR_SUCCESS); + + cbValue = (lstrlenW(s_szTestValue1) + 1) * sizeof(WCHAR); + error = RegSetValueExW(hKey, L"TestValue1", 0, REG_SZ, (LPBYTE)s_szTestValue1, cbValue); + ok_long(error, ERROR_SUCCESS); + + cbValue = (lstrlenW(s_szTestValue2) + 1) * sizeof(WCHAR); + error = RegSetValueExW(hKey, L"TestValue2", 0, REG_SZ, (LPBYTE)s_szTestValue2, cbValue); + ok_long(error, ERROR_SUCCESS); + + /* The main dish */ + test_SHLoadRegUIStringA(hKey); + test_SHLoadRegUIStringW(hKey); + + /* Delete the test values and close the key */ + RegDeleteValueW(hKey, L"TestValue1"); + RegDeleteValueW(hKey, L"TestValue2"); + RegCloseKey(hKey); + + DeleteFileW(L"SHLoadRegUIString.dll"); +} diff --git a/modules/rostests/apitests/shlwapi/testlist.c b/modules/rostests/apitests/shlwapi/testlist.c index 6bf3fe27892..ea30af72bee 100644 --- a/modules/rostests/apitests/shlwapi/testlist.c +++ b/modules/rostests/apitests/shlwapi/testlist.c @@ -9,6 +9,7 @@ extern void func_PathUnExpandEnvStrings(void); extern void func_PathUnExpandEnvStringsForUser(void); extern void func_SHAreIconsEqual(void); extern void func_SHLoadIndirectString(void); +extern void func_SHLoadRegUIString(void); extern void func_StrFormatByteSizeW(void); const struct test winetest_testlist[] = @@ -21,6 +22,7 @@ const struct test winetest_testlist[] = { "PathUnExpandEnvStringsForUser", func_PathUnExpandEnvStringsForUser }, { "SHAreIconsEqual", func_SHAreIconsEqual }, { "SHLoadIndirectString", func_SHLoadIndirectString }, + { "SHLoadRegUIString", func_SHLoadRegUIString }, { "StrFormatByteSizeW", func_StrFormatByteSizeW }, { 0, 0 } };

1 0

[reactos] 01/01: [USETUP] Speed up CONSOLE_SetStatusTextXV +17% (#5086)
by Katayama Hirofumi MZ 21 Feb '23

21 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=acd3148c1a52dfa1eb870… commit acd3148c1a52dfa1eb870d074d9071bbf2b67f26 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Feb 21 09:14:26 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Feb 21 09:14:26 2023 +0900 [USETUP] Speed up CONSOLE_SetStatusTextXV +17% (#5086) Get more speed by omitting erasing and overwriting whole line. CORE-18838 --- base/setup/usetup/consup.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/base/setup/usetup/consup.c b/base/setup/usetup/consup.c index 15e0fa69d99..9c3c799e63f 100644 --- a/base/setup/usetup/consup.c +++ b/base/setup/usetup/consup.c @@ -429,32 +429,26 @@ CONSOLE_SetStatusTextXV( IN LPCSTR fmt, IN va_list args) { + INT nLength; COORD coPos; DWORD Written; CHAR Buffer[128]; - vsprintf(Buffer, fmt, args); + memset(Buffer, ' ', min(sizeof(Buffer), xScreen)); + nLength = vsprintf(&Buffer[x], fmt, args); + ASSERT(x + nLength < sizeof(Buffer)); + Buffer[x + nLength] = ' '; coPos.X = 0; coPos.Y = yScreen - 1; - FillConsoleOutputAttribute(StdOutput, BACKGROUND_WHITE, xScreen, coPos, &Written); - - FillConsoleOutputCharacterA(StdOutput, - ' ', - xScreen, - coPos, - &Written); - - coPos.X = x; - WriteConsoleOutputCharacterA(StdOutput, Buffer, - (ULONG)strlen(Buffer), + min(sizeof(Buffer), xScreen), coPos, &Written); }

1 0

[reactos] 01/01: [MCIAVI32] Add ifdef guards to prevent regression (#5090)
by Atharva Kulkarni 20 Feb '23

20 Feb '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f1de615b9cdb2e267b97f… commit f1de615b9cdb2e267b97f7e55e8712bfba68bd26 Author: Atharva Kulkarni <atharvak1910(a)gmail.com> AuthorDate: Tue Feb 21 00:53:37 2023 +0530 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 20 20:23:37 2023 +0100 [MCIAVI32] Add ifdef guards to prevent regression (#5090) as an addendum to (#5063) and CORE-18669 --- dll/win32/mciavi32/mmoutput.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/mciavi32/mmoutput.c b/dll/win32/mciavi32/mmoutput.c index ca060574e01..e34e9d668e7 100644 --- a/dll/win32/mciavi32/mmoutput.c +++ b/dll/win32/mciavi32/mmoutput.c @@ -399,11 +399,13 @@ BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma) mmioAscend(wma->hFile, &mmckInfo, 0); } +#ifdef __REACTOS__ /* Empty file */ if (alb.numVideoFrames == 0) { WARN("NumVideoFrames: %u, Empty or possibly corrupt video file"); return FALSE; } +#endif if (alb.numVideoFrames != wma->dwPlayableVideoFrames) { WARN("AVI header says %d frames, we found %d video frames, reducing playable frames\n", @@ -620,10 +622,12 @@ double MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) if (wma->dwCurrVideoFrame != wma->dwCachedFrame) { +#ifdef __REACTOS__ if (wma->dwCurrVideoFrame >= wma->dwPlayableVideoFrames) { ERR("Invalid frame requested. Current : %u Total Playable %u\n", wma->dwCurrVideoFrame, wma->dwPlayableVideoFrames); return 0; } +#endif if (!wma->lpVideoIndex[wma->dwCurrVideoFrame].dwOffset) return 0;

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2023