Ros-diffs March 2019

ros-diffs@reactos.org

36 participants
217 discussions

[reactos] 01/01: [NETAPI32] Initialize parm_err

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=462418fe38aa92920a755… commit 462418fe38aa92920a755d5d1b5dc6dce32a035b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Mar 9 20:26:00 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Mar 9 20:26:00 2019 +0100 [NETAPI32] Initialize parm_err --- dll/win32/netapi32/group_new.c | 3 +++ dll/win32/netapi32/local_group.c | 3 +++ dll/win32/netapi32/user.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/dll/win32/netapi32/group_new.c b/dll/win32/netapi32/group_new.c index 9c3234abe5..027f1f7273 100644 --- a/dll/win32/netapi32/group_new.c +++ b/dll/win32/netapi32/group_new.c @@ -306,6 +306,9 @@ NetGroupAdd( TRACE("NetGroupAdd(%s, %d, %p, %p)\n", debugstr_w(servername), level, buf, parm_err); + if (parm_err != NULL) + *parm_err = PARM_ERROR_NONE; + /* Initialize the Server name*/ if (servername != NULL) RtlInitUnicodeString(&ServerName, servername); diff --git a/dll/win32/netapi32/local_group.c b/dll/win32/netapi32/local_group.c index 798248d8fc..1ef5aa64f9 100644 --- a/dll/win32/netapi32/local_group.c +++ b/dll/win32/netapi32/local_group.c @@ -352,6 +352,9 @@ NetLocalGroupAdd( TRACE("(%s %d %p %p) stub!\n", debugstr_w(servername), level, buf, parm_err); + if (parm_err != NULL) + *parm_err = PARM_ERROR_NONE; + /* Initialize the Server name*/ if (servername != NULL) RtlInitUnicodeString(&ServerName, servername); diff --git a/dll/win32/netapi32/user.c b/dll/win32/netapi32/user.c index d105634a52..3e29bc48c6 100644 --- a/dll/win32/netapi32/user.c +++ b/dll/win32/netapi32/user.c @@ -2060,6 +2060,9 @@ NetUserAdd(LPCWSTR servername, TRACE("(%s, %d, %p, %p)\n", debugstr_w(servername), level, bufptr, parm_err); + if (parm_err != NULL) + *parm_err = PARM_ERROR_NONE; + /* Check the info level */ switch (level) {

5 years, 6 months

[reactos] 01/01: [Win32SS] Add TextOut to GDI Batch

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d57f7becc3f3204080086… commit d57f7becc3f320408008649fa21c86926d9d16b6 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Fri Mar 8 22:21:41 2019 -0600 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Fri Mar 8 22:21:41 2019 -0600 [Win32SS] Add TextOut to GDI Batch Add fix ups to PolyPatBlt and freetype. TextOut supports 580 characters w/o Dx and Dx at a max of 193 characters with Dx*1, both if offset is 0. Noticed a lot of over drawing with start menu from ComCtl32 SB_SETTEXT going through User32 DrawText/Worker ExtTextOutW. Explain why it might be slowing down. If issues arise, commenting out lines in win32ss/include/gdi32p.h can help. Example: else if (Cmd == GdiBCTextOut) cjSize = 0;//sizeof(GDIBSTEXTOUT); <---- this one most of all. else if (Cmd == GdiBCExtTextOut) cjSize = 0;//sizeof(GDIBSEXTTEXTOUT); Test results: https://reactos.org/testman/compare.php?ids=66260,66262 --- win32ss/gdi/gdi32/include/gdi32p.h | 4 +- win32ss/gdi/gdi32/objects/painting.c | 11 ++- win32ss/gdi/gdi32/objects/text.c | 97 ++++++++++++++++++++++ win32ss/gdi/ntgdi/freetype.c | 2 +- win32ss/gdi/ntgdi/gdibatch.c | 155 +++++++++++++++++++++++++++++++---- win32ss/include/ntgdityp.h | 10 ++- 6 files changed, 255 insertions(+), 24 deletions(-) diff --git a/win32ss/gdi/gdi32/include/gdi32p.h b/win32ss/gdi/gdi32/include/gdi32p.h index 67d3a68dbf..f0b4cb46d9 100644 --- a/win32ss/gdi/gdi32/include/gdi32p.h +++ b/win32ss/gdi/gdi32/include/gdi32p.h @@ -390,8 +390,8 @@ GdiAllocBatchCommand( /* Get the size of the entry */ if (Cmd == GdiBCPatBlt) cjSize = sizeof(GDIBSPATBLT); else if (Cmd == GdiBCPolyPatBlt) cjSize = sizeof(GDIBSPPATBLT); - else if (Cmd == GdiBCTextOut) cjSize = 0; - else if (Cmd == GdiBCExtTextOut) cjSize = 0; + else if (Cmd == GdiBCTextOut) cjSize = sizeof(GDIBSTEXTOUT); + else if (Cmd == GdiBCExtTextOut) cjSize = sizeof(GDIBSEXTTEXTOUT); else if (Cmd == GdiBCSetBrushOrg) cjSize = sizeof(GDIBSSETBRHORG); else if (Cmd == GdiBCExtSelClipRgn) cjSize = 0; else if (Cmd == GdiBCSelObj) cjSize = sizeof(GDIBSOBJECT); diff --git a/win32ss/gdi/gdi32/objects/painting.c b/win32ss/gdi/gdi32/objects/painting.c index efc987e6cb..8fc0d645c3 100644 --- a/win32ss/gdi/gdi32/objects/painting.c +++ b/win32ss/gdi/gdi32/objects/painting.c @@ -548,7 +548,8 @@ PolyPatBlt( pgO = GdiAllocBatchCommand(hdc, GdiBCPolyPatBlt); if (pgO) { - USHORT cjSize = sizeof(GDIBSPPATBLT) + (nCount-1) * sizeof(PATRECT); + USHORT cjSize = 0; + if (nCount > 1) cjSize = (nCount-1) * sizeof(PATRECT); if ((pTeb->GdiTebBatch.Offset + cjSize) <= GDIBATCHBUFSIZE) { @@ -563,10 +564,14 @@ PolyPatBlt( pgO->ulBackgroundClr = pdcattr->ulBackgroundClr; pgO->ulBrushClr = pdcattr->ulBrushClr; RtlCopyMemory(pgO->pRect, pPoly, nCount * sizeof(PATRECT)); - // Recompute offset, remember one is already accounted for in the structure. - pTeb->GdiTebBatch.Offset += (nCount-1) * sizeof(PATRECT); + // Recompute offset and return size, remember one is already accounted for in the structure. + pTeb->GdiTebBatch.Offset += cjSize; + ((PGDIBATCHHDR)pgO)->Size += cjSize; return TRUE; } + // Reset offset and count then fall through + pTeb->GdiTebBatch.Offset -= sizeof(GDIBSPPATBLT); + pTeb->GdiBatchCount--; } } return NtGdiPolyPatBlt(hdc, dwRop, pPoly, nCount, dwMode); diff --git a/win32ss/gdi/gdi32/objects/text.c b/win32ss/gdi/gdi32/objects/text.c index 1242020639..9ff4fde9df 100644 --- a/win32ss/gdi/gdi32/objects/text.c +++ b/win32ss/gdi/gdi32/objects/text.c @@ -488,6 +488,8 @@ ExtTextOutW( _In_ UINT cwc, _In_reads_opt_(cwc) const INT *lpDx) { + PDC_ATTR pdcattr; + HANDLE_METADC(BOOL, ExtTextOut, FALSE, @@ -506,6 +508,101 @@ ExtTextOutW( return LpkExtTextOut(hdc, x, y, fuOptions, lprc, lpString, cwc , lpDx, 0); } + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if ( pdcattr && + !(pdcattr->ulDirty_ & DC_DIBSECTION) && + !(pdcattr->lTextAlign & TA_UPDATECP)) + { + if ( lprc && !cwc ) + { + if ( fuOptions & ETO_OPAQUE ) + { + PGDIBSEXTTEXTOUT pgO; + + pgO = GdiAllocBatchCommand(hdc, GdiBCExtTextOut); + if (pgO) + { + pgO->Count = cwc; + pgO->Rect = *lprc; + pgO->Options = fuOptions; + /* Snapshot attribute */ + pgO->ulBackgroundClr = pdcattr->ulBackgroundClr; + pgO->ptlViewportOrg = pdcattr->ptlViewportOrg; + return TRUE; + } + } + else // Do nothing, old explorer pops this off. + { + DPRINT1("GdiBCExtTextOut nothing\n"); + return TRUE; + } + } // Max 580 wchars, if offset 0 + else if ( cwc <= ((GDIBATCHBUFSIZE - sizeof(GDIBSTEXTOUT)) / sizeof(WCHAR)) ) + { + PGDIBSTEXTOUT pgO; + PTEB pTeb = NtCurrentTeb(); + + pgO = GdiAllocBatchCommand(hdc, GdiBCTextOut); + if (pgO) + { + USHORT cjSize = 0; + ULONG DxSize = 0; + + if (cwc > 2) cjSize = (cwc * sizeof(WCHAR)) - sizeof(pgO->String); + + /* Calculate buffer size for string and Dx values */ + if (lpDx) + { + /* If ETO_PDY is specified, we have pairs of INTs */ + DxSize = (cwc * sizeof(INT)) * (fuOptions & ETO_PDY ? 2 : 1); + cjSize += DxSize; + // The structure buffer holds 4 bytes. Store Dx data then string. + // Result one wchar -> Buf[ Dx ]Str[wC], [4][2][X] one extra unused wchar + // to assure alignment of 4. + } + + if ((pTeb->GdiTebBatch.Offset + cjSize ) <= GDIBATCHBUFSIZE) + { + pgO->cbCount = cwc; + pgO->x = x; + pgO->y = y; + pgO->Options = fuOptions; + pgO->iCS_CP = 0; + + if (lprc) pgO->Rect = *lprc; + else + { + pgO->Options |= GDIBS_NORECT; // Tell the other side lprc is nill. + } + + /* Snapshot attributes */ + pgO->crForegroundClr = pdcattr->crForegroundClr; + pgO->crBackgroundClr = pdcattr->crBackgroundClr; + pgO->ulForegroundClr = pdcattr->ulForegroundClr; + pgO->ulBackgroundClr = pdcattr->ulBackgroundClr; + pgO->lBkMode = pdcattr->lBkMode == OPAQUE ? OPAQUE : TRANSPARENT; + pgO->hlfntNew = pdcattr->hlfntNew; + pgO->flTextAlign = pdcattr->flTextAlign; + pgO->ptlViewportOrg = pdcattr->ptlViewportOrg; + + pgO->Size = DxSize; // of lpDx then string after. + /* Put the Dx before the String to assure alignment of 4 */ + if (lpDx) RtlCopyMemory( &pgO->Buffer, lpDx, DxSize); + + if (cwc) RtlCopyMemory( &pgO->String[DxSize/sizeof(WCHAR)], lpString, cwc * sizeof(WCHAR)); + + // Recompute offset and return size + pTeb->GdiTebBatch.Offset += cjSize; + ((PGDIBATCHHDR)pgO)->Size += cjSize; + return TRUE; + } + // Reset offset and count then fall through + pTeb->GdiTebBatch.Offset -= sizeof(GDIBSTEXTOUT); + pTeb->GdiBatchCount--; + } + } + } return NtGdiExtTextOutW(hdc, x, y, diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 197304d469..7005057a07 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -5814,7 +5814,7 @@ IntExtTextOutW( if ((fuOptions & ETO_OPAQUE) && (dc->pdcattr->ulDirty_ & DIRTY_BACKGROUND)) DC_vUpdateBackgroundBrush(dc) ; - if(dc->pdcattr->ulDirty_ & DIRTY_TEXT) + if (dc->pdcattr->ulDirty_ & DIRTY_TEXT) DC_vUpdateTextBrush(dc) ; thickness = 1; diff --git a/win32ss/gdi/ntgdi/gdibatch.c b/win32ss/gdi/ntgdi/gdibatch.c index 3c7d6c2ad0..13d6ad9088 100644 --- a/win32ss/gdi/ntgdi/gdibatch.c +++ b/win32ss/gdi/ntgdi/gdibatch.c @@ -5,6 +5,8 @@ #include <debug.h> BOOL FASTCALL IntPatBlt( PDC,INT,INT,INT,INT,DWORD,PEBRUSHOBJ); +BOOL APIENTRY IntExtTextOutW(IN PDC,IN INT,IN INT,IN UINT,IN OPTIONAL PRECTL,IN LPCWSTR,IN INT,IN OPTIONAL LPINT,IN DWORD); + // // Gdi Batch Flush support functions. @@ -40,7 +42,7 @@ DoDeviceSync( SURFOBJ *Surface, PRECTL Rect, FLONG fl) VOID FASTCALL -SynchonizeDriver(FLONG Flags) +SynchronizeDriver(FLONG Flags) { SURFOBJ *SurfObj; //PPDEVOBJ Device; @@ -130,7 +132,7 @@ GdiFlushUserBatch(PDC dc, PGDIBATCHHDR pHdr) dc->pdcattr->ulForegroundClr = pgDPB->ulForegroundClr; dc->pdcattr->ulBackgroundClr = pgDPB->ulBackgroundClr; dc->pdcattr->ulBrushClr = pgDPB->ulBrushClr; - // Process dirty attributes if any + // Process dirty attributes if any. if (dc->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) DC_vUpdateFillBrush(dc); if (dc->pdcattr->ulDirty_ & DIRTY_TEXT) @@ -157,7 +159,7 @@ GdiFlushUserBatch(PDC dc, PGDIBATCHHDR pHdr) EBRUSHOBJ eboFill; PBRUSH pbrush; PPATRECT pRects; - INT cRects, i; + INT i; DWORD dwRop, flags; COLORREF crColor, crBkColor, crBrushClr; ULONG ulForegroundClr, ulBackgroundClr, ulBrushClr; @@ -200,10 +202,9 @@ GdiFlushUserBatch(PDC dc, PGDIBATCHHDR pHdr) DC_vUpdateBackgroundBrush(dc); DPRINT1("GdiBCPolyPatBlt Testing\n"); - pRects = pgDPB->pRect; - cRects = pgDPB->Count; + pRects = &pgDPB->pRect[0]; - for (i = 0; i < cRects; i++) + for (i = 0; i < pgDPB->Count; i++) { pbrush = BRUSH_ShareLockBrush(pRects->hBrush); @@ -238,21 +239,141 @@ GdiFlushUserBatch(PDC dc, PGDIBATCHHDR pHdr) dc->pdcattr->ulBrushClr = ulBrushClr; dc->pdcattr->ulDirty_ |= flags; break; - } + } + case GdiBCTextOut: + { + PGDIBSTEXTOUT pgO; + COLORREF crColor = -1, crBkColor; + ULONG ulForegroundClr, ulBackgroundClr; + DWORD flags = 0, saveflags; + FLONG flTextAlign = -1; + HANDLE hlfntNew; + PRECTL lprc; + USHORT jBkMode; + LONG lBkMode; + if (!dc) break; + pgO = (PGDIBSTEXTOUT) pHdr; + + // Save current attributes, flags and Set the attribute snapshots + saveflags = dc->pdcattr->ulDirty_ & (DIRTY_BACKGROUND|DIRTY_LINE|DIRTY_TEXT|DIRTY_FILL|DC_BRUSH_DIRTY|DIRTY_CHARSET); + + // In this instance check for differences and set the appropriate dirty flags. + if ( dc->pdcattr->crForegroundClr != pgO->crForegroundClr) + { + crColor = dc->pdcattr->crForegroundClr; + dc->pdcattr->crForegroundClr = pgO->crForegroundClr; + ulForegroundClr = dc->pdcattr->ulForegroundClr; + dc->pdcattr->ulForegroundClr = pgO->ulForegroundClr; + flags |= (DIRTY_FILL|DIRTY_LINE|DIRTY_TEXT); + } + if (dc->pdcattr->crBackgroundClr != pgO->crBackgroundClr) + { + crBkColor = dc->pdcattr->ulBackgroundClr; + dc->pdcattr->crBackgroundClr = pgO->crBackgroundClr; + ulBackgroundClr = dc->pdcattr->ulBackgroundClr; + dc->pdcattr->ulBackgroundClr = pgO->ulBackgroundClr; + flags |= (DIRTY_FILL|DIRTY_LINE|DIRTY_TEXT|DIRTY_BACKGROUND); + } + if (dc->pdcattr->flTextAlign != pgO->flTextAlign) + { + flTextAlign = dc->pdcattr->flTextAlign; + dc->pdcattr->flTextAlign = pgO->flTextAlign; + } + if (dc->pdcattr->hlfntNew != pgO->hlfntNew) + { + hlfntNew = dc->pdcattr->hlfntNew; + dc->pdcattr->hlfntNew = pgO->hlfntNew; + dc->pdcattr->ulDirty_ &= ~SLOW_WIDTHS; + flags |= DIRTY_CHARSET; + } + + dc->pdcattr->ulDirty_ |= flags; + + jBkMode = dc->pdcattr->jBkMode; + dc->pdcattr->jBkMode = pgO->lBkMode; + lBkMode = dc->pdcattr->lBkMode; + dc->pdcattr->lBkMode = pgO->lBkMode; + + lprc = (pgO->Options & GDIBS_NORECT) ? NULL : &pgO->Rect; + pgO->Options &= ~GDIBS_NORECT; + + IntExtTextOutW( dc, + pgO->x, + pgO->y, + pgO->Options, + lprc, + (LPCWSTR)&pgO->String[pgO->Size/sizeof(WCHAR)], + pgO->cbCount, + pgO->Size ? (LPINT)&pgO->Buffer : NULL, + pgO->iCS_CP ); + + // Restore attributes and flags + dc->pdcattr->jBkMode = jBkMode; + dc->pdcattr->lBkMode = lBkMode; + + if (flags & DIRTY_TEXT && crColor != -1) + { + dc->pdcattr->crForegroundClr = crColor; + dc->pdcattr->ulForegroundClr = ulForegroundClr; + } + if (flags & DIRTY_BACKGROUND) + { + dc->pdcattr->crBackgroundClr = crBkColor; + dc->pdcattr->ulBackgroundClr = ulBackgroundClr; + } + if (flTextAlign != -1) + { + dc->pdcattr->flTextAlign = flTextAlign; + } + + if (flags & DIRTY_CHARSET) + { + dc->pdcattr->hlfntNew = hlfntNew; + dc->pdcattr->ulDirty_ &= ~SLOW_WIDTHS; + } + dc->pdcattr->ulDirty_ |= saveflags | flags; break; + } case GdiBCExtTextOut: { - //GreExtTextOutW( hDC, - // XStart, - // YStart, - // fuOptions, - // &SafeRect, - // SafeString, - // Count, - // SafeDx, - // dwCodePage ); + PGDIBSEXTTEXTOUT pgO; + COLORREF crBkColor; + ULONG ulBackgroundClr; + DWORD flags = 0, saveflags; + if (!dc) break; + pgO = (PGDIBSEXTTEXTOUT) pHdr; + + saveflags = dc->pdcattr->ulDirty_ & (DIRTY_BACKGROUND|DIRTY_TEXT|DIRTY_FILL|DC_BRUSH_DIRTY|DIRTY_CHARSET); + + if (dc->pdcattr->crBackgroundClr != pgO->ulBackgroundClr) + { + crBkColor = dc->pdcattr->crBackgroundClr; + ulBackgroundClr = dc->pdcattr->ulBackgroundClr; + dc->pdcattr->crBackgroundClr = pgO->ulBackgroundClr; + dc->pdcattr->ulBackgroundClr = pgO->ulBackgroundClr; + flags |= (DIRTY_BACKGROUND|DIRTY_LINE|DIRTY_FILL); + } + + dc->pdcattr->ulDirty_ |= flags; + + IntExtTextOutW( dc, + 0, + 0, + pgO->Options, + &pgO->Rect, + NULL, + pgO->Count, + NULL, + 0 ); + + if (flags & DIRTY_BACKGROUND) + { + dc->pdcattr->crBackgroundClr = crBkColor; + dc->pdcattr->ulBackgroundClr = ulBackgroundClr; + } + dc->pdcattr->ulDirty_ |= saveflags | flags; break; } @@ -308,7 +429,7 @@ APIENTRY NtGdiFlush( VOID) { - SynchonizeDriver(GCAPS2_SYNCFLUSH); + SynchronizeDriver(GCAPS2_SYNCFLUSH); return STATUS_SUCCESS; } diff --git a/win32ss/include/ntgdityp.h b/win32ss/include/ntgdityp.h index 4bf8aa92fa..99eed15cc9 100644 --- a/win32ss/include/ntgdityp.h +++ b/win32ss/include/ntgdityp.h @@ -495,12 +495,17 @@ typedef struct _GDIBSPPATBLT PATRECT pRect[1]; // POLYPATBLT } GDIBSPPATBLT, *PGDIBSPPATBLT; +// +// Both ExtSelectClipRgn and TextOut pass a nill RECT. +// +#define GDIBS_NORECT 0x80000000 + typedef struct _GDIBSTEXTOUT { GDIBATCHHDR gbHdr; COLORREF crForegroundClr; COLORREF crBackgroundClr; - LONG lmBkMode; + LONG lBkMode; ULONG ulForegroundClr; ULONG ulBackgroundClr; int x; @@ -513,7 +518,10 @@ typedef struct _GDIBSTEXTOUT HANDLE hlfntNew; FLONG flTextAlign; POINTL ptlViewportOrg; + union { WCHAR String[2]; + ULONG Buffer[1]; + }; } GDIBSTEXTOUT, *PGDIBSTEXTOUT; typedef struct _GDIBSEXTTEXTOUT

5 years, 6 months

[reactos] 01/01: [BOOTDATA] Fix Volgograd time zone (UTC+04:00)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6676b7c48baeea3ac81b5… commit 6676b7c48baeea3ac81b560eb0a1270956f0a13c Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Mar 9 00:11:00 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 8 22:44:27 2019 +0100 [BOOTDATA] Fix Volgograd time zone (UTC+04:00) CORE-15831 --- boot/bootdata/hivesft.inf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index ba5b3919e1..90907e3d49 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -2201,7 +2201,7 @@ GMT_PLUS_03_A_DESC ="(GMT+03:00) Minsk" GMT_PLUS_03_A_DAYLIGHT="Belarus Daylight Time" GMT_PLUS_03_A_STANDARD="Belarus Standard Time" -GMT_PLUS_03_B_DESC ="(GMT+03:00) Moscow, St. Petersburg, Volgograd" +GMT_PLUS_03_B_DESC ="(GMT+03:00) Moscow, St. Petersburg" GMT_PLUS_03_B_DAYLIGHT="RTZ 2 Daylight Time" GMT_PLUS_03_B_STANDARD="RTZ 2 Standard Time" @@ -2229,7 +2229,7 @@ GMT_PLUS_04_B_DESC ="(GMT+04:00) Yerevan" GMT_PLUS_04_B_DAYLIGHT="Caucasus Daylight Time" GMT_PLUS_04_B_STANDARD="Caucasus Standard Time" -GMT_PLUS_04_C_DESC ="(GMT+04:00) Izhevsk, Samara" +GMT_PLUS_04_C_DESC ="(GMT+04:00) Izhevsk, Samara, Volgograd" GMT_PLUS_04_C_DAYLIGHT="RTZ 3 Daylight Time" GMT_PLUS_04_C_STANDARD="RTZ 3 Standard Time" @@ -3185,7 +3185,7 @@ GMT_PLUS_03_A_DESC ="(GMT+03:00) Mińsk" GMT_PLUS_03_A_DAYLIGHT="Białoruś (czas letni)" GMT_PLUS_03_A_STANDARD="Białoruś (czas standardowy)" -GMT_PLUS_03_B_DESC ="(GMT+03:00) Moskwa, Sankt Petersburg, Wołgograd" +GMT_PLUS_03_B_DESC ="(GMT+03:00) Moskwa, Sankt Petersburg" GMT_PLUS_03_B_DAYLIGHT="RTZ 2 (czas letni)" GMT_PLUS_03_B_STANDARD="RTZ 2 (czas standardowy)" @@ -3213,7 +3213,7 @@ GMT_PLUS_04_B_DESC ="(GMT+04:00) Erywań" GMT_PLUS_04_B_DAYLIGHT="Kaukaz (czas letni)" GMT_PLUS_04_B_STANDARD="Kaukaz (czas standardowy)" -GMT_PLUS_04_C_DESC ="(GMT+04:00) Iżewsk, Samara" +GMT_PLUS_04_C_DESC ="(GMT+04:00) Iżewsk, Samara, Wołgograd" GMT_PLUS_04_C_DAYLIGHT="RTZ 3 (czas letni)" GMT_PLUS_04_C_STANDARD="RTZ 3 (czas standardowy)" @@ -3761,7 +3761,7 @@ GMT_PLUS_03_A_DESC ="(UTC+03:00) Minsk" GMT_PLUS_03_A_DAYLIGHT="Oră de Belarus diurnă" GMT_PLUS_03_A_STANDARD="Oră de Belarus standard" -GMT_PLUS_03_B_DESC ="(UTC+03:00) Moscova, St. Petersburg, Volgograd" +GMT_PLUS_03_B_DESC ="(UTC+03:00) Moscova, St. Petersburg" GMT_PLUS_03_B_DAYLIGHT="Ora zonală rusă 2 diurnă" GMT_PLUS_03_B_STANDARD="Ora zonală rusă 2 standard" @@ -3789,7 +3789,7 @@ GMT_PLUS_04_B_DESC ="(UTC+04:00) Erevan" GMT_PLUS_04_B_DAYLIGHT="Oră de Caucaz diurnă" GMT_PLUS_04_B_STANDARD="Oră de Caucaz standard" -GMT_PLUS_04_C_DESC ="(UTC+04:00) Ijevsk, Samara" +GMT_PLUS_04_C_DESC ="(UTC+04:00) Ijevsk, Samara, Volgograd" GMT_PLUS_04_C_DAYLIGHT="Ora zonală rusă 3 diurnă" GMT_PLUS_04_C_STANDARD="Ora zonală rusă 3 standard" @@ -4220,14 +4220,14 @@ GMT_PLUS_02_E_DESC ="(GMT+02:00) Иерусалим" GMT_PLUS_02_F_DESC ="(GMT+02:00) Хараре, Претория" GMT_PLUS_02_G_DESC ="(GMT+02:00) Калининград" GMT_PLUS_03_A_DESC ="(GMT+03:00) Минск" -GMT_PLUS_03_B_DESC ="(GMT+03:00) Волгоград, Москва, Санкт-Петербург" +GMT_PLUS_03_B_DESC ="(GMT+03:00) Москва, Санкт-Петербург" GMT_PLUS_03_C_DESC ="(GMT+03:00) Кувейт, Эр-Рияд" GMT_PLUS_03_D_DESC ="(GMT+03:00) Найроби" GMT_PLUS_03_E_DESC ="(GMT+03:00) Багдад" GMT_PLUS_0330_A_DESC ="(GMT+03:30) Тегеран" GMT_PLUS_04_A_DESC ="(GMT+04:00) Абу-Даби, Мускат" GMT_PLUS_04_B_DESC ="(GMT+04:00) Ереван" -GMT_PLUS_04_C_DESC ="(GMT+04:00) Ижевск, Самара" +GMT_PLUS_04_C_DESC ="(GMT+04:00) Волгоград, Ижевск, Самара" GMT_PLUS_0430_A_DESC ="(GMT+04:30) Кабул" GMT_PLUS_05_A_DESC ="(GMT+05:00) Екатеринбург" GMT_PLUS_05_B_DESC ="(GMT+05:00) Исламабад, Карачи, Ташкент"

5 years, 6 months

[reactos] 01/01: [SHUTDOWN] Small Italian translation update (#1397)

by Daniele Campione

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5873161f8d60298d117a… commit e5873161f8d60298d117a6dfd146dd03041bdeb3 Author: Daniele Campione <nonametekno(a)gmail.com> AuthorDate: Fri Mar 8 15:49:56 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 8 15:49:56 2019 +0100 [SHUTDOWN] Small Italian translation update (#1397) --- base/applications/shutdown/lang/it-IT.rc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/base/applications/shutdown/lang/it-IT.rc b/base/applications/shutdown/lang/it-IT.rc index 0d939d607e..2decaa4eff 100644 --- a/base/applications/shutdown/lang/it-IT.rc +++ b/base/applications/shutdown/lang/it-IT.rc @@ -36,10 +36,10 @@ Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\ [/m \\\\computer][/t xxx][/d [p|u:]xx:yy [/c ""comment""]]\n\ \n\ Non ci sono argomenti o/? Visualizza aiuti.\n\ - /i Mostra l'interfaccia utente grafica (GUI). Questa opzione deve essere la \n\ + /i Mostra l'interfaccia grafica (GUI). Questa opzione deve essere la \n\ prima.\n\ /l Disconnessione dal sistema locale. Non può essere utilizzata con /m or /d.\n\ - /s Chiusura del computer.\n\ + /s Spegnimento del computer.\n\ /r Riavvio del computer.\n\ /g Riavvio del computer e riavvio di tutte le applicazioni registrate.\n\ /a cancellare un arresto ritardato. Può essere utilizzato solo durante il periodo\n\ @@ -54,10 +54,10 @@ Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\ 30 è il valore di default.\n\ /c ""comment"" Commento sul motivo per cui spegnere o riavviare.\n\ 512 caratteri massimi consentiti.\n\ - /f Forzare la chiusura delle applicazioni in esecuzione senza che avvertire gli utenti. Se\n\ - non è specificato un'altro parametro, questa opzione è valida anche per la disconnessione.\n\ - /d [p|u:]xx:yy Indicare il codice motivo per l'arresto o il riavvio.\n\ - p indica che l'arresto o il riavvio è previsto.\n\ + /f Forzare la chiusura delle applicazioni in esecuzione senza avvertire gli utenti. Se\n\ + non è specificato un altro parametro, questa opzione è valida anche per la disconnessione.\n\ + /d [p|u:]xx:yy Indicare il codice del motivo per cui s'intende effettuare l'arresto o il riavvio.\n\ + p indica che è previsto l'arresto o il riavvio.\n\ u indica che il motivo è definito dall'utente.\n\ Se nè p nè u vengono specificati, l'arresto o il riavvio non sono\n\ pianificati.\n\ @@ -70,12 +70,12 @@ Usage: shutdown [/?] [/i | /l | /s | /r | /g | /a | /p | /h | /e] [/f]\n\ IDS_ERROR_LOGOFF "ERROR: Impossibile disconnettersi dal sistema \n" IDS_ERROR_SHUTDOWN "ERROR: Impossibile arrestare il sistema \n." IDS_ERROR_RESTART "ERROR: Impossibile riavviare il sistema \n." - IDS_ERROR_MAX_COMMENT_LENGTH "ERROR: Lunghezza commento supera il limite massimo di caratteri impostato dal sistema \n" - IDS_ERROR_HIBERNATE "ERROR: Impossibile avviare il sistema in modalità di sospensione. \n" - IDS_ERROR_HIBERNATE_LOCAL "ERROR: Modalitài sospensione non può essere avviata in modalità remota \n" - IDS_ERROR_HIBERNATE_ENABLED "ERROR: Modalità di sospensione non è abilitata \n" + IDS_ERROR_MAX_COMMENT_LENGTH "ERROR: La lunghezza del commento supera il limite massimo di caratteri impostato dal sistema \n" + IDS_ERROR_HIBERNATE "ERROR: Impossibile avviare il sistema in modalità sospensione. \n" + IDS_ERROR_HIBERNATE_LOCAL "ERROR: La modalità sospensione non può essere avviata in modalità remota \n" + IDS_ERROR_HIBERNATE_ENABLED "ERROR: La modalità sospensione non è abilitata \n" IDS_ERROR_DIALOG_CAPTION "Arresto improviso" - IDS_ERROR_DIALOG_INIT "Impossibile visualizzare l'interfaccia utente grafica." + IDS_ERROR_DIALOG_INIT "Impossibile visualizzare l'interfaccia grafica." END /* Remote shutdown action strings */ @@ -83,7 +83,7 @@ STRINGTABLE BEGIN IDS_ACTION_SHUTDOWN "Esci dal sistema" IDS_ACTION_RESTART "Riavvia il sistema" - IDS_ACTION_UNEXPECTED_SHUTDOWN "Arresto improviso" + IDS_ACTION_UNEXPECTED_SHUTDOWN "Arresto improvviso" END /* Remote shutdown reason strings */

5 years, 6 months

[reactos] 01/01: [TRANSLATION] Hindi translation of SYSSETUP AND SAMSRV. (#1400)

by Arnav Bhatt

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c17bcb65b967686c17a13… commit c17bcb65b967686c17a13f3e3fa34e87d6ce29c4 Author: Arnav Bhatt <arnavbhatt288(a)gmail.com> AuthorDate: Fri Mar 8 20:18:20 2019 +0530 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 8 15:48:20 2019 +0100 [TRANSLATION] Hindi translation of SYSSETUP AND SAMSRV. (#1400) --- dll/win32/samsrv/lang/hi-IN.rc | 32 ++++++ dll/win32/samsrv/samsrv.rc | 3 + dll/win32/syssetup/lang/hi-IN.rc | 227 +++++++++++++++++++++++++++++++++++++++ dll/win32/syssetup/syssetup.rc | 3 + 4 files changed, 265 insertions(+) diff --git a/dll/win32/samsrv/lang/hi-IN.rc b/dll/win32/samsrv/lang/hi-IN.rc new file mode 100644 index 0000000000..01e71bc607 --- /dev/null +++ b/dll/win32/samsrv/lang/hi-IN.rc @@ -0,0 +1,32 @@ +/* + * PROJECT: SAMSRV Hindi Translation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Hindi translation of SAMSRV + * COPYRIGHT: Copyright 2019 Arnav Bhatt (arnavbhatt2004(a)gmail.com) + */ + +LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA + +STRINGTABLE +BEGIN + IDS_DOMAIN_BUILTIN_NAME "अंतर्निहित" + IDS_GROUP_NONE_NAME "कुछ भी नहीं" + IDS_GROUP_NONE_COMMENT "साधारण उपयोगकर्ता" + IDS_ALIAS_ADMINISTRATORS_NAME "एडमिनिस्ट्रेटर" + IDS_ALIAS_ADMINISTRATORS_COMMENT "एडमिनिस्ट्रेटर के पास कंप्यूटर या डोमेन तक अप्रतिबंधित पहुंच होती है।" + IDS_ALIAS_GUESTS_NAME "मेहमान" + IDS_ALIAS_GUESTS_COMMENT "डिफ़ॉल्ट रूप से मेहमान के पास उपयोगकर्ता समूह के सदस्यों के समान अधिकार हैं।" + IDS_ALIAS_POWER_USERS_NAME "पावर उपयोगकर्ता" + IDS_ALIAS_POWER_USERS_COMMENT "पावर उपयोगकर्ताओं के पास कुछ प्रतिबंधों के साथ अधिकांश प्रशासनिक अधिकार हैं।" + IDS_ALIAS_USERS_NAME "उपयोगकर्ता" + IDS_ALIAS_USERS_COMMENT "उपयोगकर्ताओं को सिस्टम-व्यापी परिवर्तन करने से रोका जाता है।" + /* + * ATTENTION: + * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and + * syssetup.dll:IDS_ADMINISTRATOR_NAME synchronized. + */ + IDS_USER_ADMINISTRATOR_NAME "एडमिनिस्ट्रेटर" + IDS_USER_ADMINISTRATOR_COMMENT "अंतर्निहित खाता कंप्यूटर या डोमेन का प्रशासन करने के लिए उपयोग किया जाता है।" + IDS_USER_GUEST_NAME "उपयोगकर्ता" + IDS_USER_GUEST_COMMENT "कंप्यूटर या डोमेन तक अतिथि पहुंच के लिए अंतर्निहित खाता।" +END diff --git a/dll/win32/samsrv/samsrv.rc b/dll/win32/samsrv/samsrv.rc index 8c0ae9ad63..43872f6561 100644 --- a/dll/win32/samsrv/samsrv.rc +++ b/dll/win32/samsrv/samsrv.rc @@ -31,6 +31,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_ES_ES #include "lang/es-ES.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/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc new file mode 100644 index 0000000000..9ae9d9722b --- /dev/null +++ b/dll/win32/syssetup/lang/hi-IN.rc @@ -0,0 +1,227 @@ +/* + * PROJECT: SYSSETUP Hindi Translation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Hindi translation of SYSSETUP + * COPYRIGHT: Copyright 2019 Arnav Bhatt (arnavbhatt2004(a)gmail.com) + */ + +LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA + +IDD_WELCOMEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "रिऐक्ट ओएस" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "रिऐक्ट ओएस सेटअप विज़ार्ड में आपका स्वागत है।", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "यह विज़ार्ड आपके कंप्यूटर पर रिऐक्ट ओएस इंस्टॉल करता है। विज़ार्ड को आपके और आपके कंप्यूटर के बारे में कुछ जानकारी इकट्ठा करने की आवश्यकता है ताकि रिऐक्ट ओएस को ठीक से इंस्टॉल किया जा सके।", IDC_STATIC, 115, 40, 195, 100 + LTEXT "सेटअप के साथ जारी रखने के लिए आगे क्लिक करें।", IDC_STATIC, 115, 169, 195, 17 +END + +IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "रिऐक्ट ओएस सेटअप" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "रिऐक्ट ओएस डेवलपर्स निम्नलिखित ओपन सोर्स प्रोजेक्ट्स, (के कुछ हिस्सों) को स्वीकार करना चाहेंगे, जिनका उपयोग रिऐक्ट ओएस बनाने के लिए किया गया था:", IDC_STATIC, 15, 7, 286, 19 + LISTBOX IDC_PROJECTS, 15, 30, 286, 75, LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LTEXT "रिऐक्ट ओएस को जीपीएल के तहत लाइसेंस प्राप्त है, इसलिए यदि आप पुन: उपयोग या पुनर्वितरित करना चाहते हैं (भागों) तो आपको जीपीएल का सम्मान करना चाहिए।", IDC_STATIC, 15, 110, 227, 19 + PUSHBUTTON "जीपीएल &देखें...", IDC_VIEWGPL, 251, 110, 50, 19 + LTEXT "सेटअप के साथ जारी रखने के लिए अगला क्लिक करें।", IDC_STATIC, 15, 136, 195, 17 +END + +IDD_OWNERPAGE 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_ICON2, IDC_STATIC, 21, 7, 20, 20 + LTEXT "अपना पूरा नाम और अपनी कंपनी या संगठन का नाम लिखें।", IDC_STATIC, 54, 7, 242, 21 + LTEXT "&नाम:", IDC_STATIC, 54, 37, 44, 8 + EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&संगठन:", IDC_STATIC, 54, 57, 44, 8 + EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL +END + +IDD_COMPUTERPAGE 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_ICON1, IDC_STATIC, 21, 7, 20, 20 + LTEXT "अपने कंप्यूटर के लिए एक नाम लिखें जो १५ वर्ण या उससे कम का हो। यदि आप नेटवर्क पर हैं, तो आपके कंप्यूटर का नाम अद्वितीय होना चाहिए।", IDC_STATIC, 54, 7, 250, 24 + LTEXT "&कंप्यूटर का नाम:", IDC_STATIC, 54, 38, 75, 8 + EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 + LTEXT "सेटअप आपके कंप्यूटर पर एक उपयोगकर्ता खाता बनाएगा जिसे एडमिनिस्ट्रेटर कहा जाता है। यदि आपको अपने कंप्यूटर पर पूर्ण पहुंच की आवश्यकता है तो आप इस खाते का उपयोग कर सकते हैं।", IDC_STATIC, 54, 57, 250, 25 + LTEXT "एक एडमिनिस्ट्रेटर पासवर्ड टाइप करें जो १२७ वर्ण या उससे कम का हो।", IDC_STATIC, 54, 87, 250, 8 + LTEXT "&एडमिनिस्ट्रेटर पासवर्ड:", IDC_STATIC, 54, 104, 105, 8 + EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "पासवर्ड की &पुष्टि कीजिये:", IDC_STATIC, 54, 123, 105, 8 + EDITTEXT IDC_ADMINPASSWORD2, 165, 120, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD +END + +IDD_LOCALEPAGE 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_ICON4, IDC_STATIC, 21, 7, 20, 20 + LTEXT "सिस्टम लोकेल को उन एप्लिकेशन की भाषा से मेल खाना चाहिए जिनका आप उपयोग करना चाहते हैं। उपयोगकर्ता का स्थान नियंत्रित करता है कि संख्याएँ, मुद्राएँ और दिनांक कैसे दिखाई देते हैं।", IDC_STATIC, 53, 7, 253, 20 + LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "सिस्टम या उपयोगकर्ता लोकेल सेटिंग बदलने के लिए, अनुकूलित करें पर क्लिक करें।", IDC_STATIC, 53, 60, 196, 8 + PUSHBUTTON "&अनुकूलित...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "कीबोर्ड लेआउट आपके द्वारा टाइप किए जाने पर दिखाई देने वाले अक्षरों को नियंत्रित करता है।", IDC_STATIC, 53, 86, 253, 8 + LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "कीबोर्ड लेआउट बदलने के लिए, अनुकूलित करें पर क्लिक करें।", IDC_STATIC, 53, 126, 184, 8 + PUSHBUTTON "&अनुकूलित...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14 +END + +IDD_DATETIMEPAGE 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_ICON3, IDC_STATIC, 21, 10, 20, 20 + LTEXT "दिनांक और समय:", IDC_STATIC, 53, 7, 253, 8 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 + LTEXT "समय क्षेत्र:", IDC_STATIC, 53, 42, 253, 8 + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + AUTOCHECKBOX "&डेलाइट बचत में परिवर्तन के लिए खुद ब खुद रूप से घड़ी समायोजित करें", IDC_AUTODAYLIGHT, 53, 124, 201, 10 +END + +IDD_THEMEPAGE 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 + PUSHBUTTON "लौटस थीम", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "क्लासिक थीम", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + +IDD_PROCESSPAGE 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_ACTIVITY, 53, 7, 253, 20 + LTEXT "", IDC_ITEM, 53, 29, 253, 20 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 +END + +IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "रिऐक्ट ओएस सेटअप पूरा करना" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "रिऐक्ट ओएस सेटअप विज़ार्ड को पूरा करना", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "आपने रिऐक्ट ओएस सेटअप को सफलतापूर्वक पूरा कर लिया है।\n\nजब आप समाप्त पर क्लिक करते हैं, तो आपका कंप्यूटर रीस्टॉर्ट हो जाएगा।", IDC_STATIC, 115, 40, 195, 100 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 + LTEXT "यदि किसी ड्राइव में एक सीडी है, तो उसे हटा दें। फिर, अपने कंप्यूटर को रीस्टॉर्ट करने के लिए, समाप्त पर क्लिक करें।", IDC_STATIC, 115, 169, 195, 17 +END + +IDD_GPL DIALOGEX 0, 0, 333, 230 +STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "जीए.न.यू जनरल पब्लिक लाइसेंस" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GPL_TEXT, 7, 7, 319, 190, ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL + DEFPUSHBUTTON "ठीक", IDOK, 141, 209, 50, 14 +END + +IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "कृपया प्रतीक्षा करें..." +FONT 8, "MS Shell Dlg", 400, 0, 1 +BEGIN + LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS + CONTROL "Progress1", IDC_STATUSPROGRESS, "msctls_progress32", WS_BORDER | PBS_MARQUEE, 7, 21, 261, 10 +END + +IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 +STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "एडवांस सेटिंग" +FONT 8, "MS Shell Dlg" +BEGIN + RTEXT "&नमूना दर:", -1, 27, 35, 90, 8 + LTEXT "प्रति सेकंड की रिपोर्ट", -1, 169, 35, 76, 8 + COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&पहिया का पता लगाना:", -1, 27, 55, 90, 8 + COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + RTEXT "&इनपुट बफर लंबाई:", -1, 27, 75, 90, 8 + LTEXT "पैकेट", -1, 169, 75, 26, 8 + EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 + AUTOCHECKBOX "&तेज प्रारंभ", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&डिफ़ॉल्ट", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 +END + +STRINGTABLE +BEGIN + IDS_ACKTITLE "अक्नॉलज्मन्ट" + IDS_ACKSUBTITLE "कंधे जिसमे रिऐक्ट ओएस खड़ा होता है और लाइसेंस जानकारी" + IDS_OWNERTITLE "अपने सॉफ़्टवेयर का निजीकृत" + IDS_OWNERSUBTITLE "सेटअप रिऐक्ट ओएस को निजीकृत करने के लिए अपने बारे में इस जानकारी का उपयोग करता है।" + IDS_COMPUTERTITLE "कंप्यूटर का नाम और एडमिनिस्ट्रेटर पासवर्ड" + IDS_COMPUTERSUBTITLE "आपको अपने कंप्यूटर के लिए एक नाम और एक एडमिनिस्ट्रेटर पासवर्ड प्रदान करना होगा।" + IDS_LOCALETITLE "क्षेत्रीय सेटिंग" + IDS_LOCALESUBTITLE "आप विभिन्न क्षेत्रों और भाषाओं के लिए रिऐक्ट ओएस को अनुकूलित कर सकते हैं।" + IDS_DATETIMETITLE "दिनांक और समय" + IDS_DATETIMESUBTITLE "अपने कंप्यूटर के लिए सही तारीख और समय निर्धारित करें।" + IDS_PROCESSTITLE "कम्पोनन्ट का दर्ज" + IDS_PROCESSSUBTITLE "कृपया प्रतीक्षा करें..." + IDS_THEMESELECTIONTITLE "दिखावट" + IDS_THEMESELECTIONSUBTITLE "अपनी पसंद का थीम चुनें।" + +END + +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "रिऐक्ट ओएस सेटअप" + IDS_UNKNOWN_ERROR "अज्ञात त्रुटि" + IDS_REGISTERING_COMPONENTS "कॉम्पोनेन्ट का दर्ज होना..." + IDS_LOADLIBRARY_FAILED "लोडलाइब्रेरी विफल रहा: " + IDS_GETPROCADDR_FAILED "गैटप्रौकऐड्र विफल रहा: " + IDS_REGSVR_FAILED "डीललरजिस्टरसर्वर विफल रहा: " + IDS_DLLINSTALL_FAILED "डीललइंस्टॉल विफल रहा: " + IDS_TIMEOUT "दर्ज होने के दौरान समय समाप्त" + IDS_REASON_UNKNOWN "" + /* + * ATTENTION: + * If you translate the administrator account name, keep IDS_ADMINISTRATOR_NAME and + * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. + * Also check the IDD_COMPUTERPAGE dialog. + */ + IDS_ADMINISTRATOR_NAME "एडमिनिस्ट्रेटर" + IDS_MACHINE_OWNER_NAME "मालिक" +END + +STRINGTABLE +BEGIN + IDS_WZD_NAME "जब तक आप अपना नाम दर्ज नहीं करते तब तक सेटअप जारी नहीं रह सकता।" + IDS_WZD_SETCOMPUTERNAME "कंप्यूटर नाम सेट करने में सेटअप विफल रहा।" + IDS_WZD_COMPUTERNAME "जब तक आप अपने कंप्यूटर का नाम दर्ज नहीं करते तब तक सेटअप जारी नहीं रह सकता।" + IDS_WZD_PASSWORDEMPTY "आपको एक पासवर्ड दर्ज करना होगा!" + IDS_WZD_PASSWORDMATCH "आपके द्वारा दर्ज किया गया पासवर्ड मेल नहीं खाता है। कृपया फिर से वांछित पासवर्ड दर्ज करें।" + IDS_WZD_PASSWORDCHAR "आपके द्वारा दर्ज किए गए पासवर्ड में अमान्य वर्ण हैं। कृपया एक साफ़ किया हुआ पासवर्ड डालें।" + IDS_WZD_LOCALTIME "सेटअप स्थानीय समय निर्धारित करने में असमर्थ था।" +END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "डिवाइस का इन्स्टलेशन..." +END + +/* ATTENTION: Synchronize the translation of these strings with shell32 */ +STRINGTABLE +BEGIN + IDS_PROGRAMFILES "%SystemDrive%\\प्रोग्राम फाइलें" + IDS_COMMONFILES "आम फाइलें" +END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "डिटेक्शन अक्षम" + IDS_LOOKFORWHEEL "पहिया के लिए देखो" + IDS_ASSUMEPRESENT "मान लें कि पहिया मौजूद है" +END diff --git a/dll/win32/syssetup/syssetup.rc b/dll/win32/syssetup/syssetup.rc index f3e59ac2f1..17f485aa34 100644 --- a/dll/win32/syssetup/syssetup.rc +++ b/dll/win32/syssetup/syssetup.rc @@ -73,6 +73,9 @@ IDR_GPL RT_TEXT "COPYING" #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

5 years, 6 months

[reactos] 01/01: Hindi translation of comdlg32. (#1391)

by Arnav Bhatt

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a856775316d79199037f… commit 3a856775316d79199037f14c5111a37775f00251 Author: Arnav Bhatt <arnavbhatt288(a)gmail.com> AuthorDate: Thu Mar 7 14:35:08 2019 +0530 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Thu Mar 7 10:05:08 2019 +0100 Hindi translation of comdlg32. (#1391) Hindi translation of comdlg32. --- dll/win32/comdlg32/lang/cdlg_Hi.rc | 508 +++++++++++++++++++++++++++++++++++++ dll/win32/comdlg32/rsrc.rc | 3 + 2 files changed, 511 insertions(+) diff --git a/dll/win32/comdlg32/lang/cdlg_Hi.rc b/dll/win32/comdlg32/lang/cdlg_Hi.rc new file mode 100644 index 0000000000..580b33b36c --- /dev/null +++ b/dll/win32/comdlg32/lang/cdlg_Hi.rc @@ -0,0 +1,508 @@ + /* + * PROJECT: Comdlg32 Hindi Translation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Hindi translation of Comdlg32 + * COPYRIGHT: Copyright 2019 Arnav Bhatt (arnavbhatt2004(a)gmail.com) + */ + +LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA + +STRINGTABLE +{ + IDS_FILENOTFOUND "फाइल नहीं मिली" + IDS_VERIFYFILE "कृपया सत्यापित करें कि सही फ़ाइल नाम दिया गया था" + IDS_CREATEFILE "फाइल मौजूद नहीं है।\n\ +क्या आप फ़ाइल बनाना चाहते हैं?" + IDS_OVERWRITEFILE "फ़ाइल पहले से ही मौजूद है।\n\ +क्या आप इसे बदलना चाहते हैं?" + IDS_INVALID_FILENAME_TITLE "पथ में अमान्य कैरेक्टर" + IDS_INVALID_FILENAME "फ़ाइलनेम में निम्न में से कोई भी कैरेक्टर नहीं हो सकता है:\n\ + / : < > |" + IDS_PATHNOTEXISTING "पथ मौजूद नहीं है" + IDS_FILENOTEXISTING "फ़ाइल मौजूद नहीं है" + IDS_INVALID_FOLDERNAME "चयन में एक गैर-फ़ोल्डर ऑब्जेक्ट है" +} + +STRINGTABLE +{ + IDS_UPFOLDER "एक स्तर ऊपर" + IDS_NEWFOLDER "नया फ़ोल्डर बनाएँ" + IDS_LISTVIEW "सूची" + IDS_REPORTVIEW "विवरण" + IDS_TODESKTOP "डेस्कटॉप पर ब्राउज़ करें" +} + +STRINGTABLE +{ + PD32_PRINT_TITLE "प्रिंट" + + PD32_VALUE_UREADABLE "अपठनीय प्रविष्टि" + PD32_INVALID_PAGE_RANGE "यह मान पृष्ठ सीमा के भीतर नहीं है।\n\ +कृपया %1!d! और %2!d! के बीच एक मान दर्ज करें।" + PD32_FROM_NOT_ABOVE_TO "'से' प्रविष्टि 'तक' प्रविष्टि से अधिक नहीं हो सकती।" + PD32_MARGINS_OVERLAP "मार्जिन ओवरलैप या पेपर सीमाओं के बाहर गिर जाते हैं।\n\ +कृपया मार्जिन पुनः दर्ज करें।" + PD32_NR_OF_COPIES_EMPTY "'प्रतियों की संख्या' फ़ील्ड खाली नहीं हो सकती।" + PD32_TOO_LARGE_COPIES "बड़ी संख्या में प्रतियां आपके प्रिंटर द्वारा समर्थित नहीं हैं।\n\ +कृपया 1 और %d के बीच एक मान दर्ज करें।" + PD32_PRINT_ERROR "प्रिंटर त्रुटि हुई।" + PD32_NO_DEFAULT_PRINTER "कोई डिफ़ॉल्ट प्रिंटर परिभाषित नहीं है।" + PD32_CANT_FIND_PRINTER "प्रिंटर नहीं मिल रहा है।" + PD32_OUT_OF_MEMORY "मेमोरी खत्म।" + PD32_GENERIC_ERROR "एक त्रुटि पाई गई।" + PD32_DRIVER_UNKNOWN "अज्ञात प्रिंटर ड्राइवर।" + PD32_NO_DEVICES "इससे पहले कि आप प्रिंटर से संबंधित कार्य कर सकें जैसे कि पेज सेटअप या डॉक्यूमेंट प्रिंट करना, आपको प्रिंटर इंस्टॉल करना होगा। कृपया एक इंस्टॉल करें और पुनः प्रयास करें।" + + PD32_DEFAULT_PRINTER "डिफ़ॉल्ट प्रिंटर; " + PD32_NR_OF_DOCUMENTS_IN_QUEUE "पंक्ति में %d दस्तावेज़ हैं" + PD32_MARGINS_IN_INCHES "मार्जिन [इंच]" + PD32_MARGINS_IN_MILLIMETERS "मार्जिन [mm]" + PD32_MILLIMETERS "mm" + + PD32_PRINTER_STATUS_READY "तैयार" + PD32_PRINTER_STATUS_PAUSED "रोके गए; " + PD32_PRINTER_STATUS_ERROR "त्रुटि; " + PD32_PRINTER_STATUS_PENDING_DELETION "हटाने का काम लंबित; " + PD32_PRINTER_STATUS_PAPER_JAM "कागज जाम; " + PD32_PRINTER_STATUS_PAPER_OUT "कागज खत्म; " + PD32_PRINTER_STATUS_MANUAL_FEED "फीड पेपर मैनुअल; " + PD32_PRINTER_STATUS_PAPER_PROBLEM "कागज की समस्या; " + PD32_PRINTER_STATUS_OFFLINE "प्रिंटर ऑफ़लाइन; " + PD32_PRINTER_STATUS_IO_ACTIVE "आई/ओ एक्टिव; " + PD32_PRINTER_STATUS_BUSY "व्यस्त; " + PD32_PRINTER_STATUS_PRINTING "मुद्रण; " + PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "आउटपुट ट्रे भरी हुई है; " + PD32_PRINTER_STATUS_NOT_AVAILABLE "अनुपलब्ध; " + PD32_PRINTER_STATUS_WAITING "इंतिज़ार; " + PD32_PRINTER_STATUS_PROCESSING "प्रसंस्करण; " + PD32_PRINTER_STATUS_INITIALIZING "इनिशलाइज़ करना; " + PD32_PRINTER_STATUS_WARMING_UP "गरम करना; " + PD32_PRINTER_STATUS_TONER_LOW "कम टोनर; " + PD32_PRINTER_STATUS_NO_TONER "कोई टोनर नहीं; " + PD32_PRINTER_STATUS_PAGE_PUNT "पेज पंट; " + PD32_PRINTER_STATUS_USER_INTERVENTION "उपयोगकर्ता द्वारा बाधित; " + PD32_PRINTER_STATUS_OUT_OF_MEMORY "मेमोरी खत्म; " + PD32_PRINTER_STATUS_DOOR_OPEN "प्रिंटर का दरवाजा खुला है; " + PD32_PRINTER_STATUS_SERVER_UNKNOWN "प्रिंट सर्वर अज्ञात; " + PD32_PRINTER_STATUS_POWER_SAVE "बिजली बचाने की प्रणाली; " +} + +STRINGTABLE /* Font styles */ +{ + IDS_FONT_REGULAR "नियमित" + IDS_FONT_BOLD "बोल्ड" + IDS_FONT_ITALIC "तिरछा" + IDS_FONT_BOLD_ITALIC "बोल्ड तिरछा" +} + +STRINGTABLE /* Color names */ +{ + IDS_COLOR_BLACK "काला" + IDS_COLOR_MAROON "मारून" + IDS_COLOR_GREEN "हरा" + IDS_COLOR_OLIVE "ओलिव" + IDS_COLOR_NAVY "नेवी" + IDS_COLOR_PURPLE "पर्पल" + IDS_COLOR_TEAL "टील" + IDS_COLOR_GRAY "ग्रे" + IDS_COLOR_SILVER "चांदी" + IDS_COLOR_RED "लाल" + IDS_COLOR_LIME "लाइम्" + IDS_COLOR_YELLOW "पीला" + IDS_COLOR_BLUE "नीला" + IDS_COLOR_FUCHSIA "फ्यूशिया" + IDS_COLOR_AQUA "एक्वा" + IDS_COLOR_WHITE "सफेद" +} + +STRINGTABLE +{ + IDS_FONT_SIZE "%1!d और %2!d अंक के बीच एक फ़ॉन्ट साइज़ चुनें।" + IDS_SAVE_BUTTON "&सेव" + IDS_SAVE_IN "सेव &इन:" + IDS_SAVE "सेव" + IDS_SAVE_AS "सेव इज़" + IDS_OPEN_FILE "फाइल खोलो" + IDS_SELECT_FOLDER "फोल्डर का चयन करें" + IDS_FONT_SIZE_INPUT "फ़ॉन्ट का साइज़ एक संख्या होना चाहिए।" +} + +/* + * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES. + */ + +OPEN_FILE DIALOG 36, 24, 275, 134 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "खोलो" +FONT 8, "MS Shell Dlg" +{ + LTEXT "फ़ाइल का &नाम:", stc3, 6, 6, 76, 9 + EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + LISTBOX lst1, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "&डाइरेक्टरी:", -1, 110, 6, 92, 9 + LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP + LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "&प्रकार की सूची फ़ाइलें:", stc2, 6, 104, 90, 9 + COMBOBOX cmb1, 6, 114, 90, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "&ड्राइव:", stc4, 110, 104, 92, 9 + COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "खोलो", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "रद्द करें", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&मदद", pshHelp, 208, 46, 60, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "&केवल पठीय", chx1, 208, 68, 65, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +} + + +SAVE_FILE DIALOG 36, 24, 275, 134 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "सेव इज़..." +FONT 8, "MS Shell Dlg" +{ + LTEXT "फ़ाइल का &नाम:", stc3, 6, 6, 76, 9 + EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + LISTBOX lst1, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "&डाइरेक्टर:", -1, 110, 6, 92, 9 + LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP + LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + LTEXT "&प्रकार की सूची फ़ाइलें:", stc2, 6, 104, 90, 9 + COMBOBOX cmb1, 6, 114, 90, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "&ड्राइव:", stc4, 110, 104, 92, 9 + COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "सेव इज़", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "रद्द करें", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&मदद", pshHelp, 208, 46, 60, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "&केवल पठीय", chx1, 208, 68, 65, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +} + + +PRINT DIALOG 36, 24, 264, 134 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "प्रिंट" +FONT 8, "MS Shell Dlg" +{ + LTEXT "प्रिंटर:", stc1, 6, 6, 40, 9 + LTEXT "", stc2, 60, 6, 150, 9 + GROUPBOX "प्रिंट रेंज", grp1, 6, 30, 160, 65, BS_GROUPBOX + RADIOBUTTON "&सब", rad1, 16, 45, 60, 12 + RADIOBUTTON "&चुनाव", rad2, 16, 60, 60, 12 + RADIOBUTTON "&पृष्ठों", rad3, 16, 75, 60, 12 + DEFPUSHBUTTON "प्रिंट", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "रद्द करें", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&सेटअप", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "&से:", stc3, 60, 80, 30, 9 + LTEXT "&तक:", stc4, 120, 80, 30, 9 + LTEXT "प्रिंट की &गुणवत्ता:", stc5, 6, 100, 76, 9 + COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + CHECKBOX "&फाइल करने के लिए प्रिंट", chx1, 20, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "घनीभूत", chx2, 160, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +} + + +PRINT_SETUP DIALOG 36, 24, 264, 134 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "प्रिंट सेटअप" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "प्रिंटर", grp1, 6, 6, 180, 72, BS_GROUPBOX + RADIOBUTTON "&डिफ़ॉल्ट प्रिंटर", rad1, 16, 16, 150, 12 + LTEXT "[कुछ भी नहीं]", stc1, 35, 30, 120, 9 + RADIOBUTTON "Specific &Printer", rad2, 16, 44, 150, 12 + COMBOBOX cmb1, 35, 58, 145, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "ठीक", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "रद्द करें", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&सेटअप", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + GROUPBOX "उन्मुखीकरण", grp2, 6, 82, 100, 50, BS_GROUPBOX + RADIOBUTTON "&पॉर्ट्रट", rad3, 50, 95, 50, 12 + RADIOBUTTON "&लैन्ड्स्केप", rad4, 50, 110, 50, 12 + ICON "लैन्ड्स्केप", stc10, 10, 95, 32, 32 + ICON "पॉर्ट्रट", stc11, 10, 95, 32, 32 + GROUPBOX "कागज़", grp3, 116, 82, 178, 50, BS_GROUPBOX + LTEXT "&साइज़", stc2, 126, 95, 35, 9 + LTEXT "&सॉर्स", stc3, 126, 110, 35, 9 + COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP +} + + +CHOOSE_FONT DIALOG 13, 54, 274, 147 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "फ़ॉन्ट" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&फ़ॉन्ट:",stc1 ,6,3,90,9 + COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE + LTEXT "फ़ॉन्ट &शैली:",stc2 ,108,3,60,9 + COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE + LTEXT "&साइज़:",stc3,179,3,32,9 + COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT + DEFPUSHBUTTON "ठीक",IDOK,218,6,50,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "रद्द करें",IDCANCEL,218,23,50,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "&लागू करें", psh3,218,40,50,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "&मदद" , pshHelp,218,57,50,14,WS_GROUP | WS_TABSTOP + GROUPBOX "प्रभाव",grp1,6,72,84,36,WS_GROUP + CHECKBOX "&स्ट्राइक आउट", chx1, 10,82,78,10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&रेखांकित", chx2, 10,94,78,10, BS_AUTOCHECKBOX + LTEXT "&रंग:", stc4 ,6,114,80,9 + COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + GROUPBOX "सैम्पल",grp2,98,72,120,36,WS_GROUP + CTEXT "",stc5,103,81,109,24,SS_NOPREFIX | NOT WS_VISIBLE + LTEXT "&लिपि:",stc7 ,98,114,40,9 + COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | + CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP +} + + +CHOOSE_COLOR DIALOG 36, 24, 300, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "रंग" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&मूल रंग:", stc1, 4, 4, 140, 10 + LTEXT "&कस्टम रंग:", stc2, 4, 106, 140, 10 + LTEXT "रंग | &ठोस", stc3, 150, 151, 48, 10 + LTEXT "&लाल:", IDC_COLOR_RL /*1094*/,247,126,27,10 + EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&हरा:", IDC_COLOR_GL /*1095*/,247,140,27,10 + EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&नीला:", IDC_COLOR_BL /*1096*/,247,154,27,10 + EDITTEXT IDC_COLOR_EDIT_B, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&ह्यू:" , IDC_COLOR_HL /*1091*/,200,126,24,10 + EDITTEXT IDC_COLOR_EDIT_H, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&सैट:", IDC_COLOR_SL /*1092*/,200,140,24,10 + EDITTEXT IDC_COLOR_EDIT_S, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&लूम:", IDC_COLOR_LL /*1093*/,200,154,24,10 + EDITTEXT IDC_COLOR_EDIT_L, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + CONTROL "" , IDC_COLOR_PREDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 + CONTROL "" , IDC_COLOR_USRDEF, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 + CONTROL "" , IDC_COLOR_GRAPH, "STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 + CONTROL "" , IDC_COLOR_LUMBAR, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 + CONTROL "" , IDC_COLOR_RESULT, "STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + DEFPUSHBUTTON "ठीक", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "रद्द करें", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "मदद", pshHelp,100,166, 44, 14 + PUSHBUTTON "कस्टम रंग में &ऐड करे", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "कस्टम रंगों को &परिभाषित करें >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "रंग | &ठोस", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ +} + + +FINDDLGORD DIALOG 36, 24, 276, 62 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "खोज" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&क्या ढूँडो:", -1, 4, 8, 52, 8 + EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "केवल &पूर्ण शब्द मिलाएं", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&केस मिलाएँ", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "दिशाओं", grp1, 147, 21, 58, 38 + CONTROL "&ऊपर", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 + CONTROL "&नीचे", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 + + DEFPUSHBUTTON "अगला &ढूंढो", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "रद्द करें", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&मदद", pshHelp , 212, 42, 60, 14, WS_GROUP | WS_TABSTOP +} + + +REPLACEDLGORD DIALOG 36, 24, 276, 94 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "बदले" +FONT 8, "MS Shell Dlg" +{ + LTEXT "क्या &ढूँडो:", -1, 4, 8, 52, 8 + EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&से बदलो:", -1, 4, 26, 52, 8 + EDITTEXT edt2, 57, 24, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "केवल &पूर्ण शब्द मिलाएं", chx1, 5, 46, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&केस मिलाएँ", chx2, 5, 62, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP + + DEFPUSHBUTTON "अगला &ढूंढो", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "&बदले", psh1 , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&सबको बदली करें", psh2 , 212, 42, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "रद्द करें", IDCANCEL , 212, 60, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&मदद", pshHelp , 212, 78, 60, 14, WS_GROUP | WS_TABSTOP +} + + +PRINT32 DIALOG 32, 32, 288, 186 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | + DS_CONTEXTHELP +CAPTION "प्रिंट" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "ठीक", IDOK, 176,164, 50,14, WS_GROUP | BS_DEFPUSHBUTTON + PUSHBUTTON "रद्द करें", IDCANCEL, 230,164, 50,14, WS_GROUP + PUSHBUTTON "&मदद", pshHelp, 50, 161, 50,14, WS_GROUP + + GROUPBOX "प्रिंटर", grp4, 8, 4, 272,84, WS_GROUP + CONTROL "&फाइल करने के लिए प्रिंट", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 + PUSHBUTTON "&गुण", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "&नाम:", stc6, 16, 20, 36,8 + COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "स्थिति:", stc8, 16, 36, 47,10, SS_NOPREFIX + LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "प्रकार:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "कहा:", stc10, 16, 60, 47,10, SS_NOPREFIX + LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "टिप्पणी:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + + GROUPBOX "प्रतियां", grp2, 160, 92, 120,64, WS_GROUP + LTEXT "&प्रतियों की संख्या:",stc5,168,105,68,8 + ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE + CONTROL "&कोलेट", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER + + GROUPBOX "प्रिंट रेंज", grp1, 8,92, 144,64, WS_GROUP + CONTROL "&सब", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 + CONTROL "&पृष्ठों", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 + CONTROL "&चयन", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER + EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER + RTEXT "&से:", stc2, 52,124, 20,8 + RTEXT "&तक:", stc3, 99,124, 20,8 +} + +PRINT32_SETUP DIALOG 32, 32, 288, 178 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP +CAPTION "प्रिंट सेटअप" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "ठीक",IDOK,176,156,50,14,WS_GROUP + PUSHBUTTON "रद्द करें",IDCANCEL,230,156,50,14 +/* PUSHBUTTON "नेटवर्क...", psh5, 284,156,48,14 */ + + GROUPBOX "प्रिंटर", grp4, 8, 4, 272,84, WS_GROUP + PUSHBUTTON "&गुण", psh2, 212, 17, 60,14, WS_GROUP + LTEXT "&नाम:", stc6, 16, 20, 36,8 + COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "स्थिति:", stc8, 16, 36, 47,10, SS_NOPREFIX + LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "प्रकार:", stc7, 16, 48, 47,10, SS_NOPREFIX + LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "कहा:", stc10, 16, 60, 47,10, SS_NOPREFIX + LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "टिप्पणी:", stc9, 16, 72, 47,10, SS_NOPREFIX + LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + + GROUPBOX "कागज़", grp2, 8, 92, 164,56, WS_GROUP + LTEXT "&साइज़:", stc2, 16,108, 36, 8 + COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "&सॉर्स:", stc3, 16,128, 36, 8 + COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + + GROUPBOX "उन्मुखीकरण", grp1, 180, 92, 100,56, WS_GROUP + ICON "", ico1, 195,112, 18,20, WS_GROUP + CONTROL "&पोर्ट्रिट", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 + CONTROL "&लैंडस्केप", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 +END + +PAGESETUPDLGORD DIALOG 32, 32, 240, 240 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "सेटअप पृष्ठ" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 + GROUPBOX "कागज़", grp2, 8, 96, 224, 56, BS_GROUPBOX + LTEXT "&साइज़:", stc2, 16, 112, 36, 8 + COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + LTEXT "&ट्रे:", stc3, 16, 132, 36, 8 + COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + GROUPBOX "उन्मुखीकरण", grp1, 8, 156, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "&पोर्ट्रिट", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&लैंडस्केप", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX + LTEXT "&बाएं:", stc15, 88, 172, 30, 8 + EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&दांए:", stc16, 159, 172, 30, 8 + EDITTEXT edt6, 190, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&टॉप:", stc17, 88, 192, 30, 8 + EDITTEXT edt5, 119, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&तल:", stc18, 159, 192, 30, 8 + EDITTEXT edt7, 190, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + DEFPUSHBUTTON "ठीक", IDOK, 70, 220, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "रद्द करें", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "&प्रिंटर...", psh3, 182, 220, 50, 14 +END + +NEWFILEOPENORD DIALOG 0, 0, 280, 164 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN +CAPTION "खोलो" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&इसमें देखें:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY + COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + + LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE + LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE + + LTEXT "फ़ाइल का &नाम:",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY + EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 63,110,150,150 + + LTEXT "&प्रकार की फाइलें:",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY + COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + + CONTROL "केवल पठनीय के रूप में खोलें",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,63,148,150,10 + + DEFPUSHBUTTON "&खोलो", IDOK,222,110,54,14 + PUSHBUTTON "रद्द करें", IDCANCEL,222,128,54,14 + PUSHBUTTON "&मदद", pshHelp,222,145,54,14 +} + +NEWFILEOPENV2ORD DIALOG 0, 0, 370, 237 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN +CAPTION "खोलो" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&इसमें देखें:", IDC_LOOKINSTATIC, 28, 6, 43, 8, SS_NOTIFY + COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + + LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE + + LTEXT "फ़ाइल का &नाम:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY + EDITTEXT IDC_FILENAME, 123, 180, 180, 12, ES_AUTOHSCROLL + CONTROL "", cmb13, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP, 123, 180, 180, 150 + + LTEXT "&प्रकार की फाइलें:", IDC_FILETYPESTATIC, 65, 200, 56, 16, SS_NOTIFY + COMBOBOX IDC_FILETYPE, 123, 198, 180, 53, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + + CONTROL "केवल पठनीय के रूप में खोलें", IDC_OPENREADONLY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 123, 218, 150, 10 + + DEFPUSHBUTTON "&खोलो", IDOK, 310, 180, 54, 14 + PUSHBUTTON "रद्द करें", IDCANCEL, 310, 198, 54, 14 + PUSHBUTTON "&मदद", pshHelp, 310, 215, 54, 14 +} + +NEWFILEOPENV3ORD DIALOG 0, 0, 440, 300 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN | + WS_THICKFRAME +CAPTION "खोलो" +FONT 8, "MS Shell Dlg" +{ + LTEXT "फ़ाइल का नाम:", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS + EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_CLIPSIBLINGS | ES_AUTOHSCROLL + + LTEXT "प्रकार की फाइलें:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS + COMBOBOX IDC_FILETYPE, 226, 256, 100, 60, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | + WS_CLIPSIBLINGS | CBS_HASSTRINGS | CBS_DROPDOWNLIST + + DEFPUSHBUTTON "&खोलो", IDOK, 350, 240, 32, 14, WS_GROUP | WS_CLIPSIBLINGS + + /* drop-down menu for open button */ + CONTROL "6", psh1, "Button", WS_CHILD | WS_CLIPSIBLINGS | WS_GROUP | WS_TABSTOP | + BS_CHECKBOX | BS_PUSHLIKE, 342, 240, 8, 14 + + PUSHBUTTON "रद्द करें", IDCANCEL, 395, 240, 40, 14, WS_CLIPSIBLINGS + PUSHBUTTON "&मदद", pshHelp, 350, 272, 40, 14, WS_CLIPSIBLINGS +} diff --git a/dll/win32/comdlg32/rsrc.rc b/dll/win32/comdlg32/rsrc.rc index 3d83d96c4d..7bf688e660 100644 --- a/dll/win32/comdlg32/rsrc.rc +++ b/dll/win32/comdlg32/rsrc.rc @@ -83,6 +83,9 @@ #ifdef LANGUAGE_HE_IL #include "lang/cdlg_He.rc" #endif +#ifdef LANGUAGE_HI_IN + #include "lang/cdlg_Hi.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/cdlg_Hu.rc" #endif

5 years, 6 months

[reactos] 01/01: [WALLPAPER] Add ReactOS Soft Blue (#1376)

by Foxlet

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=181a2b33592276039257f… commit 181a2b33592276039257fbc8d55cf71363a89443 Author: Foxlet <foxlet(a)furcode.co> AuthorDate: Wed Mar 6 17:14:08 2019 -0500 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Mar 6 23:14:08 2019 +0100 [WALLPAPER] Add ReactOS Soft Blue (#1376) CORE-15783 --- modules/wallpapers/CMakeLists.txt | 3 +++ modules/wallpapers/ReactOS_Soft_Blue.png | Bin 0 -> 45629 bytes modules/wallpapers/ReactOS_Soft_Blue_16x9.png | Bin 0 -> 45609 bytes modules/wallpapers/ReactOS_Soft_Blue_4x3.png | Bin 0 -> 38588 bytes modules/wallpapers/ReadMe.txt | 3 +++ 5 files changed, 6 insertions(+) diff --git a/modules/wallpapers/CMakeLists.txt b/modules/wallpapers/CMakeLists.txt index d7fd4393c2..ab4c64f93a 100644 --- a/modules/wallpapers/CMakeLists.txt +++ b/modules/wallpapers/CMakeLists.txt @@ -7,5 +7,8 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_CirclesBlue_2.jpg DESTINATI add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_CirclesGold_1.jpg DESTINATION reactos/Web/Wallpaper FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_CirclesGold_2.jpg DESTINATION reactos/Web/Wallpaper FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Hexagons.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Soft_Blue.png DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Soft_Blue_4x3.png DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Soft_Blue_16x9.png DESTINATION reactos/Web/Wallpaper FOR all) add_subdirectory(Angelus) add_subdirectory(Silhouette) diff --git a/modules/wallpapers/ReactOS_Soft_Blue.png b/modules/wallpapers/ReactOS_Soft_Blue.png new file mode 100644 index 0000000000..482f83643f Binary files /dev/null and b/modules/wallpapers/ReactOS_Soft_Blue.png differ diff --git a/modules/wallpapers/ReactOS_Soft_Blue_16x9.png b/modules/wallpapers/ReactOS_Soft_Blue_16x9.png new file mode 100644 index 0000000000..b9aa309295 Binary files /dev/null and b/modules/wallpapers/ReactOS_Soft_Blue_16x9.png differ diff --git a/modules/wallpapers/ReactOS_Soft_Blue_4x3.png b/modules/wallpapers/ReactOS_Soft_Blue_4x3.png new file mode 100644 index 0000000000..b38881de52 Binary files /dev/null and b/modules/wallpapers/ReactOS_Soft_Blue_4x3.png differ diff --git a/modules/wallpapers/ReadMe.txt b/modules/wallpapers/ReadMe.txt index 8697b0bf4b..51dd3ced2f 100644 --- a/modules/wallpapers/ReadMe.txt +++ b/modules/wallpapers/ReadMe.txt @@ -15,6 +15,9 @@ ReactOS_CirclesBlue_2.jpg | See above ReactOS_CirclesGold_1.jpg | See above | See above ReactOS_CirclesGold_2.jpg | See above | See above ReactOS_Hexagons.jpg | See above | http://www.reactos.org/forum/viewtopic.php?p=109866#p109866 +ReactOS_Soft_Blue.png | Forum user "Foxlet" (foxlet(a)furcode.co) | https://jira.reactos.org/browse/CORE-15783 +ReactOS_Soft_Blue_4x3.png | See above | See above +ReactOS_Soft_Blue_16x9.png | See above | See above Silhouette collection | Jake Collins (polar(a)ever3st.com) | https://ever3st.com/Graphics/Loot/ To include the module in your build folder, run the configure script with the flags -DENABLE_WALLPAPERS=1

5 years, 6 months

[reactos] 01/01: [WALLPAPERS] Added Silhouette collection (#1383)

by polar

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b954cee2772b96ce567e… commit 2b954cee2772b96ce567e6f7fafb30b2ee653f32 Author: polar <polar(a)ever3st.com> AuthorDate: Wed Mar 6 22:12:18 2019 +0000 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Mar 6 23:12:18 2019 +0100 [WALLPAPERS] Added Silhouette collection (#1383) CORE-13000 --- modules/wallpapers/CMakeLists.txt | 1 + modules/wallpapers/ReadMe.txt | 1 + modules/wallpapers/Silhouette/CMakeLists.txt | 2 + modules/wallpapers/Silhouette/LICENSE.md | 396 +++++++++++++++++++++ modules/wallpapers/Silhouette/README.md | 7 + .../Silhouette/reactos_silhouette_dark.png | Bin 0 -> 104491 bytes .../Silhouette/reactos_silhouette_light.png | Bin 0 -> 105660 bytes 7 files changed, 407 insertions(+) diff --git a/modules/wallpapers/CMakeLists.txt b/modules/wallpapers/CMakeLists.txt index 2d44a83d19..d7fd4393c2 100644 --- a/modules/wallpapers/CMakeLists.txt +++ b/modules/wallpapers/CMakeLists.txt @@ -8,3 +8,4 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_CirclesGold_1.jpg DESTINATI add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_CirclesGold_2.jpg DESTINATION reactos/Web/Wallpaper FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Hexagons.jpg DESTINATION reactos/Web/Wallpaper FOR all) add_subdirectory(Angelus) +add_subdirectory(Silhouette) diff --git a/modules/wallpapers/ReadMe.txt b/modules/wallpapers/ReadMe.txt index 1393cfb9d7..8697b0bf4b 100644 --- a/modules/wallpapers/ReadMe.txt +++ b/modules/wallpapers/ReadMe.txt @@ -15,6 +15,7 @@ ReactOS_CirclesBlue_2.jpg | See above ReactOS_CirclesGold_1.jpg | See above | See above ReactOS_CirclesGold_2.jpg | See above | See above ReactOS_Hexagons.jpg | See above | http://www.reactos.org/forum/viewtopic.php?p=109866#p109866 +Silhouette collection | Jake Collins (polar(a)ever3st.com) | https://ever3st.com/Graphics/Loot/ To include the module in your build folder, run the configure script with the flags -DENABLE_WALLPAPERS=1 diff --git a/modules/wallpapers/Silhouette/CMakeLists.txt b/modules/wallpapers/Silhouette/CMakeLists.txt new file mode 100644 index 0000000000..6825bbc557 --- /dev/null +++ b/modules/wallpapers/Silhouette/CMakeLists.txt @@ -0,0 +1,2 @@ +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/reactos_silhouette_light.png DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/reactos_silhouette_dark.png DESTINATION reactos/Web/Wallpaper FOR all) diff --git a/modules/wallpapers/Silhouette/LICENSE.md b/modules/wallpapers/Silhouette/LICENSE.md new file mode 100644 index 0000000000..2fb94156cd --- /dev/null +++ b/modules/wallpapers/Silhouette/LICENSE.md @@ -0,0 +1,396 @@ +Attribution 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution 4.0 International Public License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution 4.0 International Public License ("Public License"). To the +extent this Public License may be interpreted as a contract, You are +granted the Licensed Rights in consideration of Your acceptance of +these terms and conditions, and the Licensor grants You such rights in +consideration of benefits the Licensor receives from making the +Licensed Material available under these terms and conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + d. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + e. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + f. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + g. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + h. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + i. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + j. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + k. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part; and + + b. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + 4. If You Share Adapted Material You produce, the Adapter's + License You apply must not prevent recipients of the Adapted + Material from complying with this Public License. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material; and + + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. + diff --git a/modules/wallpapers/Silhouette/README.md b/modules/wallpapers/Silhouette/README.md new file mode 100644 index 0000000000..b30861bd3c --- /dev/null +++ b/modules/wallpapers/Silhouette/README.md @@ -0,0 +1,7 @@ +# Silhouette wallpaper collection + +This is a collection of wallpapers lisenced for use +in the reactOS project. This work is licensed under a +Creative Commons Attribution 4.0 International License. + +The original work can be found [here](http://ever3st.com/Graphics/Loot/) \ No newline at end of file diff --git a/modules/wallpapers/Silhouette/reactos_silhouette_dark.png b/modules/wallpapers/Silhouette/reactos_silhouette_dark.png new file mode 100644 index 0000000000..f38da3e23f Binary files /dev/null and b/modules/wallpapers/Silhouette/reactos_silhouette_dark.png differ diff --git a/modules/wallpapers/Silhouette/reactos_silhouette_light.png b/modules/wallpapers/Silhouette/reactos_silhouette_light.png new file mode 100644 index 0000000000..9c2908c360 Binary files /dev/null and b/modules/wallpapers/Silhouette/reactos_silhouette_light.png differ

5 years, 6 months

[reactos] 03/03: [ZIPFLDR] Allow the shell extension to extract passworded zip files

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08deb1d9de834a46f70d8… commit 08deb1d9de834a46f70d8c0848098ff741cf38d9 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Feb 27 22:18:52 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Mar 6 23:09:35 2019 +0100 [ZIPFLDR] Allow the shell extension to extract passworded zip files --- dll/shellext/zipfldr/CMakeLists.txt | 1 + dll/shellext/zipfldr/CZipExtract.cpp | 63 +++++++++++++++++++++--- dll/shellext/zipfldr/CZipPassword.cpp | 91 +++++++++++++++++++++++++++++++++++ dll/shellext/zipfldr/lang/de-DE.rc | 17 ++++++- dll/shellext/zipfldr/lang/en-US.rc | 19 +++++++- dll/shellext/zipfldr/lang/et-EE.rc | 17 ++++++- dll/shellext/zipfldr/lang/fr-FR.rc | 17 ++++++- dll/shellext/zipfldr/lang/it-IT.rc | 17 ++++++- dll/shellext/zipfldr/lang/ja-JP.rc | 17 ++++++- dll/shellext/zipfldr/lang/pl-PL.rc | 17 ++++++- dll/shellext/zipfldr/lang/ro-RO.rc | 15 ++++++ dll/shellext/zipfldr/lang/ru-RU.rc | 19 +++++++- dll/shellext/zipfldr/lang/sv-SE.rc | 17 ++++++- dll/shellext/zipfldr/lang/zh-CN.rc | 17 ++++++- dll/shellext/zipfldr/precomp.h | 21 ++++++++ dll/shellext/zipfldr/resource.h | 5 ++ dll/shellext/zipfldr/zippidl.cpp | 4 +- 17 files changed, 352 insertions(+), 22 deletions(-) diff --git a/dll/shellext/zipfldr/CMakeLists.txt b/dll/shellext/zipfldr/CMakeLists.txt index 86a1b9c289..f527665805 100644 --- a/dll/shellext/zipfldr/CMakeLists.txt +++ b/dll/shellext/zipfldr/CMakeLists.txt @@ -31,6 +31,7 @@ list(APPEND SOURCE CZipEnumerator.hpp CZipExtract.cpp CZipFolder.hpp + CZipPassword.cpp Debug.cpp zipfldr.spec precomp.h diff --git a/dll/shellext/zipfldr/CZipExtract.cpp b/dll/shellext/zipfldr/CZipExtract.cpp index a95f8ba108..d3b3756f34 100644 --- a/dll/shellext/zipfldr/CZipExtract.cpp +++ b/dll/shellext/zipfldr/CZipExtract.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Zip Shell Extension * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Zip extraction - * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2017-2019 Mark Jansen (mark.jansen(a)reactos.org) */ #include "precomp.h" @@ -12,6 +12,7 @@ class CZipExtract : { CStringW m_Filename; CStringW m_Directory; + CStringA m_Password; bool m_DirectoryChanged; unzFile uf; public: @@ -70,11 +71,13 @@ public: { private: CZipExtract* m_pExtract; + CStringA* m_pPassword; public: - CExtractSettingsPage(CZipExtract* extract) + CExtractSettingsPage(CZipExtract* extract, CStringA* password) :CPropertyPageImpl<CExtractSettingsPage>(MAKEINTRESOURCE(IDS_WIZ_TITLE)) ,m_pExtract(extract) + ,m_pPassword(password) { m_psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_WIZ_DEST_TITLE); m_psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_WIZ_DEST_SUBTITLE); @@ -85,7 +88,6 @@ public: { SetDlgItemTextW(IDC_DIRECTORY, m_pExtract->m_Directory); m_pExtract->m_DirectoryChanged = false; - ::EnableWindow(GetDlgItem(IDC_PASSWORD), FALSE); /* Not supported for now */ GetParent().CenterWindow(::GetDesktopWindow()); SetWizardButtons(PSWIZB_NEXT); return 0; @@ -108,7 +110,7 @@ public: ::EnableWindow(GetDlgItem(IDC_BROWSE), TRUE); ::EnableWindow(GetDlgItem(IDC_DIRECTORY), TRUE); - ::EnableWindow(GetDlgItem(IDC_PASSWORD), FALSE); /* Not supported for now */ + ::EnableWindow(GetDlgItem(IDC_PASSWORD), TRUE); SetWizardButtons(PSWIZB_NEXT); return TRUE; @@ -171,6 +173,11 @@ public: LRESULT OnPassword(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + CStringA Password; + if (_CZipAskPassword(m_hWnd, NULL, Password) == eAccept) + { + *m_pPassword = Password; + } return 0; } @@ -247,7 +254,7 @@ public: psh.dwFlags = PSH_WIZARD97 | PSH_HEADER; psh.hInstance = _AtlBaseModule.GetResourceInstance(); - CExtractSettingsPage extractPage(this); + CExtractSettingsPage extractPage(this, &m_Password); CCompleteSettingsPage completePage(this); HPROPSHEETPAGE hpsp[] = { @@ -288,6 +295,7 @@ public: BYTE Buffer[2048]; CStringA BaseDirectory = m_Directory; CStringA Name; + CStringA Password = m_Password; unz_file_info64 Info; int CurrentFile = 0; bool bOverwriteAll = false; @@ -310,9 +318,48 @@ public: if (is_dir) continue; - const char* password = NULL; - /* FIXME: Process password, if required and not specified, prompt the user */ - err = unzOpenCurrentFilePassword(uf, password); + if (Info.flag & MINIZIP_PASSWORD_FLAG) + { + eZipPasswordResponse Response = eAccept; + do + { + /* If there is a password set, try it */ + if (!Password.IsEmpty()) + { + err = unzOpenCurrentFilePassword(uf, Password); + if (err == UNZ_OK) + { + /* Try to read some bytes, because unzOpenCurrentFilePassword does not return failure */ + char Buf[10]; + err = unzReadCurrentFile(uf, Buf, sizeof(Buf)); + unzCloseCurrentFile(uf); + if (err >= UNZ_OK) + { + /* 're'-open the file so that we can begin to extract */ + err = unzOpenCurrentFilePassword(uf, Password); + break; + } + } + } + Response = _CZipAskPassword(hDlg, Name, Password); + } while (Response == eAccept); + + if (Response == eSkip) + { + Progress.SendMessage(PBM_SETPOS, CurrentFile, 0); + continue; + } + else if (Response == eAbort) + { + Close(); + return false; + } + } + else + { + err = unzOpenCurrentFile(uf); + } + if (err != UNZ_OK) { DPRINT1("ERROR, unzOpenCurrentFilePassword: 0x%x\n", err); diff --git a/dll/shellext/zipfldr/CZipPassword.cpp b/dll/shellext/zipfldr/CZipPassword.cpp new file mode 100644 index 0000000000..99c896029d --- /dev/null +++ b/dll/shellext/zipfldr/CZipPassword.cpp @@ -0,0 +1,91 @@ +/* + * PROJECT: ReactOS Zip Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Ask the user for a password + * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "precomp.h" + +class CZipPassword : public CDialogImpl<CZipPassword> +{ +private: + CStringA m_Filename; + CStringA* m_pPassword; +public: + CZipPassword(const char* filename, CStringA* Password) + :m_pPassword(Password) + { + if (filename != NULL) + m_Filename = filename; + } + + LRESULT OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + CenterWindow(GetParent()); + + /* No filename, so this is the question before starting to extract */ + if (m_Filename.IsEmpty()) + { + CStringA message(MAKEINTRESOURCE(IDS_PASSWORD_ZIP_TEXT)); + ::SetDlgItemTextA(m_hWnd, IDC_MESSAGE, message); + ::ShowWindow(GetDlgItem(IDSKIP), SW_HIDE); + } + else + { + /* Our CString does not support FormatMessage yet */ + CStringA message(MAKEINTRESOURCE(IDS_PASSWORD_FILE_TEXT)); + CHeapPtr<CHAR, CLocalAllocator> formatted; + + DWORD_PTR args[2] = + { + (DWORD_PTR)m_Filename.GetString(), + NULL + }; + + ::FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ARGUMENT_ARRAY, + message, 0, 0, (LPSTR)&formatted, 0, (va_list*)args); + + ::SetDlgItemTextA(m_hWnd, IDC_MESSAGE, formatted); + } + return TRUE; + } + + LRESULT OnButton(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) + { + if (wID == IDOK) + { + HWND item = GetDlgItem(IDC_PASSWORD); + int len = ::GetWindowTextLengthA(item); + len = ::GetDlgItemTextA(m_hWnd, IDC_PASSWORD, m_pPassword->GetBuffer(len+1), len+1); + m_pPassword->ReleaseBuffer(len); + } + EndDialog(wID); + return 0; + } + +public: + enum { IDD = IDD_PASSWORD }; + + BEGIN_MSG_MAP(CZipPassword) + MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog) + COMMAND_ID_HANDLER(IDOK, OnButton) + COMMAND_ID_HANDLER(IDSKIP, OnButton) + COMMAND_ID_HANDLER(IDCANCEL, OnButton) + END_MSG_MAP() +}; + +eZipPasswordResponse _CZipAskPassword(HWND hDlg, const char* filename, CStringA& Password) +{ + if (filename) + filename = PathFindFileNameA(filename); + CZipPassword password(filename, &Password); + INT_PTR Result = password.DoModal(hDlg); + switch (Result) + { + case IDOK: return eAccept; + case IDSKIP: return eSkip; + default: + case IDCANCEL: return eAbort; + } +} diff --git a/dll/shellext/zipfldr/lang/de-DE.rc b/dll/shellext/zipfldr/lang/de-DE.rc index fc81d02a1c..5925822e05 100644 --- a/dll/shellext/zipfldr/lang/de-DE.rc +++ b/dll/shellext/zipfldr/lang/de-DE.rc @@ -37,13 +37,26 @@ CAPTION "Ersetzen von Dateien bestätigen" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "&Ja",IDYES,6,36,62,14 - PUSHBUTTON "Abbrechen",IDCANCEL,204,36,62,14 PUSHBUTTON "Alle",IDYESALL,72,36,62,14 PUSHBUTTON "&Nein",IDNO,138,36,62,14 + PUSHBUTTON "Abbrechen",IDCANCEL,204,36,62,14 ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 LTEXT "",IDC_MESSAGE,36,6,228,24 END +IDD_PASSWORD DIALOGEX 0, 0, 243, 62 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Password needed" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + EDITTEXT IDC_PASSWORD,72,42,108,13,ES_PASSWORD | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,186,6,50,14 + PUSHBUTTON "Skip File",IDSKIP,186,24,50,14 + PUSHBUTTON "Cancel",IDCANCEL,186,42,50,14 + LTEXT "Static",IDC_MESSAGE,24,6,156,30 + LTEXT "Password:",IDC_STATIC,24,44,44,8 +END + STRINGTABLE BEGIN IDS_COL_NAME "Name" @@ -64,6 +77,8 @@ BEGIN IDS_WIZ_BROWSE_TITLE "Wählen Sie ein Ziel zum Extrahieren der Dateien." IDS_OVERWRITEFILE_TEXT "Dieser Ordner enthält bereits eine Datei '%1'.\nMöchten Sie die existierende Datei ersetzen?" + IDS_PASSWORD_FILE_TEXT "The file '%1' is password protected. Please enter the password." + IDS_PASSWORD_ZIP_TEXT "Please specify the password to use when extracting this zip file." IDS_MENUITEM "&Alle Extrahieren..." IDS_HELPTEXT "Ordnerinhalt extrahieren" diff --git a/dll/shellext/zipfldr/lang/en-US.rc b/dll/shellext/zipfldr/lang/en-US.rc index ce2b78e1c7..bba5be5c87 100644 --- a/dll/shellext/zipfldr/lang/en-US.rc +++ b/dll/shellext/zipfldr/lang/en-US.rc @@ -2,7 +2,7 @@ * PROJECT: ReactOS Zip Shell Extension * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: English (United States) resource translation - * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2017-2019 Mark Jansen (mark.jansen(a)reactos.org) */ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US @@ -37,13 +37,26 @@ CAPTION "Confirm File Replace" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "&Yes",IDYES,6,36,62,14 - PUSHBUTTON "Cancel",IDCANCEL,204,36,62,14 PUSHBUTTON "Yes &To All",IDYESALL,72,36,62,14 PUSHBUTTON "&No",IDNO,138,36,62,14 + PUSHBUTTON "Cancel",IDCANCEL,204,36,62,14 ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 LTEXT "",IDC_MESSAGE,36,6,228,24 END +IDD_PASSWORD DIALOGEX 0, 0, 243, 62 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Password needed" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + EDITTEXT IDC_PASSWORD,72,42,108,13,ES_PASSWORD | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,186,6,50,14 + PUSHBUTTON "Skip File",IDSKIP,186,24,50,14 + PUSHBUTTON "Cancel",IDCANCEL,186,42,50,14 + LTEXT "Static",IDC_MESSAGE,24,6,156,30 + LTEXT "Password:",IDC_STATIC,24,44,44,8 +END + STRINGTABLE BEGIN IDS_COL_NAME "Name" @@ -64,6 +77,8 @@ BEGIN IDS_WIZ_BROWSE_TITLE "Select the place where you want to extract the selected items." IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\nDo you want to replace it?" + IDS_PASSWORD_FILE_TEXT "The file '%1' is password protected. Please enter the password." + IDS_PASSWORD_ZIP_TEXT "Please specify the password to use when extracting this zip file." IDS_MENUITEM "Extract &All..." IDS_HELPTEXT "Extracts folder contents" diff --git a/dll/shellext/zipfldr/lang/et-EE.rc b/dll/shellext/zipfldr/lang/et-EE.rc index 1cd5431a37..c9a7cc0f98 100644 --- a/dll/shellext/zipfldr/lang/et-EE.rc +++ b/dll/shellext/zipfldr/lang/et-EE.rc @@ -37,13 +37,26 @@ CAPTION "Kinnita faili ülekirjutus" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "&Jah",IDYES,6,36,62,14 - PUSHBUTTON "Loobu",IDCANCEL,204,36,62,14 PUSHBUTTON "Jah &kõigile",IDYESALL,72,36,62,14 PUSHBUTTON "&Ei",IDNO,138,36,62,14 + PUSHBUTTON "Loobu",IDCANCEL,204,36,62,14 ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 LTEXT "",IDC_MESSAGE,36,6,228,24 END +IDD_PASSWORD DIALOGEX 0, 0, 243, 62 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Password needed" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + EDITTEXT IDC_PASSWORD,72,42,108,13,ES_PASSWORD | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,186,6,50,14 + PUSHBUTTON "Skip File",IDSKIP,186,24,50,14 + PUSHBUTTON "Cancel",IDCANCEL,186,42,50,14 + LTEXT "Static",IDC_MESSAGE,24,6,156,30 + LTEXT "Password:",IDC_STATIC,24,44,44,8 +END + STRINGTABLE BEGIN IDS_COL_NAME "Nimi" @@ -64,6 +77,8 @@ BEGIN IDS_WIZ_BROWSE_TITLE "Vali koht kuhu soovid ekstraktida valitud üksused." IDS_OVERWRITEFILE_TEXT "See kaust juba sisaldab faili nimega '%1'.\nKas tahad seda asendada?" + IDS_PASSWORD_FILE_TEXT "The file '%1' is password protected. Please enter the password." + IDS_PASSWORD_ZIP_TEXT "Please specify the password to use when extracting this zip file." IDS_MENUITEM "Ekstrakti &kõik..." IDS_HELPTEXT "Ekstraktib kausta sisu" diff --git a/dll/shellext/zipfldr/lang/fr-FR.rc b/dll/shellext/zipfldr/lang/fr-FR.rc index 1cce07cfa0..19d4520a60 100644 --- a/dll/shellext/zipfldr/lang/fr-FR.rc +++ b/dll/shellext/zipfldr/lang/fr-FR.rc @@ -37,13 +37,26 @@ CAPTION "Confirmer le remplacement de fichier" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "&Oui",IDYES,6,36,62,14 - PUSHBUTTON "Annuler",IDCANCEL,204,36,62,14 PUSHBUTTON "Oui à &tous",IDYESALL,72,36,62,14 PUSHBUTTON "&Non",IDNO,138,36,62,14 + PUSHBUTTON "Annuler",IDCANCEL,204,36,62,14 ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 LTEXT "",IDC_MESSAGE,36,6,228,24 END +IDD_PASSWORD DIALOGEX 0, 0, 243, 62 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Password needed" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + EDITTEXT IDC_PASSWORD,72,42,108,13,ES_PASSWORD | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,186,6,50,14 + PUSHBUTTON "Skip File",IDSKIP,186,24,50,14 + PUSHBUTTON "Cancel",IDCANCEL,186,42,50,14 + LTEXT "Static",IDC_MESSAGE,24,6,156,30 + LTEXT "Password:",IDC_STATIC,24,44,44,8 +END + STRINGTABLE BEGIN IDS_COL_NAME "Nom" @@ -64,6 +77,8 @@ BEGIN IDS_WIZ_BROWSE_TITLE "Choisissez l'endroit où vous voulez extraits les éléments sélectionnés." IDS_OVERWRITEFILE_TEXT "Ce répertoire contient déjà un fichier nommé '%1'.\nVoulez-vous le remplacer ?" + IDS_PASSWORD_FILE_TEXT "The file '%1' is password protected. Please enter the password." + IDS_PASSWORD_ZIP_TEXT "Please specify the password to use when extracting this zip file." IDS_MENUITEM "&Tout extraire..." IDS_HELPTEXT "Extrait le contenu du répertoire" diff --git a/dll/shellext/zipfldr/lang/it-IT.rc b/dll/shellext/zipfldr/lang/it-IT.rc index 6d63957c76..9f8864383f 100644 --- a/dll/shellext/zipfldr/lang/it-IT.rc +++ b/dll/shellext/zipfldr/lang/it-IT.rc @@ -37,13 +37,26 @@ CAPTION "Conferma Sostituzione File" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "&Sì",IDYES,6,36,62,14 - PUSHBUTTON "Annulla",IDCANCEL,204,36,62,14 PUSHBUTTON "Sì &A Tutti",IDYESALL,72,36,62,14 PUSHBUTTON "&No",IDNO,138,36,62,14 + PUSHBUTTON "Annulla",IDCANCEL,204,36,62,14 ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 LTEXT "",IDC_MESSAGE,36,6,228,24 END +IDD_PASSWORD DIALOGEX 0, 0, 243, 62 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Password needed" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + EDITTEXT IDC_PASSWORD,72,42,108,13,ES_PASSWORD | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,186,6,50,14 + PUSHBUTTON "Skip File",IDSKIP,186,24,50,14 + PUSHBUTTON "Cancel",IDCANCEL,186,42,50,14 + LTEXT "Static",IDC_MESSAGE,24,6,156,30 + LTEXT "Password:",IDC_STATIC,24,44,44,8 +END + STRINGTABLE BEGIN IDS_COL_NAME "Nome" @@ -64,6 +77,8 @@ BEGIN IDS_WIZ_BROWSE_TITLE "Seleziona la destinazione in cui desideri estrarre gli elementi selezionati." IDS_OVERWRITEFILE_TEXT "Questa cartella già contiene un file chiamato '%1'.\nVuoi sostituirla?" + IDS_PASSWORD_FILE_TEXT "The file '%1' is password protected. Please enter the password." + IDS_PASSWORD_ZIP_TEXT "Please specify the password to use when extracting this zip file." IDS_MENUITEM "Estrai &Tutto..." IDS_HELPTEXT "Estrae i contenuti della cartella" diff --git a/dll/shellext/zipfldr/lang/ja-JP.rc b/dll/shellext/zipfldr/lang/ja-JP.rc index 4b15dd20c0..63564b7200 100644 --- a/dll/shellext/zipfldr/lang/ja-JP.rc +++ b/dll/shellext/zipfldr/lang/ja-JP.rc @@ -37,13 +37,26 @@ CAPTION "ファイルの置換の確認" FONT 9, "MS UI Gothic", 400, 0, 0x0 BEGIN DEFPUSHBUTTON "はい(&Y)",IDYES,6,36,62,14 - PUSHBUTTON "キャンセル",IDCANCEL,204,36,62,14 PUSHBUTTON "すべてはい(&T)",IDYESALL,72,36,62,14 PUSHBUTTON "いいえ(&N)",IDNO,138,36,62,14 + PUSHBUTTON "キャンセル",IDCANCEL,204,36,62,14 ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 LTEXT "",IDC_MESSAGE,36,6,228,24 END +IDD_PASSWORD DIALOGEX 0, 0, 243, 62 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Password needed" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + EDITTEXT IDC_PASSWORD,72,42,108,13,ES_PASSWORD | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,186,6,50,14 + PUSHBUTTON "Skip File",IDSKIP,186,24,50,14 + PUSHBUTTON "Cancel",IDCANCEL,186,42,50,14 + LTEXT "Static",IDC_MESSAGE,24,6,156,30 + LTEXT "Password:",IDC_STATIC,24,44,44,8 +END + STRINGTABLE BEGIN IDS_COL_NAME "名前" @@ -64,6 +77,8 @@ BEGIN IDS_WIZ_BROWSE_TITLE "選択された項目を展開したい場所を選んで下さい。" IDS_OVERWRITEFILE_TEXT "'%1'という名前のファイルがフォルダ内に既に存在します。\n置き換えしますか?" + IDS_PASSWORD_FILE_TEXT "The file '%1' is password protected. Please enter the password." + IDS_PASSWORD_ZIP_TEXT "Please specify the password to use when extracting this zip file." IDS_MENUITEM "すべて展開(&A)..." IDS_HELPTEXT "フォルダ内容の展開" diff --git a/dll/shellext/zipfldr/lang/pl-PL.rc b/dll/shellext/zipfldr/lang/pl-PL.rc index 7d2e2e47fc..098e11d1d3 100644 --- a/dll/shellext/zipfldr/lang/pl-PL.rc +++ b/dll/shellext/zipfldr/lang/pl-PL.rc @@ -36,13 +36,26 @@ CAPTION "Potwierdzenie zamiany pliku" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "&Tak",IDYES,6,36,62,14 - PUSHBUTTON "Anuluj",IDCANCEL,204,36,62,14 PUSHBUTTON "Tak na &wszystkie",IDYESALL,72,36,62,14 PUSHBUTTON "&Nie",IDNO,138,36,62,14 + PUSHBUTTON "Anuluj",IDCANCEL,204,36,62,14 ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 LTEXT "",IDC_MESSAGE,36,6,228,24 END +IDD_PASSWORD DIALOGEX 0, 0, 243, 62 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Password needed" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + EDITTEXT IDC_PASSWORD,72,42,108,13,ES_PASSWORD | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,186,6,50,14 + PUSHBUTTON "Skip File",IDSKIP,186,24,50,14 + PUSHBUTTON "Cancel",IDCANCEL,186,42,50,14 + LTEXT "Static",IDC_MESSAGE,24,6,156,30 + LTEXT "Password:",IDC_STATIC,24,44,44,8 +END + STRINGTABLE BEGIN IDS_COL_NAME "Nazwa" @@ -63,6 +76,8 @@ BEGIN IDS_WIZ_BROWSE_TITLE "Wybierz miejsce, w którym chcesz wyodrębnić wybrane elementy." IDS_OVERWRITEFILE_TEXT "Ten folder zawiera już plik o nazwie '%1'.\nCzy chcesz zamienić istniejący plik?" + IDS_PASSWORD_FILE_TEXT "The file '%1' is password protected. Please enter the password." + IDS_PASSWORD_ZIP_TEXT "Please specify the password to use when extracting this zip file." IDS_MENUITEM "Wy&odrębnij wszystkie..." IDS_HELPTEXT "Wyodrębnia zawartość folderów" diff --git a/dll/shellext/zipfldr/lang/ro-RO.rc b/dll/shellext/zipfldr/lang/ro-RO.rc index a41744d48c..31642b0f48 100644 --- a/dll/shellext/zipfldr/lang/ro-RO.rc +++ b/dll/shellext/zipfldr/lang/ro-RO.rc @@ -44,6 +44,19 @@ BEGIN LTEXT "",IDC_MESSAGE,36,6,228,24 END +IDD_PASSWORD DIALOGEX 0, 0, 243, 62 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Password needed" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + EDITTEXT IDC_PASSWORD,72,42,108,13,ES_PASSWORD | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,186,6,50,14 + PUSHBUTTON "Skip File",IDSKIP,186,24,50,14 + PUSHBUTTON "Cancel",IDCANCEL,186,42,50,14 + LTEXT "Static",IDC_MESSAGE,24,6,156,30 + LTEXT "Password:",IDC_STATIC,24,44,44,8 +END + STRINGTABLE BEGIN IDS_COL_NAME "Nume" @@ -64,6 +77,8 @@ BEGIN IDS_WIZ_BROWSE_TITLE "Selectați destinația unde doriți să extrageți elementele selectate." IDS_OVERWRITEFILE_TEXT "Acest folder deja conține un fișier numit '%1'.\nDoriți să o înlocuiți?" + IDS_PASSWORD_FILE_TEXT "The file '%1' is password protected. Please enter the password." + IDS_PASSWORD_ZIP_TEXT "Please specify the password to use when extracting this zip file." IDS_MENUITEM "Extrage &Tot..." IDS_HELPTEXT "Extrage conținutul folderului" diff --git a/dll/shellext/zipfldr/lang/ru-RU.rc b/dll/shellext/zipfldr/lang/ru-RU.rc index 7e7a38ed62..89096a3440 100644 --- a/dll/shellext/zipfldr/lang/ru-RU.rc +++ b/dll/shellext/zipfldr/lang/ru-RU.rc @@ -37,13 +37,26 @@ CAPTION "Подтвердите замену файла" 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 + PUSHBUTTON "Отмена",IDCANCEL,204,36,62,14 ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 LTEXT "",IDC_MESSAGE,36,6,228,24 END +IDD_PASSWORD DIALOGEX 0, 0, 243, 62 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Password needed" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + EDITTEXT IDC_PASSWORD,72,42,108,13,ES_PASSWORD | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,186,6,50,14 + PUSHBUTTON "Skip File",IDSKIP,186,24,50,14 + PUSHBUTTON "Cancel",IDCANCEL,186,42,50,14 + LTEXT "Static",IDC_MESSAGE,24,6,156,30 + LTEXT "Password:",IDC_STATIC,24,44,44,8 +END + STRINGTABLE BEGIN IDS_COL_NAME "Название" @@ -63,7 +76,9 @@ BEGIN IDS_WIZ_COMPL_SUBTITLE "Файлы из zip архива были извлечены." IDS_WIZ_BROWSE_TITLE "Выберите расположение для извлечения элементов." - IDS_OVERWRITEFILE_TEXT "В данной папке уже есть файл '%1'.\nВы хотите заменить его?" + IDS_OVERWRITEFILE_TEXT "В данной папке уже есть файл '%1!ls!'.\nВы хотите заменить его?" + IDS_PASSWORD_FILE_TEXT "The file '%1' is password protected. Please enter the password." + IDS_PASSWORD_ZIP_TEXT "Please specify the password to use when extracting this zip file." IDS_MENUITEM "&Извлечь всё..." IDS_HELPTEXT "Извлекает содержимое архива" diff --git a/dll/shellext/zipfldr/lang/sv-SE.rc b/dll/shellext/zipfldr/lang/sv-SE.rc index 2b35afce03..a2f1c90c73 100644 --- a/dll/shellext/zipfldr/lang/sv-SE.rc +++ b/dll/shellext/zipfldr/lang/sv-SE.rc @@ -37,13 +37,26 @@ CAPTION "Bekräfta filersättning" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "&Ja",IDYES,6,36,62,14 - PUSHBUTTON "Avbryt",IDCANCEL,204,36,62,14 PUSHBUTTON "Ja &till alla",IDYESALL,72,36,62,14 PUSHBUTTON "&Nej",IDNO,138,36,62,14 + PUSHBUTTON "Avbryt",IDCANCEL,204,36,62,14 ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 LTEXT "",IDC_MESSAGE,36,6,228,24 END +IDD_PASSWORD DIALOGEX 0, 0, 243, 62 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Password needed" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + EDITTEXT IDC_PASSWORD,72,42,108,13,ES_PASSWORD | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,186,6,50,14 + PUSHBUTTON "Skip File",IDSKIP,186,24,50,14 + PUSHBUTTON "Cancel",IDCANCEL,186,42,50,14 + LTEXT "Static",IDC_MESSAGE,24,6,156,30 + LTEXT "Password:",IDC_STATIC,24,44,44,8 +END + STRINGTABLE BEGIN IDS_COL_NAME "Namn" @@ -64,6 +77,8 @@ BEGIN IDS_WIZ_BROWSE_TITLE "Välj plats där du vill extrahera de valda objekten." IDS_OVERWRITEFILE_TEXT "Den här mappen innehåller redan en fil med namnet '%1'.\nVill du ersätta den?" + IDS_PASSWORD_FILE_TEXT "The file '%1' is password protected. Please enter the password." + IDS_PASSWORD_ZIP_TEXT "Please specify the password to use when extracting this zip file." IDS_MENUITEM "Extrahera &alla..." IDS_HELPTEXT "Extraherar mappinnehållet" diff --git a/dll/shellext/zipfldr/lang/zh-CN.rc b/dll/shellext/zipfldr/lang/zh-CN.rc index 1914a37bfe..27066adfdf 100644 --- a/dll/shellext/zipfldr/lang/zh-CN.rc +++ b/dll/shellext/zipfldr/lang/zh-CN.rc @@ -37,13 +37,26 @@ CAPTION "确认替换文件" FONT 9, "宋体", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "是(&Y)",IDYES,6,36,62,14 - PUSHBUTTON "取消",IDCANCEL,204,36,62,14 PUSHBUTTON "全部为是(&T)",IDYESALL,72,36,62,14 PUSHBUTTON "否(&N)",IDNO,138,36,62,14 + PUSHBUTTON "取消",IDCANCEL,204,36,62,14 ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 LTEXT "",IDC_MESSAGE,36,6,228,24 END +IDD_PASSWORD DIALOGEX 0, 0, 243, 62 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Password needed" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + EDITTEXT IDC_PASSWORD,72,42,108,13,ES_PASSWORD | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,186,6,50,14 + PUSHBUTTON "Skip File",IDSKIP,186,24,50,14 + PUSHBUTTON "Cancel",IDCANCEL,186,42,50,14 + LTEXT "Static",IDC_MESSAGE,24,6,156,30 + LTEXT "Password:",IDC_STATIC,24,44,44,8 +END + STRINGTABLE BEGIN IDS_COL_NAME "名称" @@ -64,6 +77,8 @@ BEGIN IDS_WIZ_BROWSE_TITLE "选择您想要解压指定项目到的地方。" IDS_OVERWRITEFILE_TEXT "这个文件夹中已经包含一个叫 %1 的文件。\n您想要替换它吗？" + IDS_PASSWORD_FILE_TEXT "The file '%1' is password protected. Please enter the password." + IDS_PASSWORD_ZIP_TEXT "Please specify the password to use when extracting this zip file." IDS_MENUITEM "解压全部(&A)..." IDS_HELPTEXT "解压文件夹内容" diff --git a/dll/shellext/zipfldr/precomp.h b/dll/shellext/zipfldr/precomp.h index 01b92991d5..06c82a8b15 100644 --- a/dll/shellext/zipfldr/precomp.h +++ b/dll/shellext/zipfldr/precomp.h @@ -41,6 +41,8 @@ extern LONG g_ModuleRefCnt; WCHAR* guid2string(REFCLSID iid); +#define MINIZIP_PASSWORD_FLAG 1 + #include "minizip/unzip.h" #include "minizip/ioapi.h" @@ -56,6 +58,25 @@ HRESULT _CExplorerCommandProvider_CreateInstance(IContextMenu* zipObject, REFIID HRESULT _CFolderViewCB_CreateInstance(REFIID riid, LPVOID * ppvOut); void _CZipExtract_runWizard(PCWSTR Filename); +enum eZipPasswordResponse +{ + eAbort, + eSkip, + eAccept, +}; + +eZipPasswordResponse _CZipAskPassword(HWND hDlg, const char* filename, CStringA& Password); + +enum eZipConfirmResponse +{ + eYes, + eYesToAll, + eNo, + eCancel +}; + +eZipConfirmResponse _CZipAskReplace(HWND hDlg, const char* FullPath); + #include "CZipEnumerator.hpp" #include "CZipFolder.hpp" diff --git a/dll/shellext/zipfldr/resource.h b/dll/shellext/zipfldr/resource.h index 6c2ea39c2e..b14faeb7d2 100644 --- a/dll/shellext/zipfldr/resource.h +++ b/dll/shellext/zipfldr/resource.h @@ -21,6 +21,9 @@ #define IDC_EXCLAMATION_ICON 1205 #define IDC_MESSAGE 1206 +#define IDD_PASSWORD 1300 +#define IDSKIP 1301 + /* Strings */ #define IDS_COL_NAME 100 @@ -45,6 +48,8 @@ /* Questions */ #define IDS_OVERWRITEFILE_TEXT 9000 +#define IDS_PASSWORD_FILE_TEXT 9001 +#define IDS_PASSWORD_ZIP_TEXT 9002 /* Context menu / ExplorerCommand strings */ diff --git a/dll/shellext/zipfldr/zippidl.cpp b/dll/shellext/zipfldr/zippidl.cpp index 79b23c3b00..09f26cd6f2 100644 --- a/dll/shellext/zipfldr/zippidl.cpp +++ b/dll/shellext/zipfldr/zippidl.cpp @@ -2,7 +2,7 @@ * PROJECT: ReactOS Zip Shell Extension * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: zip pidl handling - * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + * COPYRIGHT: Copyright 2017-2019 Mark Jansen (mark.jansen(a)reactos.org) */ #include "precomp.h" @@ -25,7 +25,7 @@ LPITEMIDLIST _ILCreate(ZipPidlType Type, LPCSTR lpString, unz_file_info64& info) pidl->CompressedSize = info.compressed_size; pidl->UncompressedSize = info.uncompressed_size; pidl->DosDate = info.dosDate; - pidl->Password = info.flag & 1; + pidl->Password = info.flag & MINIZIP_PASSWORD_FLAG; } strcpy(pidl->Name, lpString);

5 years, 6 months

[reactos] 02/03: [ZLIB] Restore 'uncrypt' functionality in minizip

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6726659117679617c092… commit a6726659117679617c092fda4bdc865d075ce1be Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Feb 27 22:18:44 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Mar 6 23:09:35 2019 +0100 [ZLIB] Restore 'uncrypt' functionality in minizip --- sdk/lib/3rdparty/zlib/contrib/minizip/unzip.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sdk/lib/3rdparty/zlib/contrib/minizip/unzip.c b/sdk/lib/3rdparty/zlib/contrib/minizip/unzip.c index c88b4b7de1..e02cc15e0c 100644 --- a/sdk/lib/3rdparty/zlib/contrib/minizip/unzip.c +++ b/sdk/lib/3rdparty/zlib/contrib/minizip/unzip.c @@ -68,9 +68,6 @@ #include <stdlib.h> #include <string.h> -#ifndef NOUNCRYPT - #define NOUNCRYPT -#endif #include "zlib.h" #include "unzip.h"

5 years, 6 months

← Newer
1
...
14
15
16
17
18
19
20
21
22
Older →

Jump to page:

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