From 30c5b892c66a6c70f2bf3fe4c6b31b266f1e0bfd Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 3 Oct 2014 12:07:14 +0000 Subject: [PATCH] [SHLWAPI] * Sync with Wine 1.7.27. CORE-8540 svn path=/trunk/; revision=64493 --- reactos/dll/win32/shlwapi/lang/shlwapi_Da.rc | 26 +++++----- reactos/dll/win32/shlwapi/lang/shlwapi_De.rc | 26 +++++----- reactos/dll/win32/shlwapi/lang/shlwapi_En.rc | 26 +++++----- reactos/dll/win32/shlwapi/lang/shlwapi_Es.rc | 18 +++---- reactos/dll/win32/shlwapi/lang/shlwapi_Fi.rc | 18 +++---- reactos/dll/win32/shlwapi/lang/shlwapi_Fr.rc | 26 +++++----- reactos/dll/win32/shlwapi/lang/shlwapi_He.rc | 18 +++---- reactos/dll/win32/shlwapi/lang/shlwapi_Hu.rc | 18 +++---- reactos/dll/win32/shlwapi/lang/shlwapi_It.rc | 26 +++++----- reactos/dll/win32/shlwapi/lang/shlwapi_Ja.rc | 18 +++---- reactos/dll/win32/shlwapi/lang/shlwapi_Ko.rc | 19 ++++--- reactos/dll/win32/shlwapi/lang/shlwapi_Lt.rc | 26 +++++----- reactos/dll/win32/shlwapi/lang/shlwapi_Nl.rc | 26 +++++----- reactos/dll/win32/shlwapi/lang/shlwapi_No.rc | 24 ++++----- reactos/dll/win32/shlwapi/lang/shlwapi_Pl.rc | 26 +++++----- reactos/dll/win32/shlwapi/lang/shlwapi_Pt.rc | 18 +++---- reactos/dll/win32/shlwapi/lang/shlwapi_Ro.rc | 20 ++++---- reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc | 18 +++---- reactos/dll/win32/shlwapi/lang/shlwapi_Si.rc | 18 +++---- reactos/dll/win32/shlwapi/lang/shlwapi_Sk.rc | 18 +++---- reactos/dll/win32/shlwapi/lang/shlwapi_Sq.rc | 26 +++++----- reactos/dll/win32/shlwapi/lang/shlwapi_Sv.rc | 18 +++---- reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc | 26 +++++----- reactos/dll/win32/shlwapi/lang/shlwapi_Uk.rc | 18 +++---- reactos/dll/win32/shlwapi/lang/shlwapi_Zh.rc | 28 +++++------ reactos/dll/win32/shlwapi/path.c | 4 +- reactos/dll/win32/shlwapi/reg.c | 53 +++++++++++++------- reactos/media/doc/README.WINE | 2 +- 28 files changed, 312 insertions(+), 296 deletions(-) diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Da.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Da.rc index 2ce6736f102..602312d648f 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Da.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Da.rc @@ -20,24 +20,24 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Fejl!" +CAPTION "Fejl" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Vis ikke denne besked igen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Annuller", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Ja", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nej", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld bytes" - IDS_TIME_INTERVAL_HOURS " hr" - IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " sec" + PUSHBUTTON "&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Annuller", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ja", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Nej", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_De.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_De.rc index b5f5eb03efe..d40dac6f1fc 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_De.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_De.rc @@ -22,24 +22,24 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld Bytes" + IDS_TIME_INTERVAL_HOURS " Std" + IDS_TIME_INTERVAL_MINUTES " Min" + IDS_TIME_INTERVAL_SECONDS " Sek" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Fehler!" +CAPTION "Fehler" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "&Diesen Dialog nicht mehr anzeigen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Abbrechen", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Ja", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nein", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld Bytes" - IDS_TIME_INTERVAL_HOURS " Std" - IDS_TIME_INTERVAL_MINUTES " Min" - IDS_TIME_INTERVAL_SECONDS " Sek" + PUSHBUTTON "&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Abbrechen", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ja", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Nein", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_En.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_En.rc index d3f2e395e11..e9e774f1792 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_En.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_En.rc @@ -20,24 +20,24 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Error!" +CAPTION "Error" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Don't show me th&is message again", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Cancel", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Yes", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&No", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld bytes" - IDS_TIME_INTERVAL_HOURS " hr" - IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " sec" + PUSHBUTTON "OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Yes", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&No", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Es.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Es.rc index 64cdd69b817..cd7835f6644 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Es.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Es.rc @@ -20,9 +20,17 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "¡Error!" +CAPTION "Error" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 @@ -33,11 +41,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Sí", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&No", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld bytes" - IDS_TIME_INTERVAL_HOURS " hr" - IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " sec" -} diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Fi.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Fi.rc index 7ca9fcad241..4bb001971d2 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Fi.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Fi.rc @@ -20,9 +20,17 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Virhe!" +CAPTION "Virhe" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 @@ -33,11 +41,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Kyllä", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Ei", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld bytes" - IDS_TIME_INTERVAL_HOURS " hr" - IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " sec" -} diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Fr.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Fr.rc index 2354e396ad0..31cbb0262dc 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Fr.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Fr.rc @@ -23,24 +23,24 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " h" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " s" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Erreur !" +CAPTION "Erreur" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Ne plus me montrer ce message", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Annuler", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Oui", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Non", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld bytes" - IDS_TIME_INTERVAL_HOURS " h" - IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " s" + PUSHBUTTON "&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Annuler", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Oui", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Non", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_He.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_He.rc index 7266c30b1ad..3c2cda60dc4 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_He.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_He.rc @@ -22,9 +22,17 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld בית" + IDS_TIME_INTERVAL_HOURS " שעות" + IDS_TIME_INTERVAL_MINUTES " דקות" + IDS_TIME_INTERVAL_SECONDS " שניות" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "שגיאה!" +CAPTION "שגיאה" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 @@ -35,11 +43,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "כן", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "לא", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld בית" - IDS_TIME_INTERVAL_HOURS " שעות" - IDS_TIME_INTERVAL_MINUTES " דקות" - IDS_TIME_INTERVAL_SECONDS " שניות" -} diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Hu.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Hu.rc index f9b8866a777..37b6f292b8c 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Hu.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Hu.rc @@ -23,9 +23,17 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld bájt" + IDS_TIME_INTERVAL_HOURS " óra" + IDS_TIME_INTERVAL_MINUTES " perc" + IDS_TIME_INTERVAL_SECONDS " mp" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Hiba!" +CAPTION "Hiba" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 @@ -36,11 +44,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Igen", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Nem", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld bájt" - IDS_TIME_INTERVAL_HOURS " óra" - IDS_TIME_INTERVAL_MINUTES " perc" - IDS_TIME_INTERVAL_SECONDS " mp" -} diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_It.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_It.rc index 304c0ee01cf..23cda413b65 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_It.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_It.rc @@ -20,24 +20,24 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Errore!" +CAPTION "Errore" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Non mostrare nuovamente &questo messaggio", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Annulla", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Si", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&No", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld bytes" - IDS_TIME_INTERVAL_HOURS " hr" - IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " sec" + PUSHBUTTON "&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Annulla", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Si", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&No", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Ja.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Ja.rc index 2e4d725d19e..bd3e6605937 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Ja.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Ja.rc @@ -23,9 +23,17 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "エラー!" +CAPTION "エラー" FONT 9, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 @@ -36,11 +44,3 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "はい(&Y)", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "いいえ(&N)", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld bytes" - IDS_TIME_INTERVAL_HOURS " hr" - IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " sec" -} diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Ko.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Ko.rc index 2c8793ea44b..d973ebdf20a 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Ko.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Ko.rc @@ -20,9 +20,17 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld ¹ÙÀÌÆ®" + IDS_TIME_INTERVAL_HOURS "½Ã" + IDS_TIME_INTERVAL_MINUTES " ºÐ" + IDS_TIME_INTERVAL_SECONDS " ÃÊ" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "¿¡·¯!" +CAPTION "¿¡·¯" FONT 9, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 @@ -33,12 +41,3 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "¿¹(&Y)", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "¾Æ´Ï¿À(&N)", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } - - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld ¹ÙÀÌÆ®" - IDS_TIME_INTERVAL_HOURS "½Ã" - IDS_TIME_INTERVAL_MINUTES " ºÐ" - IDS_TIME_INTERVAL_SECONDS " ÃÊ" -} diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Lt.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Lt.rc index 7dd490965f9..3bc3f794bd4 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Lt.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Lt.rc @@ -23,24 +23,24 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld baitai" + IDS_TIME_INTERVAL_HOURS " val" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sek" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Klaida!" +CAPTION "Klaida" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Daugiau ne&rodyti Å¡io praneÅ¡imo", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Gerai", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Atsisakyti", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Taip", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Ne", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld baitai" - IDS_TIME_INTERVAL_HOURS " val" - IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " sek" + PUSHBUTTON "&Gerai", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Atsisakyti", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Taip", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ne", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Nl.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Nl.rc index 0203c88094e..f533db7b226 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Nl.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Nl.rc @@ -20,24 +20,24 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Fout!" +CAPTION "Fout" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Deze boodschap &niet opnieuw tonen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Annuleren", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Ja", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nee", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld bytes" - IDS_TIME_INTERVAL_HOURS " hr" - IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " sec" + PUSHBUTTON "&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Annuleren", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ja", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Nee", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_No.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_No.rc index cce32f074da..b4de67aacae 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_No.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_No.rc @@ -20,6 +20,14 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld byte" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Feil" @@ -28,16 +36,8 @@ FONT 8, "MS Shell Dlg" LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "&Ikke vis denne meldingen igjen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Avbryt", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Ja", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nei", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld byte" - IDS_TIME_INTERVAL_HOURS " hr" - IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " sec" + PUSHBUTTON "&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Avbryt", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ja", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Nei", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Pl.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Pl.rc index 1f3298f9827..8d0b13aa57d 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Pl.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Pl.rc @@ -21,24 +21,24 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld bajtów" + IDS_TIME_INTERVAL_HOURS " godz." + IDS_TIME_INTERVAL_MINUTES " min." + IDS_TIME_INTERVAL_SECONDS " s" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "B³¹d!" +CAPTION "B³¹d" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Nie pokazuj w&iêcej tego komunikatu", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Anuluj", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Tak", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nie", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld bajtów" - IDS_TIME_INTERVAL_HOURS " godz." - IDS_TIME_INTERVAL_MINUTES " min." - IDS_TIME_INTERVAL_SECONDS " s" + PUSHBUTTON "&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Anuluj", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Tak", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Nie", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Pt.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Pt.rc index 5f799583771..eb801b19d5f 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Pt.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Pt.rc @@ -24,9 +24,17 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " seg" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Erro!" +CAPTION "Erro" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 @@ -37,11 +45,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Sim", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Não", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld bytes" - IDS_TIME_INTERVAL_HOURS " hr" - IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " seg" -} diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Ro.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Ro.rc index ad7d830d250..e8b7faf692a 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Ro.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Ro.rc @@ -18,13 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL -#pragma code_page(65001) +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld octeți" + IDS_TIME_INTERVAL_HOURS " ore" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" +} IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Eroare!" +CAPTION "Eroare" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 @@ -35,11 +43,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Da", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "N&u", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld octeți" - IDS_TIME_INTERVAL_HOURS " ore" - IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " sec" -} diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc index bda962c7467..f1d1bfc1434 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc @@ -23,9 +23,17 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld байт" + IDS_TIME_INTERVAL_HOURS " час" + IDS_TIME_INTERVAL_MINUTES " мин" + IDS_TIME_INTERVAL_SECONDS " сек" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ошибка!" +CAPTION "Ошибка" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 @@ -36,11 +44,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Да", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Нет", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld байт" - IDS_TIME_INTERVAL_HOURS " час" - IDS_TIME_INTERVAL_MINUTES " мин" - IDS_TIME_INTERVAL_SECONDS " сек" -} diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Si.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Si.rc index bbd1d0c6e7a..cf8233abc33 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Si.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Si.rc @@ -22,9 +22,17 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld bajtov" + IDS_TIME_INTERVAL_HOURS " ur" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sek" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Napak!" +CAPTION "Napak" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 @@ -35,11 +43,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Da", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Ne", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld bajtov" - IDS_TIME_INTERVAL_HOURS " ur" - IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " sek" -} diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Sk.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Sk.rc index 8c2287749c4..c42c3789123 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Sk.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Sk.rc @@ -20,9 +20,17 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld bajtov" + IDS_TIME_INTERVAL_HOURS " hod." + IDS_TIME_INTERVAL_MINUTES " min." + IDS_TIME_INTERVAL_SECONDS " s" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Chyba!" +CAPTION "Chyba" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 @@ -33,11 +41,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Án&o", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Nie", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld bajtov" - IDS_TIME_INTERVAL_HOURS " hod." - IDS_TIME_INTERVAL_MINUTES " min." - IDS_TIME_INTERVAL_SECONDS " s" -} diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Sq.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Sq.rc index 94e2456e314..5ee98af0c3c 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Sq.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Sq.rc @@ -20,24 +20,24 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " rë" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sek" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Gabim!" +CAPTION "Gabim" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Mos më tregoni këtë mesazh përsëri", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Anulo", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Po", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Jo", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld bytes" - IDS_TIME_INTERVAL_HOURS " rë" - IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " sek" + PUSHBUTTON "&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Anulo", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Po", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Jo", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Sv.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Sv.rc index f3f6e734e5a..e5c69946883 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Sv.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Sv.rc @@ -20,9 +20,17 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld byte" + IDS_TIME_INTERVAL_HOURS " h" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " s" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Fel!" +CAPTION "Fel" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 @@ -33,11 +41,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Ja", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Nej", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld byte" - IDS_TIME_INTERVAL_HOURS " h" - IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " s" -} diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc index df1b0fdd9f0..e018dc11f4f 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc @@ -20,24 +20,24 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld çoklu" + IDS_TIME_INTERVAL_HOURS " saat" + IDS_TIME_INTERVAL_MINUTES " dakîka" + IDS_TIME_INTERVAL_SECONDS " sâniye" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Yanlışlık!" +CAPTION "Yanlışlık" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "&Bana Bu Ä°letiyi Bir Daha Gösterme", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Tamam", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Ä°ptal", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Evet", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Hayır", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld çoklu" - IDS_TIME_INTERVAL_HOURS " saat" - IDS_TIME_INTERVAL_MINUTES " dakîka" - IDS_TIME_INTERVAL_SECONDS " sâniye" + PUSHBUTTON "&Tamam", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ä°ptal", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Evet", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Hayır", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Uk.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Uk.rc index 0760fd71c22..bdd80e9a160 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Uk.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Uk.rc @@ -23,9 +23,17 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld байт" + IDS_TIME_INTERVAL_HOURS " год" + IDS_TIME_INTERVAL_MINUTES " хв" + IDS_TIME_INTERVAL_SECONDS " сек." +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Помилка!" +CAPTION "Помилка" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 @@ -36,11 +44,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Так", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Ні", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld байт" - IDS_TIME_INTERVAL_HOURS " год" - IDS_TIME_INTERVAL_MINUTES " хв" - IDS_TIME_INTERVAL_SECONDS " сек." -} diff --git a/reactos/dll/win32/shlwapi/lang/shlwapi_Zh.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Zh.rc index e9f12855ea6..1d3b0487b20 100644 --- a/reactos/dll/win32/shlwapi/lang/shlwapi_Zh.rc +++ b/reactos/dll/win32/shlwapi/lang/shlwapi_Zh.rc @@ -23,9 +23,17 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld 字节" + IDS_TIME_INTERVAL_HOURS " 小时" + IDS_TIME_INTERVAL_MINUTES " 分" + IDS_TIME_INTERVAL_SECONDS " 秒" +} + IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "错误!" +CAPTION "错误" FONT 9, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 @@ -37,19 +45,19 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "否(&N)", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + STRINGTABLE { - IDS_BYTES_FORMAT "%ld 字节" - IDS_TIME_INTERVAL_HOURS " 小时" + IDS_BYTES_FORMAT "%ld 字節" + IDS_TIME_INTERVAL_HOURS " 小時" IDS_TIME_INTERVAL_MINUTES " 分" IDS_TIME_INTERVAL_SECONDS " 秒" } -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL - IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "錯誤!" +CAPTION "錯誤" FONT 9, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 @@ -60,11 +68,3 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "是(&Y)", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "否(&N)", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } - -STRINGTABLE -{ - IDS_BYTES_FORMAT "%ld 字節" - IDS_TIME_INTERVAL_HOURS " 小時" - IDS_TIME_INTERVAL_MINUTES " 分" - IDS_TIME_INTERVAL_SECONDS " 秒" -} diff --git a/reactos/dll/win32/shlwapi/path.c b/reactos/dll/win32/shlwapi/path.c index 40a2a853d95..f80e1f4b766 100644 --- a/reactos/dll/win32/shlwapi/path.c +++ b/reactos/dll/win32/shlwapi/path.c @@ -137,7 +137,7 @@ LPSTR WINAPI PathCombineA(LPSTR lpszDest, LPCSTR lpszDir, LPCSTR lpszFile) if (!lpszDest) return NULL; if (!lpszDir && !lpszFile) - goto fail; + goto fail; if (lpszDir) if (!MultiByteToWideChar(CP_ACP,0,lpszDir,-1,szDir,MAX_PATH)) @@ -3360,7 +3360,7 @@ HRESULT WINAPI PathCreateFromUrlW(LPCWSTR pszUrl, LPWSTR pszPath, len = src - pszUrl; StrCpyNW(dst, pszUrl, len + 1); dst += len; - if (isalphaW(src[1]) && (src[2] == ':' || src[2] == '|')) + if (*src && isalphaW(src[1]) && (src[2] == ':' || src[2] == '|')) { /* 'Forget' to add a trailing '/', just like Windows */ src++; diff --git a/reactos/dll/win32/shlwapi/reg.c b/reactos/dll/win32/shlwapi/reg.c index 6a52ea8e90c..8b573a3b4e2 100644 --- a/reactos/dll/win32/shlwapi/reg.c +++ b/reactos/dll/win32/shlwapi/reg.c @@ -198,31 +198,48 @@ LONG WINAPI SHRegCloseUSKey( /************************************************************************* * SHRegCreateUSKeyA [SHLWAPI.@] * - * Create or open a user-specific registry key. - * - * PARAMS - * pszPath [I] Key name to create or open. - * samDesired [I] Wanted security access. - * hRelativeUSKey [I] Base path if pszPath is relative. NULL otherwise. - * phNewUSKey [O] Receives a handle to the new or opened key. - * dwFlags [I] Base key under which the key should be opened. - * - * RETURNS - * Success: ERROR_SUCCESS - * Failure: Nonzero error code from winerror.h + * See SHRegCreateUSKeyW. */ -LONG WINAPI SHRegCreateUSKeyA(LPCSTR pszPath, REGSAM samDesired, HUSKEY hRelativeUSKey, - PHUSKEY phNewUSKey, DWORD dwFlags) +LONG WINAPI SHRegCreateUSKeyA(LPCSTR path, REGSAM samDesired, HUSKEY relative_key, + PHUSKEY new_uskey, DWORD flags) { - FIXME("(%s, 0x%08x, %p, %p, 0x%08x) stub\n", debugstr_a(pszPath), samDesired, - hRelativeUSKey, phNewUSKey, dwFlags); - return ERROR_SUCCESS; + WCHAR *pathW; + LONG ret; + + TRACE("(%s, 0x%08x, %p, %p, 0x%08x)\n", debugstr_a(path), samDesired, relative_key, + new_uskey, flags); + + if (path) + { + INT len = MultiByteToWideChar(CP_ACP, 0, path, -1, NULL, 0); + pathW = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + if (!pathW) + return ERROR_NOT_ENOUGH_MEMORY; + MultiByteToWideChar(CP_ACP, 0, path, -1, pathW, len); + } + else + pathW = NULL; + + ret = SHRegCreateUSKeyW(pathW, samDesired, relative_key, new_uskey, flags); + HeapFree(GetProcessHeap(), 0, pathW); + return ret; } /************************************************************************* * SHRegCreateUSKeyW [SHLWAPI.@] * - * See SHRegCreateUSKeyA. + * Create or open a user-specific registry key. + * + * PARAMS + * path [I] Key name to create or open. + * samDesired [I] Wanted security access. + * relative_key [I] Base path if 'path' is relative. NULL otherwise. + * new_uskey [O] Receives a handle to the new or opened key. + * flags [I] Base key under which the key should be opened. + * + * RETURNS + * Success: ERROR_SUCCESS + * Failure: Nonzero error code from winerror.h */ LONG WINAPI SHRegCreateUSKeyW(LPCWSTR path, REGSAM samDesired, HUSKEY relative_key, PHUSKEY new_uskey, DWORD flags) diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index e011fabb7d9..fb19d03b3eb 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -185,7 +185,7 @@ reactos/dll/win32/shdoclc # Synced to Wine-1.7.17 reactos/dll/win32/shdocvw # Synced to Wine-1.7.17 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to Wine-1.7.17 -reactos/dll/win32/shlwapi # Synced to Wine-1.7.17 +reactos/dll/win32/shlwapi # Synced to Wine-1.7.27 reactos/dll/win32/slbcsp # Synced to Wine-1.7.17 reactos/dll/win32/snmpapi # Synced to Wine-1.7.17 reactos/dll/win32/softpub # Synced to Wine-1.7.17 -- 2.17.1