Ros-diffs March 2019

ros-diffs@reactos.org

36 participants
217 discussions

[reactos] 01/01: [TRANSLATION] Hindi translation of the shell extensions. (#1405)
by Arnav Bhatt 11 Mar '19

11 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c527f72f234b201cb508d… commit c527f72f234b201cb508d9874b78c60e2305943d Author: Arnav Bhatt <arnavbhatt288(a)gmail.com> AuthorDate: Mon Mar 11 21:22:21 2019 +0530 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 11 16:52:21 2019 +0100 [TRANSLATION] Hindi translation of the shell extensions. (#1405) --- dll/shellext/acppage/ACPPage.rc | 3 + dll/shellext/acppage/lang/hi-IN.rc | 49 ++++++++++ dll/shellext/cryptext/cryptext.rc | 3 + dll/shellext/cryptext/lang/hi-IN.rc | 14 +++ dll/shellext/deskadp/deskadp.rc | 3 + dll/shellext/deskadp/lang/hi-IN.rc | 55 +++++++++++ dll/shellext/deskmon/deskmon.rc | 3 + dll/shellext/deskmon/lang/hi-IN.rc | 30 ++++++ dll/shellext/devcpux/lang/hi-IN.rc | 48 +++++++++ dll/shellext/devcpux/processor.rc | 3 + dll/shellext/netshell/lang/hi-IN.rc | 183 +++++++++++++++++++++++++++++++++++ dll/shellext/netshell/netshell.rc | 3 + dll/shellext/ntobjshex/lang/hi-IN.rc | 14 +++ dll/shellext/ntobjshex/ntobjshex.rc | 4 + dll/shellext/stobject/lang/hi-IN.rc | 58 +++++++++++ dll/shellext/stobject/stobject.rc | 3 + dll/shellext/zipfldr/lang/hi-IN.rc | 71 ++++++++++++++ dll/shellext/zipfldr/zipfldr.rc | 3 + 18 files changed, 550 insertions(+) diff --git a/dll/shellext/acppage/ACPPage.rc b/dll/shellext/acppage/ACPPage.rc index 72d7085b1c..44b0e77716 100644 --- a/dll/shellext/acppage/ACPPage.rc +++ b/dll/shellext/acppage/ACPPage.rc @@ -40,6 +40,9 @@ IDR_ACPPAGE REGISTRY "res/acppage.rgs" #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_HI_IN + #include "lang/hi-IN.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/dll/shellext/acppage/lang/hi-IN.rc b/dll/shellext/acppage/lang/hi-IN.rc new file mode 100644 index 0000000000..8d59e2d5a3 --- /dev/null +++ b/dll/shellext/acppage/lang/hi-IN.rc @@ -0,0 +1,49 @@ +/* + * PROJECT: ACPPAGE Hindi Translation + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Hindi translation of ACPPAGE + * COPYRIGHT: Copyright 2019 Arnav Bhatt (arnavbhatt2004(a)gmail.com) + */ + +LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA + +IDD_ACPPAGESHEET DIALOGEX 0, 0, 224, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "अनुकूलता" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "यदि आपको रिऐक्ट ओएस में इस प्रोग्राम को चलाने में कोई समस्या है, तो एक ऑपरेटिंग सिस्टम चुनें। रिऐक्ट ओएस को एप्लिकेशन को रिपोर्ट करना चाहिए।\nकृपया ध्यान दें कि यह कार्य प्रगति पर है।", IDC_EXPLANATION, 7, 7, 210, 31 + GROUPBOX "अनुकूलता प्रणाली", IDC_COMPATGROUP, 7, 41, 210, 49 + CHECKBOX "इस प्रोग्राम को कंपेटिबिलिटी मोड के लिए चलाएं:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + GROUPBOX "डिस्प्ले सेटिंग्स", -1, 7, 99, 210, 61, BS_GROUPBOX + CHECKBOX "256 रंगों में चलाएं", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "640x480 स्क्रीन रिज़ॉल्यूशन में चलाएं", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "दृश्य थीम को अक्षम करें", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + PUSHBUTTON "अनुकूलता मोड संपादित करें...", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 + LTEXT "",IDC_ENABLED_LAYERS,7,185,210,21 + CONTROL "<A>प्रोग्राम अनुकूलता</A>के बारे में अधिक जानें।", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY +END + +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "अनुकूलता मोड का संपादित" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER + PUSHBUTTON "&ऐड...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED + PUSHBUTTON "&संपादित...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED + PUSHBUTTON "&हटाए", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED + PUSHBUTTON "&ठीक", IDOK, 95, 116, 60, 14 + PUSHBUTTON "&रद्द करें", IDCANCEL, 162, 116, 60, 14 +END + +STRINGTABLE +BEGIN + IDS_COMPAT_TITLE "अनुकूलता" + IDS_FAILED_NETWORK "इस प्रोग्राम पर अनुकूलता मोड सेट नहीं किए जा सकते क्योंकि यह नेटवर्क ड्राइव पर है।" + IDS_FAILED_PROTECTED "इस प्रोग्राम पर अनुकूलता मोड सेट नहीं किए जा सकते क्योंकि यह रिऐक्ट ओएस का एक हिस्सा है।" + IDS_YOU_DID_NOT_ADD "आपने मोड नहीं ऐड करा, क्या आप इसे अभी ऐड करना चाहते हैं?" +END + diff --git a/dll/shellext/cryptext/cryptext.rc b/dll/shellext/cryptext/cryptext.rc index 88890f0b5f..5bd241cdaf 100644 --- a/dll/shellext/cryptext/cryptext.rc +++ b/dll/shellext/cryptext/cryptext.rc @@ -23,6 +23,9 @@ #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_HI_IN + #include "lang/hi-IN.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/dll/shellext/cryptext/lang/hi-IN.rc b/dll/shellext/cryptext/lang/hi-IN.rc new file mode 100644 index 0000000000..d3a27a97ae --- /dev/null +++ b/dll/shellext/cryptext/lang/hi-IN.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: CRYPTEXT Hindi Translation + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Hindi translation of CRYPTEXT + * COPYRIGHT: Copyright 2019 Arnav Bhatt (arnavbhatt2004(a)gmail.com) + */ + +LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA + +STRINGTABLE +BEGIN + IDS_INVALIDFILE "यह एक मान्य प्रमाणपत्र फ़ाइल नहीं है।" + IDS_CER_FILE "प्रमाणपत्र फ़ाइल" +END diff --git a/dll/shellext/deskadp/deskadp.rc b/dll/shellext/deskadp/deskadp.rc index f42147870b..a50e26eaf1 100644 --- a/dll/shellext/deskadp/deskadp.rc +++ b/dll/shellext/deskadp/deskadp.rc @@ -43,6 +43,9 @@ IDC_DESK_ADAPTER ICON "resources/adapter.ico" #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_HI_IN + #include "lang/hi-IN.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/dll/shellext/deskadp/lang/hi-IN.rc b/dll/shellext/deskadp/lang/hi-IN.rc new file mode 100644 index 0000000000..921a1008b3 --- /dev/null +++ b/dll/shellext/deskadp/lang/hi-IN.rc @@ -0,0 +1,55 @@ +/* + * PROJECT: DESKADP Hindi Translation + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Hindi translation of DESKADP + * COPYRIGHT: Copyright 2019 Arnav Bhatt (arnavbhatt2004(a)gmail.com) +*/ + +LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA + +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 252, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "अडैप्टर" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "अडैप्टर प्रकार", -1, 7, 3, 237, 50 + ICON IDC_DESK_ADAPTER, IDC_DESK_ADAPTER, 13, 11, 21, 20, SS_ICON + LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX + PUSHBUTTON "&गुण", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 + GROUPBOX "अडैप्टर जानकारी", -1, 7, 56, 237, 75 + LTEXT "चिप प्रकार:", -1, 13, 68, 58, 8 + LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX + LTEXT "डीएसी प्रकार:", -1, 13, 80, 58, 8 + LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX + LTEXT "मेमोरी क्षमता:", -1, 13, 92, 58, 8 + LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX + LTEXT "अडैप्टर स्ट्रिंग:", -1, 13, 104, 58, 8 + LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX + LTEXT "बाआईओएस जानकारी:", -1, 13, 116, 58, 8 + LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + PUSHBUTTON "&सभी मोड की सूची दें...", IDC_LISTALLMODES, 7, 139, 75, 14 +END + +IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "सभी मोड की सूची दें" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + DEFPUSHBUTTON "ठीक", IDOK, 112, 115, 50, 15 + PUSHBUTTON "रद्द करें", IDCANCEL, 167, 115, 50, 15 + GROUPBOX "मान्य मोड की सूची", -1, 6, 7, 212, 98 + LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_MODEFMT "%d द्वारा %d, %s, %s" + IDS_DEFREFRESHRATE "डिफ़ॉल्ट रिफ़ेश" + IDES_REFRESHRATEFMT "%d हेटर्स" + IDS_4BPP "16 कलर" + IDS_8BPP "256 कलर" + IDS_15BPP "उच्च कलर (15 बिट)" + IDS_16BPP "उच्च कलर (16 बिट)" + IDS_24BPP "ट्रू कलर (24 बिट)" + IDS_32BPP "ट्रू कलर (32 बिट)" +END diff --git a/dll/shellext/deskmon/deskmon.rc b/dll/shellext/deskmon/deskmon.rc index ffe24380d7..77964cf114 100644 --- a/dll/shellext/deskmon/deskmon.rc +++ b/dll/shellext/deskmon/deskmon.rc @@ -43,6 +43,9 @@ IDC_MONITORICO ICON "resources/monitor.ico" #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_HI_IN + #include "lang/hi-IN.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/dll/shellext/deskmon/lang/hi-IN.rc b/dll/shellext/deskmon/lang/hi-IN.rc new file mode 100644 index 0000000000..07a19fcc10 --- /dev/null +++ b/dll/shellext/deskmon/lang/hi-IN.rc @@ -0,0 +1,30 @@ +/* + * PROJECT: DESKMON Hindi Translation + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Hindi translation of DESKMON + * COPYRIGHT: Copyright 2019 Arnav Bhatt (arnavbhatt2004(a)gmail.com) +*/ + +LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA + +IDD_MONITOR DIALOGEX 0, 0, 252, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "मॉनिटर" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "मॉनिटर प्रकार", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON + LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL + PUSHBUTTON "&गुण", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED + GROUPBOX "मॉनिटर सेटिंग्स", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 + LTEXT "&स्क्रीन रिफ़ेश दर:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 + COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT + AUTOCHECKBOX "ऐसे मोड &छिपाएं जो यह मॉनिटर डिस्प्ले नहीं कर सकता है", IDC_PRUNINGCHECK, 13, 106, 225, 10 +END + +STRINGTABLE +BEGIN + IDS_USEDEFFRQUENCY "हार्डवेयर डिफ़ॉल्ट सेटिंग का उपयोग करें" + IDS_FREQFMT "%u हेटर्स" +END diff --git a/dll/shellext/devcpux/lang/hi-IN.rc b/dll/shellext/devcpux/lang/hi-IN.rc new file mode 100644 index 0000000000..786963f1de --- /dev/null +++ b/dll/shellext/devcpux/lang/hi-IN.rc @@ -0,0 +1,48 @@ +/* + * PROJECT: DEVCPUX Hindi Translation + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Hindi translation of DEVCPUX + * COPYRIGHT: Copyright 2019 Arnav Bhatt (arnavbhatt2004(a)gmail.com) + */ + +LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA + +DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "सीपीयू" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "विशेषताएं:", -1, 7, 23, 50, 8 + LTEXT "परीक्षा", IDC_FEATURES, 57, 23, 181, 8 + LTEXT "मॉडल:", -1, 7, 38, 50, 8 + LTEXT "परीक्षा", IDC_MODEL, 57, 38, 181, 8 + LTEXT "स्टिपिंग:", -1, 7, 53, 50, 51 + LTEXT "परीक्षा", IDC_STEPPING, 57, 53, 181, 8 + LTEXT "कोर गति:", -1, 7, 68, 50, 8 + LTEXT "परीक्षा", IDC_CORESPEED, 57, 68, 181, 8 +END + +STRINGTABLE +BEGIN + IDS_MEGAHERTZ "%ld मेगाहर्ट्ज" +END + +/* +DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "सीपीयू" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "विशेषताएं:", -1, 7, 23, 50, 8 + LTEXT "<परीक्षा>", IDC_FEATURES, 7, 34, 238, 8 + + LTEXT "मॉडल:", -1, 7, 49, 50, 8 + LTEXT "<परीक्षा>", IDC_MODEL, 7, 60, 238, 8 + + LTEXT "स्टिपिंग:", -1, 7, 75, 50, 8 + LTEXT "<परीक्षा>", IDC_STEPPING, 7, 86, 238, 8 + + LTEXT "कोर गति:", -1, 7, 101, 50, 8 + LTEXT "<परीक्षा>", IDC_CORESPEED, 7, 112, 238, 8 +END +*/ diff --git a/dll/shellext/devcpux/processor.rc b/dll/shellext/devcpux/processor.rc index 6f5a6d9679..c0240252dc 100644 --- a/dll/shellext/devcpux/processor.rc +++ b/dll/shellext/devcpux/processor.rc @@ -18,6 +18,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HI_IN + #include "lang/hi-IN.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/dll/shellext/netshell/lang/hi-IN.rc b/dll/shellext/netshell/lang/hi-IN.rc new file mode 100644 index 0000000000..87fdb46440 --- /dev/null +++ b/dll/shellext/netshell/lang/hi-IN.rc @@ -0,0 +1,183 @@ +/* + * PROJECT: NETSHELL Hindi Translation + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Hindi translation of NETSHELL + * COPYRIGHT: Copyright 2019 Arnav Bhatt (arnavbhatt2004(a)gmail.com) +*/ + +LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA + +IDD_NETPROPERTIES DIALOGEX 0, 0, 246, 246 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "सामान्य" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 + LTEXT "का उपयोग कर कनेक्ट करें:", -1, 9, 9, 217, 8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_TABSTOP | ES_READONLY + PUSHBUTTON "&कॉन्फ़िगर", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "चेक किए गए घटक इस कनेक्शन द्वारा उपयोग किए जाते हैं:", -1, 9, 59, 217, 8 + PUSHBUTTON "&इंस्टॉल", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&अनइंस्टॉल", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&गुण", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "विवरण", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "कम्पोनन्ट विवरण यहाँ जाता है...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "कनेक्ट होने पर टास्कबार में आइकन &दिखाएं", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "मुझे &सूचित करें जब यह कनेक्शन सीमित है या कोई कनेक्टिविटी नहीं है", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP +END + +IDD_STATUS DIALOGEX 0, 0, 200, 280 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU +CAPTION "सामान्य" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_LAN_NETSTATUS DIALOGEX 0, 0, 200, 180 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "सामान्य" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "कनेक्शन", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "स्थिति:", -1, 19, 20, 60, 8 + LTEXT "लंबाई:", -1, 19, 34, 60, 8 + LTEXT "गति:", -1, 19, 48, 60, 8 + GROUPBOX "कार्यकलाप", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "भेज दिया", -1, 26, 90, 60, 8 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 + LTEXT "प्राप्त किया", -1, 149, 90, 37, 8 + LTEXT "बाइट्स:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&गुण", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&डिसेबल", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "", IDC_STATUS, 83, 20, 98, 8 + RTEXT "", IDC_DURATION, 83, 34, 98, 8 + RTEXT "", IDC_SPEED, 83, 48, 98, 8 +END + +IDD_LAN_NETSTATUSADVANCED DIALOGEX 0, 0, 200, 180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "समर्थन" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "कनेक्शन स्थिति", -1, 9, 8, 190, 88, BS_GROUPBOX + LTEXT "पता प्रकार:", -1, 22, 20, 80, 8 + LTEXT "आईपी पता:", -1, 22, 34, 80, 8 + LTEXT "सबनेट मास्क:", -1, 22, 48, 80, 8 + LTEXT "डिफ़ॉल्ट गेटवे:", -1, 22, 62, 80, 8 + RTEXT "एन/ए", IDC_DETAILSTYPE, 112, 20, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSIP, 112, 34, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 112, 48, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 112, 62, 80, 8 + PUSHBUTTON "&विवरण...", IDC_DETAILS, 22, 76, 62, 14 +END + +IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME +CAPTION "नेटवर्क कनेक्शन विवरण" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "नेटवर्क कनेक्शन &विवरण:", -1, 10, 4, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130 + PUSHBUTTON "&बंद करे", IDC_CLOSE, 120, 155, 60, 14 +END + +IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "रिऐक्ट ओएस सेटअप" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "चुनें कि ठेठ या कस्टम सेटिंग्स का उपयोग करना है या नहीं:", IDC_STATIC, 53, 7, 240, 20 + AUTORADIOBUTTON "ठेठ सेटिंग्स", IDC_NETWORK_TYPICAL, 53, 27, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "कस्टम सेटिंग्स", IDC_NETWORK_CUSTOM, 53, 72, 253, 20, WS_TABSTOP + LTEXT "रिऐक्ट ओएस नेटवर्क के लिए क्लाइंट का उपयोग करके नेटवर्क कनेक्शन बनाता है, रिऐक्ट ओएस नेटवर्क के लिए फ़ाइल और प्रिंट शेयरिंग, और स्वचालित पते के साथ टीसीपी / आईपी परिवहन प्रोटोकॉल।", IDC_STATIC, 65, 45, 240, 30 + LTEXT "आपको नेटवर्क कम्पोनन्ट को मैन्युअल रूप से कॉन्फ़िगर करने की अनुमति देता है।", IDC_STATIC, 65, 90, 243, 20 +END + +IDD_NETWORKCOMPONENTPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "रिऐक्ट ओएस सेटअप" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "डिवाइस के लिए:", IDC_STATIC, 33, 2, 100, 20 + LTEXT "एन/ए", IDC_NETWORK_DEVICE, 75, 2, 253, 20 + LTEXT "चेक किए गए कम्पोनन्ट इस कनेक्शन द्वारा उपयोग किए जाते हैं:", IDC_STATIC, 33, 12, 253, 20 + CONTROL "", IDC_COMPONENT_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 33, 22, 250, 50 + PUSHBUTTON "&इंस्टॉल...", IDC_NETWORK_INSTALL, 122, 75, 50, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&अनइंस्टॉल", IDC_NETWORK_UNINSTALL, 177, 75, 50, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&गुण", IDC_NETWORK_PROPERTIES, 232, 75, 50, 14, WS_DISABLED | WS_TABSTOP + GROUPBOX "विवरण", IDC_STATIC, 33, 90, 250, 50, BS_GROUPBOX +END + +IDD_NETWORKDOMAINPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "रिऐक्ट ओएस सेटअप" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "क्या आप चाहते हैं कि यह कंप्यूटर किसी डोमेन का सदस्य हो?\n\ +(आप अपने नेटवर्क एडमिनिस्ट्रेटर से यह जानकारी प्राप्त कर सकते हैं।)", IDC_STATIC, 33, 2, 263, 50 + AUTORADIOBUTTON "नहीं, यह कंप्यूटर एक कार्यसमूह का हिस्सा होगा।", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "हां, यह कंप्यूटर एक डोमेन का हिस्सा होगा।", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP + LTEXT "कार्यसमूह या डोमेन नाम:", IDC_STATIC, 33, 72, 126, 14 + EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "नोट: यदि यह कंप्यूटर किसी नेटवर्क का हिस्सा नहीं है, तो आपके पास डोमेन से जुड़ने के लिए पर्याप्त अधिकार नहीं हैं, या आप नहीं जानते कि क्या दर्ज करना है, तो अभी के लिए कार्यसमूह चुनें। इन विकल्पों को बाद के समय में बदला जा सकता है।", IDC_STATIC, 33, 107, 263, 50 +END + +STRINGTABLE +BEGIN + IDS_PHYSICAL_ADDRESS "भौतिक पता" + IDS_IP_ADDRESS "आईपी पता" + IDS_SUBNET_MASK "सबनेट मास्क" + IDS_DEF_GATEWAY "डिफ़ॉल्ट गेटवे" + IDS_DHCP_SERVER "डीएचसीपी सर्वर" + IDS_LEASE_OBTAINED "लीज़ प्राप्त की" + IDS_LEASE_EXPIRES "लीज की समय सीमा समाप्त" + IDS_DNS_SERVERS "डीएनएस सर्वर" + IDS_WINS_SERVERS "विनस् सर्वर" + IDS_PROPERTY "संपत्ति" + IDS_VALUE "मूल्य" + IDS_NETWORKCONNECTION "नेटवर्क कनेक्शन" + IDS_SHV_COLUMN_NAME "नाम" + IDS_SHV_COLUMN_TYPE "प्रकार" + IDS_SHV_COLUMN_STATE "स्थिति" + IDS_SHV_COLUMN_DEVNAME "डिवाइस का नाम" + IDS_SHV_COLUMN_PHONE "फ़ोन # या होस्ट पता" + IDS_SHV_COLUMN_OWNER "मालिक" + IDS_TYPE_ETHERNET "लैन या हाई-स्पीड इंटरनेट" + IDS_STATUS_NON_OPERATIONAL "डिसेबल्ड" + IDS_STATUS_UNREACHABLE "कनिक्टिड नहीं हैं" + IDS_STATUS_DISCONNECTED "नेटवर्क केबल अनप्लग्ड" + IDS_STATUS_CONNECTING "नेटवर्क का पता प्राप्त कर रहा है" + IDS_STATUS_CONNECTED "कनिक्टिड" + IDS_STATUS_OPERATIONAL "कनिक्टिड" + IDS_NET_ACTIVATE "ऐनेबल" + IDS_NET_DEACTIVATE "डिसेबल" + IDS_NET_STATUS "स्थिति" + IDS_NET_REPAIR "मरम्मत" + IDS_NET_CREATELINK "शॉर्टकट बनाएं" + IDS_NET_DELETE "हटाए" + IDS_NET_RENAME "नाम बदलें" + IDS_NET_PROPERTIES "गुण" + IDS_FORMAT_BIT "%u बिट/सेकंड" + IDS_FORMAT_KBIT "%u किलोबिट/सेकंड" + IDS_FORMAT_MBIT "%u मेगाबिट/सेकंड" + IDS_FORMAT_GBIT "%u गीगाबिट/सेकंड" + IDS_DURATION_DAY "%d दिन %s" + IDS_DURATION_DAYS "%d दिन %s" + IDS_ASSIGNED_DHCP "डीएचसीपी द्वारा सौंपा गया" + IDS_ASSIGNED_MANUAL "मैन्युअल रूप से कॉन्फ़िगर किया गया" +END + +STRINGTABLE +BEGIN + IDS_NETWORKSETTINGSTITLE "नेटवर्क सेटिंग" + IDS_NETWORKSETTINGSSUBTITLE "अन्य नेटवर्क, कंप्यूटर और इंटरनेट से कनेक्ट करने के लिए उपयोग किया जाने वाला नेटवर्क सॉफ़्टवेयर इंस्टॉल करता है।" + IDS_NETWORKCOMPONENTTITLE "नेटवर्क कम्पोनेन्ट" + IDS_NETWORKCOMPONENTSUBTITLE "निर्धारित करें कि आपके कंप्यूटर पर कौन से नेटवर्किंग कम्पोनेन्ट उपयोग किए जाते हैं। नए कम्पोनेन्ट को ऐड करने के लिए, इंस्टॉल पर क्लिक करें।" + IDS_NETWORKDOMAINTITLE "कार्यसमूह या नेटवर्क डोमेन" + IDS_NETWORKDOMAINSUBTITLE "निर्दिष्ट करें कि कंप्यूटर का उपयोग कैसे किया जाएगा - एक कार्यसमूह के भाग के रूप में या नेटवर्क डोमेन के भाग के रूप में।" + IDS_REACTOS_SETUP "रिऐक्ट ओएस सेटअप" + IDS_WZD_DOMAIN_NAME "जब तक आप अपने डोमेन या कार्यसमूह का\nनाम दर्ज नहीं करते तब तक सेटअप\nजारी नहीं रह सकता।" +END diff --git a/dll/shellext/netshell/netshell.rc b/dll/shellext/netshell/netshell.rc index b0c9625c7e..36f6e84fd6 100644 --- a/dll/shellext/netshell/netshell.rc +++ b/dll/shellext/netshell/netshell.rc @@ -57,6 +57,9 @@ IDR_NETSHELL REGISTRY "res/netshell.rgs" #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_HI_IN + #include "lang/hi-IN.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/dll/shellext/ntobjshex/lang/hi-IN.rc b/dll/shellext/ntobjshex/lang/hi-IN.rc new file mode 100644 index 0000000000..6847e39820 --- /dev/null +++ b/dll/shellext/ntobjshex/lang/hi-IN.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: NTOPJSHEX Hindi Translation + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Hindi translation of NTOPJSHEX + * COPYRIGHT: Copyright 2019 Arnav Bhatt (arnavbhatt2004(a)gmail.com) +*/ + +LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA + +STRINGTABLE +BEGIN + IDS_NTOBJFLD_NAME "एनटी ऑब्जेक्ट नाम स्थान" + IDS_REGISTRY_NAME "सिस्टम रजिस्ट्री" +END diff --git a/dll/shellext/ntobjshex/ntobjshex.rc b/dll/shellext/ntobjshex/ntobjshex.rc index b741108cef..a8857186b2 100644 --- a/dll/shellext/ntobjshex/ntobjshex.rc +++ b/dll/shellext/ntobjshex/ntobjshex.rc @@ -43,6 +43,10 @@ IDR_REGISTRYFOLDER REGISTRY "resources/rgs/regfolder.rgs" #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HI_IN + #include "lang/hi-IN.rc" +#endif + #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/dll/shellext/stobject/lang/hi-IN.rc b/dll/shellext/stobject/lang/hi-IN.rc new file mode 100644 index 0000000000..0abe3e5f4a --- /dev/null +++ b/dll/shellext/stobject/lang/hi-IN.rc @@ -0,0 +1,58 @@ +/* + * PROJECT: STOBJECT Hindi Translation + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Hindi translation of STOBJECT + * COPYRIGHT: Copyright 2019 Arnav Bhatt (arnavbhatt2004(a)gmail.com) +*/ + +LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA + +IDD_POWER_METER DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "पावर मीटर" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "पावर की स्थिति", 1001, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 9, 20, 234, 189 + CONTROL "टास्कबार पर &हमेशा आइकन दिखाएं।", 1002, "Button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 6, 6, 120, 10 + CONTROL "प्रत्येक &बैटरी के लिए विवरण दिखाएं।", 1003, "Button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 135, 6, 120, 8 + CONTROL "", 1000, "Static", SS_LEFT | WS_CHILD | WS_GROUP, 11, 29, 229, 178 +END + +STRINGTABLE +BEGIN + //Power related strings + IDS_PWR_PROPERTIES "पावर &गुण समायोजित करें" + IDS_PWR_METER "पावर मीटर &खोलें" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" + IDS_PWR_PERCENT_REMAINING "%.2f%% शेष" + IDS_PWR_CHARGING "%.2f%% और चार्ज" + IDS_PWR_UNKNOWN_REMAINING "अज्ञात शेष" + IDS_PWR_AC "On AC power" + IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! घंटे (%3!u!%%) शेष" + IDS_PWR_MINUTES_REMAINING "%1!u! मिनट (%2!u!%%) शेष" + + //Hotplug related strings + IDS_HOTPLUG_REMOVE_1 "हार्डवेयर सुरक्षित रूप से निकालें" + IDS_HOTPLUG_REMOVE_2 "हार्डवेयर &सुरक्षित रूप से निकालें" + IDS_HOTPLUG_REMOVE_3 "%s को सुरक्षित रूप से हटा दें" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" + IDS_HOTPLUG_COMMA ", " + IDS_HOTPLUG_DRIVE " - ड्राइव(%s)" + IDS_HOTPLUG_DRIVES " - ड्राइव(%s)" + IDS_HOTPLUG_A "A:" + IDS_HOTPLUG_REQUIRES "इस हार्डवेयर के लिए ""सुरक्षित निष्कासन"" आवश्यक है" + IDS_HOTPLUG_CLICK "इस हार्डवेयर को हटाने से पहले, इस आइकन पर क्लिक करें और उस हार्डवेयर को चुनें जिसे आप हटाना चाहते हैं।" + + //Volume related strings + IDS_VOL_VOLUME "वॉल्यूम" + IDS_VOL_ADJUST "ऑडियो गुण &समायोजित करें" + IDS_VOL_OPEN "वॉल्यूम नियंत्रण &खोलें" + IDS_VOL_RUN "SNDVOL32.EXE" + IDS_VOL_MUTED "वॉल्यूम (मौन)" + + //Keyboard-Mouse related strings + IDS_KEYS_STICKY "स्टिकीकी" + IDS_KEYS_MOUSE "माउसकी" + IDS_KEYS_FILTER "फ़िल्टरकी" +END diff --git a/dll/shellext/stobject/stobject.rc b/dll/shellext/stobject/stobject.rc index 4d7e6da69f..5946127ece 100644 --- a/dll/shellext/stobject/stobject.rc +++ b/dll/shellext/stobject/stobject.rc @@ -52,6 +52,9 @@ IDR_SYSTRAY REGISTRY "resources/rgs/systray.rgs" #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HI_IN + #include "lang/hi-IN.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/dll/shellext/zipfldr/lang/hi-IN.rc b/dll/shellext/zipfldr/lang/hi-IN.rc new file mode 100644 index 0000000000..7794f630cb --- /dev/null +++ b/dll/shellext/zipfldr/lang/hi-IN.rc @@ -0,0 +1,71 @@ +/* + * PROJECT: ZIPFLDR Hindi Translation + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Hindi translation of ZIPFLDR + * COPYRIGHT: Copyright 2019 Arnav Bhatt (arnavbhatt2004(a)gmail.com) +*/ + +LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA + +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "एक गंतव्य चुनें" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "गंतव्य डाइरेक्टरी का चयन करें",IDC_STATIC,6,12,174,8 + EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL + PUSHBUTTON "ब्राउज...",IDC_BROWSE,174,42,54,14 + PUSHBUTTON "पासवर्ड",IDC_PASSWORD,174,66,54,14 + LTEXT "निकाला जा रहा है...",IDC_STATIC,6,114,42,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 +END + +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Extraction Complete" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "फाइलें निम्न निर्देशिका में निकाली गई हैं:",IDC_STATIC,6,12,222,18 + LTEXT "लक्ष्य दिर",IDC_DESTDIR,6,36,222,8 + CONTROL "निकाले गए फ़ाइल दिखाएं",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,81,10 + LTEXT "जारी रखने के लिए समाप्त दबाएं।",IDC_STATIC,6,84,174,8 +END + +IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Confirm File Replace" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "&हाँ",IDYES,6,36,62,14 + PUSHBUTTON "रद्द करें",IDCANCEL,204,36,62,14 + PUSHBUTTON "सब &को हां",IDYESALL,72,36,62,14 + PUSHBUTTON "&नहीं",IDNO,138,36,62,14 + ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 + LTEXT "",IDC_MESSAGE,36,6,228,24 +END + +STRINGTABLE +BEGIN + IDS_COL_NAME "नाम" + IDS_COL_TYPE "प्रकार" + IDS_COL_COMPRSIZE "संकुचित साइज़" + IDS_COL_PASSWORD "पासवर्ड" + IDS_COL_SIZE "साइज़" + IDS_COL_RATIO "अनुपात" + IDS_COL_DATE_MOD "तिथि संशोधित" + IDS_YES "हाँ" + IDS_NO "नहीं" + + IDS_WIZ_TITLE "निष्कर्षण विज़ार्ड" + IDS_WIZ_DEST_TITLE "एक गंतव्य चुनें" + IDS_WIZ_DEST_SUBTITLE "ज़िप आर्काइव से फ़ाइलें निर्दिष्ट स्थान पर निकाली जाएंगी।" + IDS_WIZ_COMPL_TITLE "निष्कर्षण पूरा" + IDS_WIZ_COMPL_SUBTITLE "ज़िप आर्काइव से फाइल निकाली गई हैं।" + IDS_WIZ_BROWSE_TITLE "उस स्थान का चयन करें जहां आप चयनित आइटम निकालना चाहते हैं।" + + IDS_OVERWRITEFILE_TEXT "इस फ़ोल्डर में पहले से ही '%1' नामक एक फ़ाइल है।\nक्या आप इसे बदलना चाहते हैं?" + + IDS_MENUITEM "&सभी निकालो..." + IDS_HELPTEXT "फ़ोल्डर सामग्री निकालता है" + IDS_FRIENDLYNAME "संपीड़ित (ज़िप्ड) फ़ोल्डर" +END diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/zipfldr.rc index d8e8f36b8e..b90123bcba 100644 --- a/dll/shellext/zipfldr/zipfldr.rc +++ b/dll/shellext/zipfldr/zipfldr.rc @@ -31,6 +31,9 @@ IDR_ZIPFLDR REGISTRY "res/zipfldr.rgs" #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HI_IN + #include "lang/hi-IN.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif

1 0

[reactos] 01/01: Merge pull request #1412 from njlyf2011/improve-zh-translation
by Luo Yufan 11 Mar '19

11 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0506042a644247773ccd… commit a0506042a644247773ccdb3c7d644f4599e7247d Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Mon Mar 11 23:50:17 2019 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 11 16:50:17 2019 +0100 Merge pull request #1412 from njlyf2011/improve-zh-translation [TRANSLATION] Update Traditional Chinese translation --- base/applications/cacls/lang/zh-TW.rc | 10 +++++----- base/applications/mstsc/lang/zh-TW.rc | 2 +- base/applications/taskmgr/lang/zh-TW.rc | 6 +++--- base/shell/cmd/lang/zh-TW.rc | 9 +++++---- base/system/regsvr32/lang/zh-TW.rc | 2 +- dll/cpl/console/lang/zh-TW.rc | 4 ++-- dll/cpl/openglcfg/lang/zh-TW.rc | 30 ++++++++++++++++++++++++++++++ dll/cpl/openglcfg/openglcfg.rc | 3 +++ 8 files changed, 50 insertions(+), 16 deletions(-) diff --git a/base/applications/cacls/lang/zh-TW.rc b/base/applications/cacls/lang/zh-TW.rc index 4e707457e0..8c07bc5d83 100644 --- a/base/applications/cacls/lang/zh-TW.rc +++ b/base/applications/cacls/lang/zh-TW.rc @@ -18,21 +18,21 @@ CACLS filename [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\ 指定文件的 ACL。\n\ /E 編輯 ACL 而不替換。\n\ /C 在出現拒絕訪問錯誤時繼續。\n\ - /G user:perm 賦予指定用戶訪問權限。\n\ + /G user:perm 賦予指定使用者訪問權限。\n\ Perm 可以是: R 讀取\n\ W 寫入\n\ C 更改(寫入)\n\ F 完全控制\n\ - /R user 撤銷指定用戶的訪問權限(僅在与 /E 一起使用時合法)。\n\ - /P user:perm 替換指定用戶的訪問權限。\n\ + /R user 撤銷指定使用者的訪問權限(僅在与 /E 一起使用時合法)。\n\ + /P user:perm 替換指定使用者的訪問權限。\n\ Perm 可以是: N 無\n\ R 讀取\n\ W 寫入\n\ C 更改(寫入) \n\ F 完全控制 \n\ - /D user 拒絕指定用戶的訪問。\n\ + /D user 拒絕指定使用者的訪問。\n\ 在命令中可以使用通配符指定多個文件。\n\ -您也可以在命令中指定多個用戶。\n\n\ +您也可以在命令中指定多個使用者。\n\n\ 縮寫: \n\ CI - 容器繼承。\n\ ACE會由目錄繼承。\n\ diff --git a/base/applications/mstsc/lang/zh-TW.rc b/base/applications/mstsc/lang/zh-TW.rc index bfeb794093..af2f1529c7 100644 --- a/base/applications/mstsc/lang/zh-TW.rc +++ b/base/applications/mstsc/lang/zh-TW.rc @@ -16,7 +16,7 @@ BEGIN ICON "", IDC_LOGONICON, 15, 19, 20, 20 LTEXT "輸入伺服器地址", IDC_STATIC, 47, 24, 81, 8 LTEXT "伺服器：", IDC_STATIC, 47, 41, 25, 8 - LTEXT "用戶名：", IDC_STATIC, 47, 58, 38, 8 + LTEXT "使用者名稱：", IDC_STATIC, 47, 58, 38, 8 COMBOBOX IDC_SERVERCOMBO, 79, 39, 141, 13, CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_NAMEEDIT, 79, 55, 141, 14, WS_TABSTOP | ES_AUTOHSCROLL PUSHBUTTON "儲存", IDC_SAVE, 67, 139, 50, 14 diff --git a/base/applications/taskmgr/lang/zh-TW.rc b/base/applications/taskmgr/lang/zh-TW.rc index 546008d1d1..f8cc90555e 100644 --- a/base/applications/taskmgr/lang/zh-TW.rc +++ b/base/applications/taskmgr/lang/zh-TW.rc @@ -179,7 +179,7 @@ BEGIN CONTROL "List2", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 7, 233, 177 PUSHBUTTON "結束處理程序(&E)", IDC_ENDPROCESS, 171, 189, 69, 14 - CONTROL "顯示所有用戶的處理程序(&S)", IDC_SHOWALLPROCESSES, "Button", + CONTROL "顯示所有使用者的處理程序(&S)", IDC_SHOWALLPROCESSES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 191, 111, 10 END @@ -310,7 +310,7 @@ BEGIN CONTROL "I/O 讀取", IDC_IOREADS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 127, 49, 10 CONTROL "I/O 讀取位元組", IDC_IOREADBYTES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 138, 65, 10 CONTROL "工作階段 ID(&S)", IDC_SESSIONID, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 149, 50, 10 - CONTROL "用戶名(&N)", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 51, 10 + CONTROL "使用者名稱(&N)", IDC_USERNAME, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 160, 51, 10 CONTROL "分頁錯誤差異(&A)", IDC_PAGEFAULTSDELTA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 28, 72, 10 CONTROL "虛擬記憶體大小(&V)", IDC_VIRTUALMEMORYSIZE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 39, 77, 10 CONTROL "分頁集區(&G)", IDC_PAGEDPOOL, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 107, 50, 53, 10 @@ -396,7 +396,7 @@ BEGIN IDS_TAB_STATUS "狀態" IDS_TAB_IMAGENAME "映像名稱" IDS_TAB_PID "PID" - IDS_TAB_USERNAME "用戶名" + IDS_TAB_USERNAME "使用者名稱" IDS_TAB_SESSIONID "工作階段 ID" IDS_TAB_CPU "CPU" IDS_TAB_CPUTIME "CPU 時間" diff --git a/base/shell/cmd/lang/zh-TW.rc b/base/shell/cmd/lang/zh-TW.rc index a1c6ef7093..718affebf0 100644 --- a/base/shell/cmd/lang/zh-TW.rc +++ b/base/shell/cmd/lang/zh-TW.rc @@ -1,4 +1,5 @@ /* Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) */ +/* Improved by Luo Yufan 2019 <njlyf2011(a)hotmail.com> */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL @@ -71,8 +72,8 @@ CMD [/[C|K] 命令][/P][/Q][/T:bf]\n\n\ /T:bf 設定前景/背景顏色 (參見 COLOR 命令)。\n" STRING_COLOR_HELP1 "設定默認前景和背景顏色。\n\n\ COLOR [屬性 [/-F]]\n\n\ - 屬性指定控制檯輸出的顏色屬性。\n\ - /-F 不要使用顏色填充控制檯的空白區域。\n\n\ + 屬性指定主控台輸出的顏色屬性。\n\ + /-F 不要使用顏色填充主控台的空白區域。\n\n\ 有3種方法指定顏色：\n\ 1) [bright] 名稱 on [bright] 名稱 (僅需要開頭的3個字母)\n\ 2) 十進位制 on 十進位制\n\ @@ -434,14 +435,14 @@ listing of credits." STRING_VOL_HELP2 " 驅動器 %c 中的卷沒有卷標。\n" STRING_VOL_HELP3 " 卷序列號是 %04X-%04X\n" STRING_VOL_HELP4 "顯示磁碟卷標和序列號，如果存在。\n\nVOL [驅動器:]" - STRING_WINDOW_HELP1 "改變控制檯視窗投影\n\n\ + STRING_WINDOW_HELP1 "改變主控台視窗投影\n\n\ WINDOW [/POS[=]左,上,寬度,高度]\n\ [MIN|MAX|RESTORE] ['標題']\n\n\ /POS 指定視窗的位置\n\ MIN 最小化視窗\n\ MAX 最大化視窗\n\ RESTORE 恢復視窗" - STRING_WINDOW_HELP2 "改變控制檯視窗投影\n\n\ + STRING_WINDOW_HELP2 "改變主控台視窗投影\n\n\ ACTIVATE '視窗' [/POS[=]左,上,寬度,高度]\n\ [MIN|MAX|RESTORE] ['標題']\n\n\ 視窗要執行動作的視窗標題\n\ diff --git a/base/system/regsvr32/lang/zh-TW.rc b/base/system/regsvr32/lang/zh-TW.rc index f8f10914a3..519e09b470 100644 --- a/base/system/regsvr32/lang/zh-TW.rc +++ b/base/system/regsvr32/lang/zh-TW.rc @@ -7,7 +7,7 @@ BEGIN IDS_UsageMessage "%s\n\n用法：regsvr32 [/u] [/s] [/c] [/n] [/i[:命令列]] DLL名稱\n\ /u - 登出服務\n\ /s - 安靜模式；不顯示訊息框\n\ -/c - 控制檯輸出\n\ +/c - 主控台輸出\n\ /i - 呼叫 DllInstall 並傳遞給它一個可選的 [命令列]；當使用 /u 時呼叫 DLL 解除安裝\n\ /n - 不要呼叫 DllRegisterServer；這個選項必須和 /i 一起使用" IDS_NoDllSpecified "沒有 DLL 名稱被指定。" diff --git a/dll/cpl/console/lang/zh-TW.rc b/dll/cpl/console/lang/zh-TW.rc index 98f0889401..042377dfc9 100644 --- a/dll/cpl/console/lang/zh-TW.rc +++ b/dll/cpl/console/lang/zh-TW.rc @@ -148,8 +148,8 @@ END STRINGTABLE BEGIN - IDS_CPLNAME "控制檯" - IDS_CPLDESCRIPTION "配置控制檯屬性。" + IDS_CPLNAME "主控台" + IDS_CPLDESCRIPTION "配置主控台屬性。" IDS_APPLY_SHORTCUT_ALL "修改啟動此視窗的快捷方式(&S)" IDS_RASTERFONTS "Raster 字型" IDS_GROUPBOX_FONT_NAME "Selected Font: " diff --git a/dll/cpl/openglcfg/lang/zh-TW.rc b/dll/cpl/openglcfg/lang/zh-TW.rc new file mode 100644 index 0000000000..3fa86066a9 --- /dev/null +++ b/dll/cpl/openglcfg/lang/zh-TW.rc @@ -0,0 +1,30 @@ +/* Translated by Luo Yufan in 2019 <njlyf2011(a)hotmail.com> */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "一般" +FONT 9, "新細明體" +BEGIN + ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 + GROUPBOX "轉譯器設定", -1, 5, 25, 230, 90 + LTEXT "轉譯器(&R):", -1, 15, 42, 37, 10 + COMBOBOX IDC_RENDERER, 55, 40, 160, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "This will override the default settings for your graphics driver! Choose ""Default"" to go back to the original settings.", -1, 15, 60, 210, 40 + GROUPBOX "偵錯", -1, 5, 125, 230, 90 + LTEXT "偵錯頻道:", -1, 15, 142, 65, 10 + COMBOBOX IDC_DEBUG_OUTPUT, 80, 140, 135, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Enables/disables debug output from opengl32.\n\nWARNING: Choosing ""Set"" or ""Clear"" will overwrite the content of the DEBUGCHANNEL environment variable!", -1, 15, 165, 210, 40 +END + +STRINGTABLE +BEGIN + IDS_RENDERER_DEFAULT "系統預設值" + IDS_RENDERER_RSWR "ReactOS Software Implementation" + IDS_CPLNAME "OpenGL 設定" + IDS_CPLDESCRIPTION "設定 OpenGL 轉譯器。" + IDS_DEBUG_SET "Set" + IDS_DEBUG_CLEAR "Clear" + IDS_DEBUG_DNM "請勿修改" +END diff --git a/dll/cpl/openglcfg/openglcfg.rc b/dll/cpl/openglcfg/openglcfg.rc index 4f1cb75ca3..d6a8af99af 100644 --- a/dll/cpl/openglcfg/openglcfg.rc +++ b/dll/cpl/openglcfg/openglcfg.rc @@ -42,3 +42,6 @@ IDI_CPLICON ICON "resources/openglcfg.ico" #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif +#ifdef LANGUAGE_ZH_TW + #include "lang/zh-TW.rc" +#endif

1 0

[reactos] 01/01: [EXPLORER] Show the Desktop Russian translation update
by Oleg Dubinskiy 11 Mar '19

11 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b7850f1078540888a8c60… commit b7850f1078540888a8c60038db6b8bbc1ee0c928 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Mon Mar 11 16:07:34 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 11 16:49:24 2019 +0100 [EXPLORER] Show the Desktop Russian translation update --- base/shell/explorer/lang/ru-RU.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/explorer/lang/ru-RU.rc b/base/shell/explorer/lang/ru-RU.rc index 03f6bae5f6..d11c4602ab 100644 --- a/base/shell/explorer/lang/ru-RU.rc +++ b/base/shell/explorer/lang/ru-RU.rc @@ -199,5 +199,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Меню ""Пуск"" и панель задач" - IDS_RESTORE_ALL "&Show Open Windows" + IDS_RESTORE_ALL "&Показать окна" END

1 0

[reactos] 09/09: [USBUHCI_NEW] Fix an infinite loop.
by Thomas Faber 11 Mar '19

11 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fc9d5d2f55a015d7c7063… commit fc9d5d2f55a015d7c7063a856488f6f095a2899b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Mar 6 10:20:39 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Mar 11 08:54:03 2019 +0100 [USBUHCI_NEW] Fix an infinite loop. --- drivers/usb/usbuhci_new/usbuhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/usbuhci_new/usbuhci.c b/drivers/usb/usbuhci_new/usbuhci.c index b08306d920..8e62356c63 100644 --- a/drivers/usb/usbuhci_new/usbuhci.c +++ b/drivers/usb/usbuhci_new/usbuhci.c @@ -1724,7 +1724,7 @@ UhciAbortNonIsoTransfer(IN PUHCI_EXTENSION UhciExtension, if (TD == UhciEndpoint->HeadTD) IsHeadTD = TRUE; - while (TD && TD->UhciTransfer == UhciTransfer); + while (TD && TD->UhciTransfer == UhciTransfer) { DPRINT_UHCI("UhciAbortNonIsoTransfer: TD - %p\n", TD);

1 0

[reactos] 08/09: [USBPORT] Implement interface setting in USBPORT_OpenInterface.
by Thomas Faber 11 Mar '19

11 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=026a12fe396ebdcb4906a… commit 026a12fe396ebdcb4906a32a71d9d951bae9c835 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Mar 6 09:59:41 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Mar 11 08:54:01 2019 +0100 [USBPORT] Implement interface setting in USBPORT_OpenInterface. --- drivers/usb/usbport/device.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/drivers/usb/usbport/device.c b/drivers/usb/usbport/device.c index 8676571985..dbabb3113b 100644 --- a/drivers/usb/usbport/device.c +++ b/drivers/usb/usbport/device.c @@ -249,7 +249,7 @@ USBPORT_OpenInterface(IN PURB Urb, IN PUSBPORT_CONFIGURATION_HANDLE ConfigHandle, IN PUSBD_INTERFACE_INFORMATION InterfaceInfo, IN OUT PUSBPORT_INTERFACE_HANDLE *iHandle, - IN BOOLEAN IsSetInterface) + IN BOOLEAN SendSetInterface) { PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; PUSBPORT_INTERFACE_HANDLE InterfaceHandle = NULL; @@ -259,6 +259,7 @@ USBPORT_OpenInterface(IN PURB Urb, BOOLEAN HasAlternates; ULONG NumEndpoints; SIZE_T Length; + USB_DEFAULT_PIPE_SETUP_PACKET SetupPacket; SIZE_T HandleLength; BOOLEAN IsAllocated = FALSE; USHORT MaxPacketSize; @@ -279,9 +280,29 @@ USBPORT_OpenInterface(IN PURB Urb, Length = FIELD_OFFSET(USBD_INTERFACE_INFORMATION, Pipes) + NumEndpoints * sizeof(USBD_PIPE_INFORMATION); - if (HasAlternates && IsSetInterface) + if (HasAlternates && SendSetInterface) { - DPRINT1("USBPORT_OpenInterface: InterfaceInfo->AlternateSetting && IsSetInterface !\n"); + RtlZeroMemory(&SetupPacket, sizeof(SetupPacket)); + + SetupPacket.bmRequestType.Dir = BMREQUEST_HOST_TO_DEVICE; + SetupPacket.bmRequestType.Type = BMREQUEST_STANDARD; + SetupPacket.bmRequestType.Recipient = BMREQUEST_TO_INTERFACE; + SetupPacket.bRequest = USB_REQUEST_SET_INTERFACE; + SetupPacket.wValue.W = InterfaceInfo->AlternateSetting; + SetupPacket.wIndex.W = InterfaceInfo->InterfaceNumber; + SetupPacket.wLength = 0; + + USBPORT_SendSetupPacket(DeviceHandle, + FdoDevice, + &SetupPacket, + NULL, + 0, + NULL, + &USBDStatus); + if (!USBD_SUCCESS(USBDStatus)) + { + goto Exit; + } } if (*iHandle) @@ -1533,7 +1554,7 @@ USBPORT_HandleSelectInterface(IN PDEVICE_OBJECT FdoDevice, ConfigurationHandle, Interface, &iHandle, - 1); + TRUE); if (USBDStatus) {

1 0

[reactos] 07/09: [USBPORT] Correctly handle alternate settings returned from USBPORT_ParseConfigurationDescriptor.
by Thomas Faber 11 Mar '19

11 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac20ab031ca08a031b2de… commit ac20ab031ca08a031b2dea321ba50ee4c86b18c4 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Mar 6 09:57:23 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Mar 11 08:53:55 2019 +0100 [USBPORT] Correctly handle alternate settings returned from USBPORT_ParseConfigurationDescriptor. The last parameter of USBPORT_ParseConfigurationDescriptor is a pointer to a boolean indicating whether any alternate interface settings were found for the specified interface. Interpreting it as an alternate setting value, as we did before, would always override the alternate setting to '1' (if any alternate descriptors were present), therefore selecting the wrong interface setting, and possibly causing a buffer overflow on the InterfaceList's Pipes array. Found by Special Pool. --- drivers/usb/usbport/device.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/usb/usbport/device.c b/drivers/usb/usbport/device.c index 5662a6141a..8676571985 100644 --- a/drivers/usb/usbport/device.c +++ b/drivers/usb/usbport/device.c @@ -186,7 +186,7 @@ NTAPI USBPORT_ParseConfigurationDescriptor(IN PUSB_CONFIGURATION_DESCRIPTOR ConfigDescriptor, IN UCHAR InterfaceNumber, IN UCHAR Alternate, - OUT PUCHAR OutAlternate) + OUT PBOOLEAN HasAlternates) { PUSB_CONFIGURATION_DESCRIPTOR TmpDescriptor; PUSB_INTERFACE_DESCRIPTOR iDescriptor; @@ -197,8 +197,8 @@ USBPORT_ParseConfigurationDescriptor(IN PUSB_CONFIGURATION_DESCRIPTOR ConfigDesc DPRINT("USBPORT_ParseConfigurationDescriptor ... \n"); - if (OutAlternate) - *OutAlternate = 0; + if (HasAlternates) + *HasAlternates = FALSE; for (TmpDescriptor = (PUSB_CONFIGURATION_DESCRIPTOR)((ULONG_PTR)ConfigDescriptor + ConfigDescriptor->bLength); TmpDescriptor->bDescriptorType != USB_INTERFACE_DESCRIPTOR_TYPE && TmpDescriptor->bLength > 0; @@ -235,8 +235,8 @@ USBPORT_ParseConfigurationDescriptor(IN PUSB_CONFIGURATION_DESCRIPTOR ConfigDesc ++ix; } - if ((ix > 1) && OutAlternate) - *OutAlternate = 1; + if ((ix > 1) && HasAlternates) + *HasAlternates = TRUE; return OutDescriptor; } @@ -256,6 +256,7 @@ USBPORT_OpenInterface(IN PURB Urb, PUSBPORT_PIPE_HANDLE PipeHandle; PUSB_ENDPOINT_DESCRIPTOR Descriptor; PUSBD_PIPE_INFORMATION PipeInfo; + BOOLEAN HasAlternates; ULONG NumEndpoints; SIZE_T Length; SIZE_T HandleLength; @@ -271,14 +272,14 @@ USBPORT_OpenInterface(IN PURB Urb, InterfaceDescriptor = USBPORT_ParseConfigurationDescriptor(ConfigHandle->ConfigurationDescriptor, InterfaceInfo->InterfaceNumber, InterfaceInfo->AlternateSetting, - &InterfaceInfo->AlternateSetting); + &HasAlternates); NumEndpoints = InterfaceDescriptor->bNumEndpoints; Length = FIELD_OFFSET(USBD_INTERFACE_INFORMATION, Pipes) + NumEndpoints * sizeof(USBD_PIPE_INFORMATION); - if (InterfaceInfo->AlternateSetting && IsSetInterface) + if (HasAlternates && IsSetInterface) { DPRINT1("USBPORT_OpenInterface: InterfaceInfo->AlternateSetting && IsSetInterface !\n"); } @@ -491,7 +492,7 @@ USBPORT_InitInterfaceInfo(IN PUSBD_INTERFACE_INFORMATION InterfaceInfo, Descriptor = USBPORT_ParseConfigurationDescriptor(ConfigHandle->ConfigurationDescriptor, InterfaceInfo->InterfaceNumber, InterfaceInfo->AlternateSetting, - &InterfaceInfo->AlternateSetting); + NULL); Length = sizeof(USBD_INTERFACE_INFORMATION) + sizeof(USBD_PIPE_INFORMATION);

1 0

[reactos] 06/09: [USBPORT] Correctly find interface descriptor in USBPORT_ParseConfigurationDescriptor
by Thomas Faber 11 Mar '19

11 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=36c1cb09106eab6cebab2… commit 36c1cb09106eab6cebab2e6722c1907ca12bfa19 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Mar 6 09:22:55 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Mar 11 08:53:53 2019 +0100 [USBPORT] Correctly find interface descriptor in USBPORT_ParseConfigurationDescriptor There can be other descriptors between the config descriptor and the first interface descriptor, so we specifically need to check for the interface descriptor type and skip anything before that. We also need to guard against bLength == 0, which would cause an infinite loop, instead of doing a second bDescriptorType check. --- drivers/usb/usbport/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/usbport/device.c b/drivers/usb/usbport/device.c index b28d9ef015..5662a6141a 100644 --- a/drivers/usb/usbport/device.c +++ b/drivers/usb/usbport/device.c @@ -201,7 +201,7 @@ USBPORT_ParseConfigurationDescriptor(IN PUSB_CONFIGURATION_DESCRIPTOR ConfigDesc *OutAlternate = 0; for (TmpDescriptor = (PUSB_CONFIGURATION_DESCRIPTOR)((ULONG_PTR)ConfigDescriptor + ConfigDescriptor->bLength); - TmpDescriptor->bDescriptorType == USB_CONFIGURATION_DESCRIPTOR_TYPE && TmpDescriptor->bDescriptorType > 0; + TmpDescriptor->bDescriptorType != USB_INTERFACE_DESCRIPTOR_TYPE && TmpDescriptor->bLength > 0; TmpDescriptor = (PUSB_CONFIGURATION_DESCRIPTOR)((ULONG_PTR)TmpDescriptor + TmpDescriptor->bLength)) ;

1 0

[reactos] 05/09: [USBPORT] Acquire EndpointSpinLock in addition to MiniportSpinLock in USBPORT_ReopenPipe.
by Thomas Faber 11 Mar '19

11 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1946f6bb251aba0e10943… commit 1946f6bb251aba0e10943989e23cf2d151977d3f Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Mar 6 09:23:26 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Mar 11 08:53:52 2019 +0100 [USBPORT] Acquire EndpointSpinLock in addition to MiniportSpinLock in USBPORT_ReopenPipe. --- drivers/usb/usbport/endpoint.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/usb/usbport/endpoint.c b/drivers/usb/usbport/endpoint.c index c1624ec297..40efddf165 100644 --- a/drivers/usb/usbport/endpoint.c +++ b/drivers/usb/usbport/endpoint.c @@ -1186,13 +1186,15 @@ USBPORT_ReopenPipe(IN PDEVICE_OBJECT FdoDevice, USBPORT_Wait(FdoDevice, 1); } - KeAcquireSpinLock(&FdoExtension->MiniportSpinLock, &MiniportOldIrql); + KeAcquireSpinLock(&Endpoint->EndpointSpinLock, &Endpoint->EndpointOldIrql); + KeAcquireSpinLockAtDpcLevel(&FdoExtension->MiniportSpinLock); Packet->SetEndpointState(FdoExtension->MiniPortExt, Endpoint + 1, USBPORT_ENDPOINT_REMOVE); - KeReleaseSpinLock(&FdoExtension->MiniportSpinLock, MiniportOldIrql); + KeReleaseSpinLockFromDpcLevel(&FdoExtension->MiniportSpinLock); + KeReleaseSpinLock(&Endpoint->EndpointSpinLock, Endpoint->EndpointOldIrql); USBPORT_Wait(FdoDevice, 2);

1 0

[reactos] 04/09: [USBPORT] Release StateChangeSpinLock before acquiring MiniportSpinLock.
by Thomas Faber 11 Mar '19

11 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e47240fb371b65ff76d3e… commit e47240fb371b65ff76d3e1176110d288da8bf944 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Mar 5 22:27:15 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Mar 11 08:53:50 2019 +0100 [USBPORT] Release StateChangeSpinLock before acquiring MiniportSpinLock. Found by Driver Verifier. --- drivers/usb/usbport/endpoint.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/usb/usbport/endpoint.c b/drivers/usb/usbport/endpoint.c index 385206a0c8..c1624ec297 100644 --- a/drivers/usb/usbport/endpoint.c +++ b/drivers/usb/usbport/endpoint.c @@ -1252,6 +1252,7 @@ USBPORT_ReopenPipe(IN PDEVICE_OBJECT FdoDevice, if (Endpoint->StateLast == USBPORT_ENDPOINT_ACTIVE) { + KeReleaseSpinLockFromDpcLevel(&Endpoint->StateChangeSpinLock); KeAcquireSpinLockAtDpcLevel(&FdoExtension->MiniportSpinLock); Packet->SetEndpointState(FdoExtension->MiniPortExt, @@ -1260,8 +1261,11 @@ USBPORT_ReopenPipe(IN PDEVICE_OBJECT FdoDevice, KeReleaseSpinLockFromDpcLevel(&FdoExtension->MiniportSpinLock); } + else + { + KeReleaseSpinLockFromDpcLevel(&Endpoint->StateChangeSpinLock); + } - KeReleaseSpinLockFromDpcLevel(&Endpoint->StateChangeSpinLock); KeReleaseSpinLock(&Endpoint->EndpointSpinLock, Endpoint->EndpointOldIrql); }

1 0

[reactos] 03/09: [USBPORT] Leave IRP status untouched for unhandled interfaces.
by Thomas Faber 11 Mar '19

11 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=267f5633ee5530df52aac… commit 267f5633ee5530df52aac0569789796545acdd0c Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Mar 5 22:23:46 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Mar 11 08:53:49 2019 +0100 [USBPORT] Leave IRP status untouched for unhandled interfaces. Found by Driver Verifier. --- drivers/usb/usbport/iface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/usb/usbport/iface.c b/drivers/usb/usbport/iface.c index 7897528da6..1061915797 100644 --- a/drivers/usb/usbport/iface.c +++ b/drivers/usb/usbport/iface.c @@ -804,7 +804,7 @@ USBPORT_PdoQueryInterface(IN PDEVICE_OBJECT FdoDevice, DPRINT1("USB_BUS_INTERFACE_HUB_GUID version %x not supported!\n", IoStack->Parameters.QueryInterface.Version); - return STATUS_NOT_SUPPORTED; // Version not supported + return Irp->IoStatus.Status; // Version not supported } /* Interface version 0 */ @@ -864,7 +864,7 @@ USBPORT_PdoQueryInterface(IN PDEVICE_OBJECT FdoDevice, DPRINT1("USB_BUS_INTERFACE_USBDI_GUID version %x not supported!\n", IoStack->Parameters.QueryInterface.Version); - return STATUS_NOT_SUPPORTED; // Version not supported + return Irp->IoStatus.Status; // Version not supported } /* Interface version 0 */ @@ -904,5 +904,5 @@ USBPORT_PdoQueryInterface(IN PDEVICE_OBJECT FdoDevice, } } - return STATUS_NOT_SUPPORTED; + return Irp->IoStatus.Status; }

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
22
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2019